GithubStar/AmazeFileManager
1
0
Fork 0
mirror of https://github.com/TeamAmaze/AmazeFileManager.git synced 2026-10-16 20:51:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix #3535

Browse Source 
Co-authored-by: Thejas Elandassery <thejaselandassery@gmail.com>
Signed-off-by: VishnuSanal <t.v.s10123@gmail.com>
This commit is contained in:
VishnuSanal
2026-06-28 22:22:02 +05:30
parent 62b9545647
commit 3732aca7bc
3 changed files with 0 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/amaze/filemanager/ui/activities/AboutActivity.java
-15
View File
@@ -20,7 +20,6 @@
package com.amaze.filemanager.ui.activities;
import static com.amaze.filemanager.ui.fragments.preferencefragments.PreferencesConstants.PREFERENCE_COLORED_NAVIGATION;
import static com.amaze.filemanager.utils.Utils.openURL;
import java.io.File;
@@ -38,7 +37,6 @@ import com.amaze.filemanager.ui.dialogs.share.ShareTask;
import com.amaze.filemanager.ui.theme.AppTheme;
import com.amaze.filemanager.utils.Billing;
import com.amaze.filemanager.utils.DataUtils;
import com.amaze.filemanager.utils.PreferenceUtils;
import com.amaze.filemanager.utils.Utils;
import com.google.android.material.appbar.AppBarLayout;
import com.google.android.material.appbar.CollapsingToolbarLayout;
@@ -165,19 +163,6 @@ public class AboutActivity extends ThemedActivity implements View.OnClickListene
(v, hasFocus) -> {
mAppBarLayout.setExpanded(hasFocus, true);
});
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
if (getBoolean(PREFERENCE_COLORED_NAVIGATION)) {
getWindow().setNavigationBarColor(PreferenceUtils.getStatusColor(getPrimary()));
} else {
if (getAppTheme().equals(AppTheme.LIGHT)) {
getWindow().setNavigationBarColor(Utils.getColor(this, android.R.color.white));
} else if (getAppTheme().equals(AppTheme.BLACK)) {
getWindow().setNavigationBarColor(Utils.getColor(this, android.R.color.black));
} else {
getWindow().setNavigationBarColor(Utils.getColor(this, R.color.holo_dark_background));
}
}
}
}
private void initAdapter() {
app/src/main/java/com/amaze/filemanager/ui/activities/MainActivity.java
-34
View File
@@ -23,7 +23,6 @@ package com.amaze.filemanager.ui.activities;
import static android.os.Build.VERSION.SDK_INT;
import static android.os.Build.VERSION_CODES.JELLY_BEAN_MR1;
import static android.os.Build.VERSION_CODES.KITKAT;
import static android.os.Build.VERSION_CODES.KITKAT_WATCH;
import static android.os.Build.VERSION_CODES.LOLLIPOP;
import static android.os.Build.VERSION_CODES.M;
import static android.os.Build.VERSION_CODES.N;
@@ -55,7 +54,6 @@ import static com.amaze.filemanager.ui.dialogs.SftpConnectDialog.ARG_PROTOCOL;
import static com.amaze.filemanager.ui.dialogs.SftpConnectDialog.ARG_USERNAME;
import static com.amaze.filemanager.ui.fragments.FtpServerFragment.REQUEST_CODE_SAF_FTP;
import static com.amaze.filemanager.ui.fragments.preferencefragments.PreferencesConstants.PREFERENCE_BOOKMARKS_ADDED;
import static com.amaze.filemanager.ui.fragments.preferencefragments.PreferencesConstants.PREFERENCE_COLORED_NAVIGATION;
import static com.amaze.filemanager.ui.fragments.preferencefragments.PreferencesConstants.PREFERENCE_NEED_TO_SET_HOME;
import static com.amaze.filemanager.ui.fragments.preferencefragments.PreferencesConstants.PREFERENCE_VIEW;
@@ -132,7 +130,6 @@ import com.amaze.filemanager.ui.fragments.TabFragment;
import com.amaze.filemanager.ui.fragments.data.MainFragmentViewModel;
import com.amaze.filemanager.ui.fragments.preferencefragments.PreferencesConstants;
import com.amaze.filemanager.ui.strings.StorageNamingHelper;
import com.amaze.filemanager.ui.theme.AppTheme;
import com.amaze.filemanager.ui.views.CustomZoomFocusChange;
import com.amaze.filemanager.ui.views.appbar.AppBar;
import com.amaze.filemanager.ui.views.drawer.Drawer;
@@ -155,7 +152,6 @@ import com.leinardi.android.speeddial.FabWithLabelView;
import com.leinardi.android.speeddial.SpeedDialActionItem;
import com.leinardi.android.speeddial.SpeedDialOverlayLayout;
import com.leinardi.android.speeddial.SpeedDialView;
import com.readystatesoftware.systembartint.SystemBarTintManager;
import com.topjohnwu.superuser.Shell;
import android.annotation.SuppressLint;
@@ -1800,36 +1796,6 @@ public class MainActivity extends PermissionsActivity
mainActivity.getSupportActionBar().setBackgroundDrawable(colorDrawable);
drawer.setBackgroundColor(colorDrawable.getColor());
if (SDK_INT >= LOLLIPOP) {
// for lollipop devices, the status bar color
mainActivity.getWindow().setStatusBarColor(colorDrawable.getColor());
if (getBoolean(PREFERENCE_COLORED_NAVIGATION)) {
mainActivity
.getWindow()
.setNavigationBarColor(PreferenceUtils.getStatusColor(colorDrawable.getColor()));
} else {
if (getAppTheme().equals(AppTheme.LIGHT)) {
mainActivity
.getWindow()
.setNavigationBarColor(Utils.getColor(this, android.R.color.white));
} else if (getAppTheme().equals(AppTheme.BLACK)) {
mainActivity
.getWindow()
.setNavigationBarColor(Utils.getColor(this, android.R.color.black));
} else {
mainActivity
.getWindow()
.setNavigationBarColor(Utils.getColor(this, R.color.holo_dark_background));
}
}
} else if (SDK_INT == KITKAT_WATCH || SDK_INT == KITKAT) {
// for kitkat devices, the status bar color
SystemBarTintManager tintManager = new SystemBarTintManager(this);
tintManager.setStatusBarTintEnabled(true);
tintManager.setStatusBarTintColor(colorDrawable.getColor());
}
}
void initialiseFab() {
app/src/main/java/com/amaze/filemanager/ui/activities/superclasses/ThemedActivity.java
-9
View File
@@ -37,7 +37,6 @@ import com.amaze.filemanager.ui.theme.AppTheme;
import com.amaze.filemanager.ui.theme.AppThemePreference;
import com.amaze.filemanager.utils.ContextCompatExtKt;
import com.amaze.filemanager.utils.PreferenceUtils;
import com.amaze.filemanager.utils.Utils;
import com.readystatesoftware.systembartint.SystemBarTintManager;
import android.app.ActivityManager;
@@ -186,14 +185,6 @@ public class ThemedActivity extends PreferenceActivity {
}
if (getBoolean(PREFERENCE_COLORED_NAVIGATION)) {
window.setNavigationBarColor(PreferenceUtils.getStatusColor(getPrimary()));
} else {
if (getAppTheme().equals(AppTheme.LIGHT)) {
window.setNavigationBarColor(Utils.getColor(this, android.R.color.white));
} else if (getAppTheme().equals(AppTheme.BLACK)) {
window.setNavigationBarColor(Utils.getColor(this, android.R.color.black));
} else {
window.setNavigationBarColor(Utils.getColor(this, R.color.holo_dark_background));
}
}
// Set light/dark icon appearance for system bars based on theme