diff --git a/app/src/main/java/com/simplemobiletools/camera/Config.java b/app/src/main/java/com/simplemobiletools/camera/Config.java index b2ebb740..03d58dce 100644 --- a/app/src/main/java/com/simplemobiletools/camera/Config.java +++ b/app/src/main/java/com/simplemobiletools/camera/Config.java @@ -30,6 +30,14 @@ public class Config { mPrefs.edit().putBoolean(Constants.IS_DARK_THEME, isDarkTheme).apply(); } + public boolean getUseDCIMFolder() { + return mPrefs.getBoolean(Constants.USE_DCIM, true); + } + + public void setUseDCIMFolder(boolean useDCIM) { + mPrefs.edit().putBoolean(Constants.USE_DCIM, useDCIM).apply(); + } + public boolean getFocusBeforeCaptureEnabled() { return mPrefs.getBoolean(Constants.FOCUS_BEFORE_CAPTURE, false); } diff --git a/app/src/main/java/com/simplemobiletools/camera/Constants.java b/app/src/main/java/com/simplemobiletools/camera/Constants.java index 3cb308e0..27268aa3 100644 --- a/app/src/main/java/com/simplemobiletools/camera/Constants.java +++ b/app/src/main/java/com/simplemobiletools/camera/Constants.java @@ -9,6 +9,7 @@ public class Constants { public static final String PREFS_KEY = "Camera"; public static final String IS_FIRST_RUN = "is_first_run"; public static final String IS_DARK_THEME = "is_dark_theme"; + public static final String USE_DCIM = "use_dcim"; public static final String FOCUS_BEFORE_CAPTURE = "focus_before_capture"; public static final String SOUND = "sound"; public static final String FORCE_RATIO = "force_ratio"; diff --git a/app/src/main/java/com/simplemobiletools/camera/activities/SettingsActivity.java b/app/src/main/java/com/simplemobiletools/camera/activities/SettingsActivity.java index d6f28d7f..33e5e50e 100644 --- a/app/src/main/java/com/simplemobiletools/camera/activities/SettingsActivity.java +++ b/app/src/main/java/com/simplemobiletools/camera/activities/SettingsActivity.java @@ -18,6 +18,7 @@ import butterknife.OnItemSelected; public class SettingsActivity extends SimpleActivity { @BindView(R.id.settings_dark_theme) SwitchCompat mDarkThemeSwitch; + @BindView(R.id.settings_use_dcim) SwitchCompat mUseDCIMSwitch; @BindView(R.id.settings_focus_before_capture) SwitchCompat mFocusBeforeCaptureSwitch; @BindView(R.id.settings_sound) SwitchCompat mSoundSwitch; @BindView(R.id.settings_force_ratio) SwitchCompat mForceRatioSwitch; @@ -34,6 +35,7 @@ public class SettingsActivity extends SimpleActivity { ButterKnife.bind(this); setupDarkTheme(); + setupUseDCIM(); setupFocusBeforeCapture(); setupSound(); setupForceRatio(); @@ -63,6 +65,10 @@ public class SettingsActivity extends SimpleActivity { mDarkThemeSwitch.setChecked(mConfig.getIsDarkTheme()); } + private void setupUseDCIM() { + mUseDCIMSwitch.setChecked(mConfig.getUseDCIMFolder()); + } + private void setupFocusBeforeCapture() { mFocusBeforeCaptureSwitch.setChecked(mConfig.getFocusBeforeCaptureEnabled()); } @@ -90,6 +96,12 @@ public class SettingsActivity extends SimpleActivity { restartActivity(); } + @OnClick(R.id.settings_use_dcim_holder) + public void handleUseDCIM() { + mUseDCIMSwitch.setChecked(!mUseDCIMSwitch.isChecked()); + mConfig.setUseDCIMFolder(mUseDCIMSwitch.isChecked()); + } + @OnClick(R.id.settings_focus_before_capture_holder) public void handleFocusBeforeCapture() { mFocusBeforeCaptureSwitch.setChecked(!mFocusBeforeCaptureSwitch.isChecked()); diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index ac5096d2..195c35a0 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -38,6 +38,32 @@ + + + + + + + + Impostazioni Tema scuro + Store media in the default DCIM folder Messa a fuoco prima della cattura Forza proporzione 16:9 Limite risoluzione foto diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 33ef652b..26b4282f 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -18,6 +18,7 @@ 設定 ダークテーマ + Store media in the default DCIM folder キャプチャ前に再度焦点を合わせる 強制的に 16:9 レシオにする 写真解像度の限度 diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 0fa192d5..a3a2173c 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -18,6 +18,7 @@ Настройки темная тема + Store media in the default DCIM folder Перефокусировка перед захватом Принудительное соотношение сторон 16:9 Лимит разрешения фото diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 5b8c30e6..cc3da046 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -18,6 +18,7 @@ Inställningar Mörkt tema + Store media in the default DCIM folder Fokusera om innan bildtagning Tvinga 16:9-förhållande Bildupplösningsgräns diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2043917c..4e4c0b6d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -18,6 +18,7 @@ Settings Dark theme + Store media in the default DCIM folder Refocus before capture Force 16:9 ratio Photo resolution limit