MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-11-08 19:27:04 +01:00
Code Releases Wiki Activity

Prevent dashboard menu from showing on device list

Browse Source
This commit is contained in:
José Rebelo 2024-08-31 12:20:36 +01:00
parent 977ab9d03e
commit 64887a5adf
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java
View File

@ -57,6 +57,7 @@ import androidx.core.app.ActivityCompat;
import androidx.core.app.NotificationManagerCompat; import androidx.core.app.NotificationManagerCompat;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import androidx.core.view.GravityCompat; import androidx.core.view.GravityCompat;
import androidx.core.view.MenuProvider;
import androidx.drawerlayout.widget.DrawerLayout; import androidx.drawerlayout.widget.DrawerLayout;
import androidx.fragment.app.DialogFragment; import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
@ -240,9 +241,21 @@ public class ControlCenterv2 extends AppCompatActivity
// Sync ViewPager changes with BottomNavigationView // Sync ViewPager changes with BottomNavigationView
viewPager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() { viewPager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
private MenuProvider existingMenuProvider = null;
@Override @Override
public void onPageSelected(int position) { public void onPageSelected(int position) {
navigationView.getMenu().getItem(position).setChecked(true); navigationView.getMenu().getItem(position).setChecked(true);
// Ensure the menu provider is set to the current fragment
if (existingMenuProvider != null) {
ControlCenterv2.this.removeMenuProvider(existingMenuProvider);
}
final Fragment fragment = getSupportFragmentManager().findFragmentByTag("f" + position);
if (fragment instanceof MenuProvider) {
existingMenuProvider = (MenuProvider) fragment;
ControlCenterv2.this.addMenuProvider(existingMenuProvider);
}
} }
}); });

1
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DashboardFragment.java
View File

@ -130,7 +130,6 @@ public class DashboardFragment extends Fragment implements MenuProvider {
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
super.onCreateView(inflater, container, savedInstanceState); super.onCreateView(inflater, container, savedInstanceState);
View dashboardView = inflater.inflate(R.layout.fragment_dashboard, container, false); View dashboardView = inflater.inflate(R.layout.fragment_dashboard, container, false);
requireActivity().addMenuProvider(this);
textViewDate = dashboardView.findViewById(R.id.dashboard_date); textViewDate = dashboardView.findViewById(R.id.dashboard_date);
gridLayout = dashboardView.findViewById(R.id.dashboard_gridlayout); gridLayout = dashboardView.findViewById(R.id.dashboard_gridlayout);