Skip to content

Commit 01f1db0

Browse files
Thejas775VishnuSanal
authored andcommitted
fix #4211
Co-authored-by: Thejas Elandassery <thejaselandassery@gmail.com> Signed-off-by: VishnuSanal <t.v.s10123@gmail.com>
1 parent 62b9545 commit 01f1db0

3 files changed

Lines changed: 0 additions & 57 deletions

File tree

app/src/main/java/com/amaze/filemanager/ui/activities/AboutActivity.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
package com.amaze.filemanager.ui.activities;
2222

23-
import static com.amaze.filemanager.ui.fragments.preferencefragments.PreferencesConstants.PREFERENCE_COLORED_NAVIGATION;
2423
import static com.amaze.filemanager.utils.Utils.openURL;
2524

2625
import java.io.File;
@@ -165,19 +164,6 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
165164
(v, hasFocus) -> {
166165
mAppBarLayout.setExpanded(hasFocus, true);
167166
});
168-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
169-
if (getBoolean(PREFERENCE_COLORED_NAVIGATION)) {
170-
getWindow().setNavigationBarColor(PreferenceUtils.getStatusColor(getPrimary()));
171-
} else {
172-
if (getAppTheme().equals(AppTheme.LIGHT)) {
173-
getWindow().setNavigationBarColor(Utils.getColor(this, android.R.color.white));
174-
} else if (getAppTheme().equals(AppTheme.BLACK)) {
175-
getWindow().setNavigationBarColor(Utils.getColor(this, android.R.color.black));
176-
} else {
177-
getWindow().setNavigationBarColor(Utils.getColor(this, R.color.holo_dark_background));
178-
}
179-
}
180-
}
181167
}
182168

183169
private void initAdapter() {

app/src/main/java/com/amaze/filemanager/ui/activities/MainActivity.java

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import static android.os.Build.VERSION.SDK_INT;
2424
import static android.os.Build.VERSION_CODES.JELLY_BEAN_MR1;
2525
import static android.os.Build.VERSION_CODES.KITKAT;
26-
import static android.os.Build.VERSION_CODES.KITKAT_WATCH;
2726
import static android.os.Build.VERSION_CODES.LOLLIPOP;
2827
import static android.os.Build.VERSION_CODES.M;
2928
import static android.os.Build.VERSION_CODES.N;
@@ -55,7 +54,6 @@
5554
import static com.amaze.filemanager.ui.dialogs.SftpConnectDialog.ARG_USERNAME;
5655
import static com.amaze.filemanager.ui.fragments.FtpServerFragment.REQUEST_CODE_SAF_FTP;
5756
import static com.amaze.filemanager.ui.fragments.preferencefragments.PreferencesConstants.PREFERENCE_BOOKMARKS_ADDED;
58-
import static com.amaze.filemanager.ui.fragments.preferencefragments.PreferencesConstants.PREFERENCE_COLORED_NAVIGATION;
5957
import static com.amaze.filemanager.ui.fragments.preferencefragments.PreferencesConstants.PREFERENCE_NEED_TO_SET_HOME;
6058
import static com.amaze.filemanager.ui.fragments.preferencefragments.PreferencesConstants.PREFERENCE_VIEW;
6159

@@ -132,7 +130,6 @@
132130
import com.amaze.filemanager.ui.fragments.data.MainFragmentViewModel;
133131
import com.amaze.filemanager.ui.fragments.preferencefragments.PreferencesConstants;
134132
import com.amaze.filemanager.ui.strings.StorageNamingHelper;
135-
import com.amaze.filemanager.ui.theme.AppTheme;
136133
import com.amaze.filemanager.ui.views.CustomZoomFocusChange;
137134
import com.amaze.filemanager.ui.views.appbar.AppBar;
138135
import com.amaze.filemanager.ui.views.drawer.Drawer;
@@ -155,7 +152,6 @@
155152
import com.leinardi.android.speeddial.SpeedDialActionItem;
156153
import com.leinardi.android.speeddial.SpeedDialOverlayLayout;
157154
import com.leinardi.android.speeddial.SpeedDialView;
158-
import com.readystatesoftware.systembartint.SystemBarTintManager;
159155
import com.topjohnwu.superuser.Shell;
160156

161157
import android.annotation.SuppressLint;
@@ -1800,36 +1796,6 @@ public void updateViews(ColorDrawable colorDrawable) {
18001796
mainActivity.getSupportActionBar().setBackgroundDrawable(colorDrawable);
18011797

18021798
drawer.setBackgroundColor(colorDrawable.getColor());
1803-
1804-
if (SDK_INT >= LOLLIPOP) {
1805-
// for lollipop devices, the status bar color
1806-
mainActivity.getWindow().setStatusBarColor(colorDrawable.getColor());
1807-
if (getBoolean(PREFERENCE_COLORED_NAVIGATION)) {
1808-
mainActivity
1809-
.getWindow()
1810-
.setNavigationBarColor(PreferenceUtils.getStatusColor(colorDrawable.getColor()));
1811-
} else {
1812-
if (getAppTheme().equals(AppTheme.LIGHT)) {
1813-
mainActivity
1814-
.getWindow()
1815-
.setNavigationBarColor(Utils.getColor(this, android.R.color.white));
1816-
} else if (getAppTheme().equals(AppTheme.BLACK)) {
1817-
mainActivity
1818-
.getWindow()
1819-
.setNavigationBarColor(Utils.getColor(this, android.R.color.black));
1820-
} else {
1821-
mainActivity
1822-
.getWindow()
1823-
.setNavigationBarColor(Utils.getColor(this, R.color.holo_dark_background));
1824-
}
1825-
}
1826-
} else if (SDK_INT == KITKAT_WATCH || SDK_INT == KITKAT) {
1827-
1828-
// for kitkat devices, the status bar color
1829-
SystemBarTintManager tintManager = new SystemBarTintManager(this);
1830-
tintManager.setStatusBarTintEnabled(true);
1831-
tintManager.setStatusBarTintColor(colorDrawable.getColor());
1832-
}
18331799
}
18341800

18351801
void initialiseFab() {

app/src/main/java/com/amaze/filemanager/ui/activities/superclasses/ThemedActivity.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import com.amaze.filemanager.ui.theme.AppThemePreference;
3838
import com.amaze.filemanager.utils.ContextCompatExtKt;
3939
import com.amaze.filemanager.utils.PreferenceUtils;
40-
import com.amaze.filemanager.utils.Utils;
4140
import com.readystatesoftware.systembartint.SystemBarTintManager;
4241

4342
import android.app.ActivityManager;
@@ -186,14 +185,6 @@ public void initStatusBarResources(View parentView) {
186185
}
187186
if (getBoolean(PREFERENCE_COLORED_NAVIGATION)) {
188187
window.setNavigationBarColor(PreferenceUtils.getStatusColor(getPrimary()));
189-
} else {
190-
if (getAppTheme().equals(AppTheme.LIGHT)) {
191-
window.setNavigationBarColor(Utils.getColor(this, android.R.color.white));
192-
} else if (getAppTheme().equals(AppTheme.BLACK)) {
193-
window.setNavigationBarColor(Utils.getColor(this, android.R.color.black));
194-
} else {
195-
window.setNavigationBarColor(Utils.getColor(this, R.color.holo_dark_background));
196-
}
197188
}
198189

199190
// Set light/dark icon appearance for system bars based on theme

0 commit comments

Comments
 (0)