mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 04:43:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Clicking "More" on tabLayout caused it to be displayed on toolbar (in any other language than English) (#4666)

Browse source 
* 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
This commit is contained in:
dado1111 2021-10-17 10:24:18 +02:00 • committed by GitHub
parent 6978d00926
commit 6649da88a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -138,7 +138,7 @@ public class MainActivity extends BaseActivity
private void setUpPager() { private void setUpPager() {
tabLayout.setOnNavigationItemSelectedListener(item -> { tabLayout.setOnNavigationItemSelectedListener(item -> {
if (!item.getTitle().equals("More")) { if (!item.getTitle().equals(getString(R.string.more))) {
// do not change title for more fragment // do not change title for more fragment
setTitle(item.getTitle()); setTitle(item.getTitle());
} }
@ -150,7 +150,7 @@ public class MainActivity extends BaseActivity
private void setUpLoggedOutPager() { private void setUpLoggedOutPager() {
loadFragment(ExploreFragment.newInstance(),false); loadFragment(ExploreFragment.newInstance(),false);
tabLayout.setOnNavigationItemSelectedListener(item -> { tabLayout.setOnNavigationItemSelectedListener(item -> {
if (!item.getTitle().equals("More")) { if (!item.getTitle().equals(getString(R.string.more))) {
// do not change title for more fragment // do not change title for more fragment
setTitle(item.getTitle()); setTitle(item.getTitle());
} }

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

@ -210,6 +210,16 @@ class MainActivityUnitTests {
activity.toggleLimitedConnectionMode() activity.toggleLimitedConnectionMode()
} }
@Test
@Throws(Exception::class)
fun testSetUpPager() {
val method: Method = MainActivity::class.java.getDeclaredMethod(
"setUpPager"
)
method.isAccessible = true
method.invoke(activity)
}
@Test @Test
@Throws(Exception::class) @Throws(Exception::class)
fun testSetUpLoggedOutPager() { fun testSetUpLoggedOutPager() {