Просмотр исходного кода

Remove drawer open event

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 10 месяцев назад
Родитель
Сommit
ae5cee7056

+ 0 - 5
app/src/main/java/com/nextcloud/utils/extensions/ContextExtensions.kt

@@ -55,8 +55,3 @@ fun Context.showToast(message: String) {
 }
 
 fun Context.showToast(messageId: Int) = showToast(getString(messageId))
-
-fun Context.sendOpenDrawerEvent() {
-    val intent = Intent(DrawerActivity.OPEN_DRAWER_MENU)
-    LocalBroadcastManager.getInstance(this).sendBroadcast(intent)
-}

+ 4 - 26
app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -143,7 +143,6 @@ public abstract class DrawerActivity extends ToolbarActivity
     private static final int MENU_ITEM_EXTERNAL_LINK = 111;
     private static final int MAX_LOGO_SIZE_PX = 1000;
     private static final int RELATIVE_THRESHOLD_WARNING = 80;
-    public static final String OPEN_DRAWER_MENU = "OPEN_DRAWER_MENU";
 
     /**
      * Reference to the drawer layout.
@@ -883,30 +882,6 @@ public abstract class DrawerActivity extends ToolbarActivity
         }
     }
 
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        try {
-            LocalBroadcastManager.getInstance(this).unregisterReceiver(openDrawerReceiver);
-        } catch (IllegalArgumentException e) {
-            Log_OC.d(TAG, "drawerMenuUpdateReceiver not registered");
-        }
-    }
-
-    private void registerOpenDrawerReceiver() {
-        IntentFilter filter = new IntentFilter(OPEN_DRAWER_MENU);
-        LocalBroadcastManager.getInstance(this).registerReceiver(openDrawerReceiver, filter);
-    }
-
-    private final BroadcastReceiver openDrawerReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if (!isDrawerOpen()) {
-                openDrawer();
-            }
-        }
-    };
-
     /**
      * checks/highlights the provided menu item if the drawer has been initialized and the menu item exists.
      *
@@ -923,6 +898,10 @@ public abstract class DrawerActivity extends ToolbarActivity
             return;
         }
 
+        if (menuItem.isChecked()) {
+            return;
+        }
+
         viewThemeUtils.platform.colorNavigationView(mNavigationView);
         menuItem.setChecked(true);
     }
@@ -1048,7 +1027,6 @@ public abstract class DrawerActivity extends ToolbarActivity
 
         externalLinksProvider = new ExternalLinksProvider(getContentResolver());
         arbitraryDataProvider = new ArbitraryDataProviderImpl(this);
-        registerOpenDrawerReceiver();
     }
 
     @Override

+ 5 - 11
app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java

@@ -175,7 +175,7 @@ public class SettingsActivity extends PreferenceActivity
 
         // Sync
         setupSyncCategory();
-        
+
         // More
         setupMoreCategory();
 
@@ -315,7 +315,7 @@ public class SettingsActivity extends PreferenceActivity
             }
         }
     }
-    
+
     private void setupSyncCategory() {
         final PreferenceCategory preferenceCategorySync = (PreferenceCategory) findPreference("sync");
         viewThemeUtils.files.themePreferenceCategory(preferenceCategorySync);
@@ -559,10 +559,10 @@ public class SettingsActivity extends PreferenceActivity
             });
         }
     }
-    
+
     private void setupInternalTwoWaySyncPreference(PreferenceCategory preferenceCategorySync) {
         Preference twoWaySync = findPreference("internal_two_way_sync");
-        
+
         twoWaySync.setOnPreferenceClickListener(preference -> {
             Intent intent = new Intent(this, InternalTwoWaySyncActivity.class);
             startActivity(intent);
@@ -886,7 +886,7 @@ public class SettingsActivity extends PreferenceActivity
 
         if (getResources() == null) return;
         Drawable menuIcon = ResourcesCompat.getDrawable(getResources(),
-                                                        R.drawable.ic_menu,
+                                                        R.drawable.ic_arrow_back,
                                                         null);
 
         if (menuIcon == null) return;
@@ -896,12 +896,6 @@ public class SettingsActivity extends PreferenceActivity
                                                menuIcon);
     }
 
-    @Override
-    public void onBackPressed() {
-        ContextExtensionsKt.sendOpenDrawerEvent(this);
-        // super.onBackPressed();
-    }
-
     private void launchDavDroidLogin() {
         Intent davDroidLoginIntent = new Intent();
         davDroidLoginIntent.setClassName("at.bitfire.davdroid", "at.bitfire.davdroid.ui.setup.LoginActivity");