Skip to content

Commit 014f8c8

Browse files
committed
refactor: rename members strings for consistent naming
1 parent 93bd959 commit 014f8c8

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

owncloudApp/src/main/java/com/owncloud/android/extensions/SpaceMenuOptionExt.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ fun SpaceMenuOption.toStringResId() =
3131
SpaceMenuOption.ENABLE -> R.string.enable_space
3232
SpaceMenuOption.DELETE -> R.string.delete_space
3333
SpaceMenuOption.SET_ICON -> R.string.set_space_icon
34-
SpaceMenuOption.MEMBERS -> R.string.space_members
34+
SpaceMenuOption.MEMBERS -> R.string.members_title
3535
}
3636

3737
fun SpaceMenuOption.toDrawableResId() =

owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/AddMemberFragment.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class AddMemberFragment: Fragment() {
8080
is UIResult.Loading -> { }
8181
is UIResult.Error -> {
8282
Timber.e(uiResult.error, "Failed to retrieve available users and groups")
83-
showErrorInSnackbar(R.string.search_members_failed, uiResult.error)
83+
showErrorInSnackbar(R.string.members_search_failed, uiResult.error)
8484
}
8585
}
8686
}
@@ -122,7 +122,7 @@ class AddMemberFragment: Fragment() {
122122

123123
override fun onActivityCreated(savedInstanceState: Bundle?) {
124124
super.onActivityCreated(savedInstanceState)
125-
requireActivity().setTitle(R.string.add_member)
125+
requireActivity().setTitle(R.string.members_add)
126126
}
127127

128128
companion object {

owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SearchMembersAdapter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ class SearchMembersAdapter: RecyclerView.Adapter<SearchMembersAdapter.SearchMemb
5454
if (isGroup) R.string.content_description_member_group else R.string.content_description_member_user, member.displayName
5555
)
5656
memberRole.text = if (isGroup) {
57-
holder.itemView.context.getString(R.string.member_group)
57+
holder.itemView.context.getString(R.string.member_type_group)
5858
} else {
59-
if (member.surname == USER_SURNAME) holder.itemView.context.getString(R.string.member_user) else member.surname
59+
if (member.surname == USER_SURNAME) holder.itemView.context.getString(R.string.member_type_user) else member.surname
6060
}
6161
}
6262
}

owncloudApp/src/main/res/layout/members_fragment.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
android:layout_height="50dp"
4242
android:layout_centerVertical="true"
4343
android:gravity="center"
44-
android:text="@string/space_members"
44+
android:text="@string/members_title"
4545
android:layout_marginStart="@dimen/standard_half_margin"
4646
android:textAllCaps="true"
4747
android:textColor="@color/white"

owncloudApp/src/main/res/values/strings.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -877,11 +877,11 @@
877877
<string name="delete_space_correctly">Space deleted correctly</string>
878878
<string name="delete_space_failed">Space could not be deleted</string>
879879
<string name="set_space_icon">Set icon</string>
880-
<string name="space_members">Members</string>
881-
<string name="add_member">Add member</string>
882-
<string name="search_members_failed">No results found</string>
883-
<string name="member_user">User</string>
884-
<string name="member_group">Group</string>
880+
<string name="members_title">Members</string>
881+
<string name="members_add">Add member</string>
882+
<string name="members_search_failed">No results found</string>
883+
<string name="member_type_user">User</string>
884+
<string name="member_type_group">Group</string>
885885

886886
<string name="feedback_dialog_get_in_contact_description"><![CDATA[ Ask for help in our <a href=\"%1$s\"><b>forum</b></a> or contribute in our <a href=\"%2$s\"><b>GitHub repo</b></a>]]></string>
887887

0 commit comments

Comments
 (0)