From 261ed5eeaca80ead01ca00c1a7793607d1d45793 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 30 Oct 2016 19:11:06 +0100 Subject: [PATCH] remove the option to show the full path --- .../simplemobiletools/filemanager/Config.java | 8 ------ .../filemanager/Constants.java | 1 - .../activities/SettingsActivity.java | 12 -------- .../filemanager/activities/MainActivity.kt | 17 ----------- app/src/main/res/layout/activity_settings.xml | 28 +------------------ app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values-ja/strings.xml | 1 - app/src/main/res/values-pt-rPT/strings.xml | 1 - app/src/main/res/values-sv/strings.xml | 1 - app/src/main/res/values/strings.xml | 1 - 11 files changed, 1 insertion(+), 71 deletions(-) diff --git a/app/src/main/java/com/simplemobiletools/filemanager/Config.java b/app/src/main/java/com/simplemobiletools/filemanager/Config.java index 1d298907..2d54aefc 100644 --- a/app/src/main/java/com/simplemobiletools/filemanager/Config.java +++ b/app/src/main/java/com/simplemobiletools/filemanager/Config.java @@ -37,12 +37,4 @@ public class Config { public void setShowHidden(boolean show) { mPrefs.edit().putBoolean(Constants.SHOW_HIDDEN, show).apply(); } - - public boolean getShowFullPath() { - return mPrefs.getBoolean(Constants.SHOW_FULL_PATH, false); - } - - public void setShowFullPath(boolean show) { - mPrefs.edit().putBoolean(Constants.SHOW_FULL_PATH, show).apply(); - } } diff --git a/app/src/main/java/com/simplemobiletools/filemanager/Constants.java b/app/src/main/java/com/simplemobiletools/filemanager/Constants.java index 00e6bbe7..30f531a7 100644 --- a/app/src/main/java/com/simplemobiletools/filemanager/Constants.java +++ b/app/src/main/java/com/simplemobiletools/filemanager/Constants.java @@ -8,5 +8,4 @@ public class Constants { public static final String IS_FIRST_RUN = "is_first_run"; public static final String IS_DARK_THEME = "is_dark_theme"; public static final String SHOW_HIDDEN = "show_hidden"; - public static final String SHOW_FULL_PATH = "show_full_path"; } diff --git a/app/src/main/java/com/simplemobiletools/filemanager/activities/SettingsActivity.java b/app/src/main/java/com/simplemobiletools/filemanager/activities/SettingsActivity.java index 91aa44e0..80dc7c5f 100644 --- a/app/src/main/java/com/simplemobiletools/filemanager/activities/SettingsActivity.java +++ b/app/src/main/java/com/simplemobiletools/filemanager/activities/SettingsActivity.java @@ -14,7 +14,6 @@ import butterknife.OnClick; public class SettingsActivity extends SimpleActivity { @BindView(R.id.settings_dark_theme) SwitchCompat mDarkThemeSwitch; @BindView(R.id.settings_show_hidden) SwitchCompat mShowHiddenSwitch; - @BindView(R.id.settings_show_full_path) SwitchCompat mShowFullPathSwitch; @Override protected void onCreate(Bundle savedInstanceState) { @@ -25,7 +24,6 @@ public class SettingsActivity extends SimpleActivity { setupDarkTheme(); setupShowHidden(); - setupShowFullPath(); } private void setupDarkTheme() { @@ -36,10 +34,6 @@ public class SettingsActivity extends SimpleActivity { mShowHiddenSwitch.setChecked(mConfig.getShowHidden()); } - private void setupShowFullPath() { - mShowFullPathSwitch.setChecked(mConfig.getShowFullPath()); - } - @OnClick(R.id.settings_dark_theme_holder) public void handleDarkTheme() { mDarkThemeSwitch.setChecked(!mDarkThemeSwitch.isChecked()); @@ -53,12 +47,6 @@ public class SettingsActivity extends SimpleActivity { mConfig.setShowHidden(mShowHiddenSwitch.isChecked()); } - @OnClick(R.id.settings_show_full_path_holder) - public void handleShowFullPath() { - mShowFullPathSwitch.setChecked(!mShowFullPathSwitch.isChecked()); - mConfig.setShowFullPath(mShowFullPathSwitch.isChecked()); - } - private void restartActivity() { TaskStackBuilder.create(getApplicationContext()).addNextIntentWithParentStack(getIntent()).startActivities(); } diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt index b2da18d3..6ea252ae 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt @@ -28,22 +28,6 @@ class MainActivity : SimpleActivity(), ItemsFragment.ItemInteractionListener, Br tryInitFileManager() } - override fun onResume() { - super.onResume() - if (Utils.hasStoragePermission(applicationContext)) { - val showFullPath = mConfig!!.showFullPath - if (showFullPath != mShowFullPath) - initRootFileManager() - - mShowFullPath = showFullPath - } - } - - override fun onPause() { - super.onPause() - mShowFullPath = mConfig!!.showFullPath - } - override fun onDestroy() { super.onDestroy() mConfig.isFirstRun = false @@ -142,7 +126,6 @@ class MainActivity : SimpleActivity(), ItemsFragment.ItemInteractionListener, Br private val STORAGE_PERMISSION = 1 private val BACK_PRESS_TIMEOUT = 5000 - private var mShowFullPath: Boolean = false private var mWasBackJustPressed: Boolean = false } } diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index b4bd803e..934cb87b 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -1,7 +1,7 @@ @@ -62,31 +62,5 @@ android:clickable="false"/> - - - - - - - - diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 94516eec..7afa4265 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -79,5 +79,4 @@ Einstellungen Dunkles Design Zeige versteckte Dateien und Ordner - Zeige ganzen Dateipfad diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 4d690af9..2720cd06 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -79,5 +79,4 @@ Impostazioni Tema scuro Mostra file e cartelle nascosti - Mostra percorso completo diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index ea20522a..4ece0510 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -79,5 +79,4 @@ 設定 ダークテーマ 非表示のファイルとディレクトリーを表示する - Show full path diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 1117740d..47b4a6f2 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -79,5 +79,4 @@ Definições Tema escuro Mostrar ficheiros e pastas ocultos - Mostrar caminho completo diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 99276907..dea6993b 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -79,5 +79,4 @@ Settings Mörkt tema Visa dolda filer - Show full path diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 60c3a355..744c4d13 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -82,5 +82,4 @@ Settings Dark theme Show hidden files and directories - Show full path