mirror/fdroidclient
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidclient.git synced 2026-01-27 16:27:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix navigation in basic build (fix #2261)

Browse Source
This commit is contained in:
Raphael Michel
2022-01-08 17:20:51 +01:00
committed by Hans-Christoph Steiner
parent 993812f873
commit 362e9f7a06
4 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/basic/res/menu/main_activity_screens.xml
View File

@@ -1,16 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MenuTitle">
<!-- android:title and android:icon are set dynamically in MainActivity -->
<item
app:showAsAction="ifRoom|withText"
android:id="@+id/latest"/>
<item
app:showAsAction="ifRoom|withText"
android:id="@+id/updates"/>
<item
app:showAsAction="ifRoom|withText"
android:id="@+id/settings"/>
</menu>

1
app/src/full/res/menu/main_activity_screens.xml
View File

@@ -3,7 +3,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MenuTitle">
<!-- android:title and android:icon are set dynamically in MainActivity -->
<item
android:id="@+id/latest"
android:enabled="true"

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

@@ -126,7 +126,7 @@ public class MainActivity extends AppCompatActivity {
bottomNavigation.setOnNavigationItemSelectedListener(item -> {
pager.scrollToPosition(item.getOrder());
if (item.getItemId() == 2) {
if (item.getItemId() == R.id.nearby) {
NearbyViewBinder.updateUsbOtg(MainActivity.this);
}

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

@@ -3,7 +3,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MenuTitle">
<!-- android:title and android:icon are set dynamically in MainActivity -->
<item
android:id="@+id/latest"
android:enabled="true"