Skip to content

Commit 6649da8

Browse files
authored
Clicking "More" on tabLayout caused it to be displayed on toolbar (in any other language than English) (commons-app#4666)
* Changed hardcoded "More" to getStrings(R.string.more) for Unlogged user - MainActivity toolbar showed "More" when clicked on More options in other language than English * Changed hardcoded "More" to getStrings(R.string.more) for Logged user - MainActivity toolbar showed "More" when clicked on More options in other language than English * Added test for: MainActivity.setUpPager
1 parent 6978d00 commit 6649da8

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public void setSelectedItemId(int id) {
138138

139139
private void setUpPager() {
140140
tabLayout.setOnNavigationItemSelectedListener(item -> {
141-
if (!item.getTitle().equals("More")) {
141+
if (!item.getTitle().equals(getString(R.string.more))) {
142142
// do not change title for more fragment
143143
setTitle(item.getTitle());
144144
}
@@ -150,7 +150,7 @@ private void setUpPager() {
150150
private void setUpLoggedOutPager() {
151151
loadFragment(ExploreFragment.newInstance(),false);
152152
tabLayout.setOnNavigationItemSelectedListener(item -> {
153-
if (!item.getTitle().equals("More")) {
153+
if (!item.getTitle().equals(getString(R.string.more))) {
154154
// do not change title for more fragment
155155
setTitle(item.getTitle());
156156
}

app/src/test/kotlin/fr/free/nrw/commons/contributions/MainActivityUnitTests.kt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,16 @@ class MainActivityUnitTests {
210210
activity.toggleLimitedConnectionMode()
211211
}
212212

213+
@Test
214+
@Throws(Exception::class)
215+
fun testSetUpPager() {
216+
val method: Method = MainActivity::class.java.getDeclaredMethod(
217+
"setUpPager"
218+
)
219+
method.isAccessible = true
220+
method.invoke(activity)
221+
}
222+
213223
@Test
214224
@Throws(Exception::class)
215225
fun testSetUpLoggedOutPager() {

0 commit comments

Comments
 (0)