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

Renaming 'My Apps' to 'Updates'.

Browse Source 
This doesn't change the `MyAppsAdapter` and friends, because they will
be gutted in a subsequent commit.
This commit is contained in:
Peter Serwylo 2017-03-14 08:30:31 +11:00
parent d4716e6387
commit 7659c3a33f
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,7 @@ import org.fdroid.fdroid.views.swap.SwapWorkflowActivity;
* + Whats new
* + Categories list
* + App swap
* + My apps
* + Updates
* + Settings
*
* Users navigate between items by using the bottom navigation bar, or by swiping left and right.
@ -46,7 +46,7 @@ public class MainActivity extends AppCompatActivity implements BottomNavigationV
private static final String TAG = "MainActivity";
public static final String EXTRA_VIEW_MY_APPS = "org.fdroid.fdroid.views.main.MainActivity.VIEW_MY_APPS";
public static final String EXTRA_VIEW_UPDATES = "org.fdroid.fdroid.views.main.MainActivity.VIEW_UPDATES";
private static final String ADD_REPO_INTENT_HANDLED = "addRepoIntentHandled";
@ -99,9 +99,9 @@ public class MainActivity extends AppCompatActivity implements BottomNavigationV
FDroidApp.checkStartTor(this);
if (getIntent().hasExtra(EXTRA_VIEW_MY_APPS)) {
getIntent().removeExtra(EXTRA_VIEW_MY_APPS);
pager.scrollToPosition(adapter.adapterPositionFromItemId(R.id.my_apps));
if (getIntent().hasExtra(EXTRA_VIEW_UPDATES)) {
getIntent().removeExtra(EXTRA_VIEW_UPDATES);
pager.scrollToPosition(adapter.adapterPositionFromItemId(R.id.updates));
}
// AppDetails 2 and RepoDetailsActivity set different NFC actions, so reset here

8
app/src/main/java/org/fdroid/fdroid/views/main/MainViewAdapter.java
View File

@ -13,7 +13,7 @@ import org.fdroid.fdroid.R;
* + Whats new
* + Categories
* + Nearby
* + My Apps
* + Updates
* + Settings
*
* It is responsible for understanding the relationship between each main view that is reachable
@ -35,7 +35,7 @@ class MainViewAdapter extends RecyclerView.Adapter<MainViewController> {
positionToId.put(0, R.id.whats_new);
positionToId.put(1, R.id.categories);
positionToId.put(2, R.id.nearby);
positionToId.put(3, R.id.my_apps);
positionToId.put(3, R.id.updates);
positionToId.put(4, R.id.settings);
}
@ -52,8 +52,8 @@ class MainViewAdapter extends RecyclerView.Adapter<MainViewController> {
case R.id.nearby:
holder.bindSwapView();
break;
case R.id.my_apps:
holder.bindMyApps();
case R.id.updates:
holder.bindUpdates();
break;
case R.id.settings:
holder.bindSettingsView();

2
app/src/main/java/org/fdroid/fdroid/views/main/MainViewController.java
View File

@ -40,7 +40,7 @@ class MainViewController extends RecyclerView.ViewHolder {
/**
* @see MyAppsViewBinder
*/
public void bindMyApps() {
public void bindUpdates() {
new MyAppsViewBinder(activity, frame);
}

4
app/src/main/res/menu/main_activity_screens.xml
View File

@ -17,10 +17,10 @@
app:showAsAction="ifRoom|withText"
android:id="@+id/nearby" />
<item
android:title="@string/preference_category__my_apps"
android:title="@string/updates"
android:icon="@drawable/ic_updates"
app:showAsAction="ifRoom|withText"
android:id="@+id/my_apps" />
android:id="@+id/updates" />
<item
android:title="@string/menu_settings"
android:icon="@drawable/ic_settings"