diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 46719ef..c3b97c6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + xmlns:android="http://schemas.android.com/apk/res/android" + package="com.simplemobiletools.flashlight"> @@ -19,7 +19,7 @@ + android:theme="@style/BlackSplashScreen.Dark"> diff --git a/app/src/main/java/com/simplemobiletools/flashlight/activities/MainActivity.java b/app/src/main/java/com/simplemobiletools/flashlight/activities/MainActivity.java index ea28f76..6307dc5 100644 --- a/app/src/main/java/com/simplemobiletools/flashlight/activities/MainActivity.java +++ b/app/src/main/java/com/simplemobiletools/flashlight/activities/MainActivity.java @@ -8,6 +8,7 @@ import android.view.MenuItem; import android.view.View; import android.view.WindowManager; import android.widget.ImageView; +import android.widget.SeekBar; import com.simplemobiletools.flashlight.BusProvider; import com.simplemobiletools.flashlight.Config; @@ -26,6 +27,7 @@ public class MainActivity extends SimpleActivity { @BindView(R.id.toggle_btn) ImageView mToggleBtn; @BindView(R.id.bright_display_btn) ImageView mBrightDisplayBtn; @BindView(R.id.stroboscope_btn) ImageView mStroboscopeBtn; + @BindView(R.id.stroboscope_bar) SeekBar mStroboscopeBar; private static Bus mBus; private static MyCameraImpl mCameraImpl; @@ -111,6 +113,10 @@ public class MainActivity extends SimpleActivity { protected void onDestroy() { super.onDestroy(); Config.newInstance(getApplicationContext()).setIsFirstRun(false); + releaseCamera(); + } + + private void releaseCamera() { if (mCameraImpl != null) { mCameraImpl.releaseCamera(); mCameraImpl = null; diff --git a/app/src/main/java/com/simplemobiletools/flashlight/activities/SimpleActivity.java b/app/src/main/java/com/simplemobiletools/flashlight/activities/SimpleActivity.java index 828f1ad..da3166d 100644 --- a/app/src/main/java/com/simplemobiletools/flashlight/activities/SimpleActivity.java +++ b/app/src/main/java/com/simplemobiletools/flashlight/activities/SimpleActivity.java @@ -16,7 +16,7 @@ public class SimpleActivity extends AppCompatActivity { mConfig = Config.newInstance(getApplicationContext()); int theme = mConfig.getIsDarkTheme() ? R.style.AppTheme_Dark : R.style.AppTheme; if (this instanceof MainActivity) { - theme = mConfig.getIsDarkTheme() ? R.style.BlackSplashScreen_Dark : R.style.BlackSplashScreen; + theme = R.style.BlackSplashScreen_Dark; } setTheme(theme); super.onCreate(savedInstanceState); diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 0c6477f..a4a76d3 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -11,26 +11,33 @@ + android:src="@mipmap/bright_display"/> + android:src="@mipmap/bright_display"/> + + diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index b3e818d..136c3ab 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -77,7 +77,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:paddingLeft="@dimen/settings_padding" - android:text="@string/stroboscope"/> + android:text="@string/show_stroboscope"/> Einstellungen Dunkles Thema Zeige Knopf für helles Display - Show a stroboscope button + Show a stroboscope button Über diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index bb9a47d..1afc280 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -8,7 +8,7 @@ Impostazioni Tema scuro Mostra un pulsante per schermo luminoso - Show a stroboscope button + Show a stroboscope button Informazioni diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 5fbbee9..1377d96 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -8,7 +8,7 @@ 設定 ダークテーマ Show a bright display button - Show a stroboscope button + Show a stroboscope button アプリについて diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index e6c83e7..8b2bd3a 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -8,7 +8,7 @@ Inställningar Mörkt tema Show a bright display button - Show a stroboscope button + Show a stroboscope button Om diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index ab60650..0ee4adf 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,9 +1,12 @@ 16dp - 40dp + 30dp 8dp 40dp 8dp + 250dp + 6dp + 150dp 14sp 18sp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 550bb0f..29e6768 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -8,7 +8,7 @@ Settings Dark theme Show a bright display button - Show a stroboscope button + Show a stroboscope button About diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 7cad609..ed34ff0 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -17,10 +17,6 @@ @android:color/black - -