Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use separate titles for Updates pref and Updates tab

Browse Source 
https://gitlab.com/fdroid/fdroidclient/merge_requests/773#note_127475129
This commit is contained in:
Hans-Christoph Steiner 2019-01-02 21:21:06 +01:00
parent 4cc5d58480
commit 823ddcaca8
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java
View File

@ -132,7 +132,7 @@ public class MainActivityEspressoTest {
@Test
public void bottomNavFlavorCheck() {
onView(withText(R.string.updates)).check(matches(isDisplayed()));
onView(withText(R.string.main_menu__updates)).check(matches(isDisplayed()));
onView(withText(R.string.menu_settings)).check(matches(isDisplayed()));
onView(withText("THIS SHOULD NOT SHOW UP ANYWHERE!!!")).check(doesNotExist());
@ -170,9 +170,9 @@ public class MainActivityEspressoTest {
@Test
public void showUpdates() {
ViewInteraction updatesBottonNavButton = onView(allOf(withText(R.string.updates), isDisplayed()));
ViewInteraction updatesBottonNavButton = onView(allOf(withText(R.string.main_menu__updates), isDisplayed()));
updatesBottonNavButton.perform(click());
onView(withText(R.string.updates)).check(matches(isDisplayed()));
onView(withText(R.string.main_menu__updates)).check(matches(isDisplayed()));
}
@Test

3
app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
View File

@ -138,7 +138,8 @@ public class MainActivity extends AppCompatActivity implements BottomNavigationB
.setInActiveColor(R.color.bottom_nav_items)
.setActiveColor(android.R.color.white)
.setMode(BottomNavigationBar.MODE_FIXED)
.addItem(new BottomNavigationItem(R.drawable.ic_updates, R.string.updates).setBadgeItem(updatesBadge))
.addItem(new BottomNavigationItem(R.drawable.ic_updates, R.string.main_menu__updates)
.setBadgeItem(updatesBadge))
.addItem(new BottomNavigationItem(R.drawable.ic_settings, R.string.menu_settings))
.setAnimationDuration(0)
.initialise();

5
app/src/main/res/values-de/strings.xml
View File

@ -6,7 +6,7 @@
<string name="delete">Löschen</string>
<string name="enable_nfc_send">NFC-Transfer aktivieren …</string>
<string name="cache_downloaded">Zwischengespeicherte Apps behalten</string>
<string name="updates">Aufgaben</string>
<string name="updates">Aktualisierungen</string>
<string name="other">Andere</string>
<string name="update_interval">Automatisches Aktualisierungsintervall</string>
<string name="notify">Aktualisierungsbenachrichtigung</string>
@ -345,8 +345,7 @@
<string name="main_menu__latest_apps">Neueste</string>
<string name="main_menu__categories">Kategorien</string>
<string name="main_menu__updates">Aufgaben</string>
<string name="main_menu__swap_nearby">Tausch</string>
<string name="app_recommended_version_installed">Version %1$s (Empfohlen)</string>
<string name="app_new">Neu</string>

1
app/src/main/res/values/strings.xml
View File

@ -205,6 +205,7 @@ This often occurs with apps installed via Google Play or other sources, if they
<string name="main_menu__latest_apps">Latest</string>
<string name="main_menu__categories">Categories</string>
<string name="main_menu__swap_nearby">Nearby</string>
<string name="main_menu__updates">Updates</string>
<string name="latest__empty_state__no_recent_apps">No recent apps found</string>
<string name="latest__empty_state__never_updated">Once your list of apps has been updated, the latest apps should