add Dark theme

tibbi · tibbi · commit fb2229cdf47f · 2016-07-24T11:58:05.000+02:00
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -29,11 +29,18 @@
 
         <activity
             android:name=".activities.AboutActivity"
-            android:label="@string/about"/>
+            android:label="@string/about"
+            android:parentActivityName=".activities.MainActivity"/>
 
         <activity
             android:name=".activities.LicenseActivity"
-            android:label="@string/third_party_licences"/>
+            android:label="@string/third_party_licences"
+            android:parentActivityName=".activities.AboutActivity"/>
+
+        <activity
+            android:name=".activities.SettingsActivity"
+            android:label="@string/settings"
+            android:parentActivityName=".activities.MainActivity"/>
 
         <receiver
             android:name=".MyWidgetProvider"
diff --git a/app/src/main/java/com/simplemobiletools/flashlight/Config.java b/app/src/main/java/com/simplemobiletools/flashlight/Config.java
@@ -21,4 +21,12 @@ public boolean getIsFirstRun() {
     public void setIsFirstRun(boolean firstRun) {
         mPrefs.edit().putBoolean(Constants.IS_FIRST_RUN, firstRun).apply();
     }
+
+    public boolean getIsDarkTheme() {
+        return mPrefs.getBoolean(Constants.IS_DARK_THEME, false);
+    }
+
+    public void setIsDarkTheme(boolean isDarkTheme) {
+        mPrefs.edit().putBoolean(Constants.IS_DARK_THEME, isDarkTheme).apply();
+    }
 }
diff --git a/app/src/main/java/com/simplemobiletools/flashlight/Constants.java b/app/src/main/java/com/simplemobiletools/flashlight/Constants.java
@@ -4,4 +4,5 @@ public class Constants {
     // shared preferences
     public static final String PREFS_KEY = "Flashlight";
     public static final String IS_FIRST_RUN = "is_first_run";
+    public static final String IS_DARK_THEME = "is_dark_theme";
 }
diff --git a/app/src/main/java/com/simplemobiletools/flashlight/activities/AboutActivity.java b/app/src/main/java/com/simplemobiletools/flashlight/activities/AboutActivity.java
@@ -5,7 +5,6 @@
 import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
 import android.view.View;
@@ -21,7 +20,7 @@
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
-public class AboutActivity extends AppCompatActivity {
+public class AboutActivity extends SimpleActivity {
     @BindView(R.id.about_copyright) TextView mCopyright;
     @BindView(R.id.about_email) TextView mEmailTV;
     @BindView(R.id.about_rate_us) View mRateUs;
diff --git a/app/src/main/java/com/simplemobiletools/flashlight/activities/LicenseActivity.java b/app/src/main/java/com/simplemobiletools/flashlight/activities/LicenseActivity.java
@@ -3,14 +3,13 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 
 import com.simplemobiletools.flashlight.R;
 
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
-public class LicenseActivity extends AppCompatActivity {
+public class LicenseActivity extends SimpleActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/java/com/simplemobiletools/flashlight/activities/MainActivity.java b/app/src/main/java/com/simplemobiletools/flashlight/activities/MainActivity.java
@@ -3,7 +3,6 @@
 import android.content.Intent;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.WindowManager;
@@ -22,7 +21,7 @@
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
-public class MainActivity extends AppCompatActivity {
+public class MainActivity extends SimpleActivity {
     @BindView(R.id.toggle_btn) ImageView mToggleBtn;
 
     private static Bus mBus;
@@ -46,6 +45,9 @@ public boolean onCreateOptionsMenu(Menu menu) {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
+            case R.id.settings:
+                startActivity(new Intent(getApplicationContext(), SettingsActivity.class));
+                return true;
             case R.id.about:
                 startActivity(new Intent(getApplicationContext(), AboutActivity.class));
                 return true;
diff --git a/app/src/main/java/com/simplemobiletools/flashlight/activities/SettingsActivity.java b/app/src/main/java/com/simplemobiletools/flashlight/activities/SettingsActivity.java
@@ -0,0 +1,43 @@
+package com.simplemobiletools.flashlight.activities;
+
+import android.os.Bundle;
+import android.support.v4.app.TaskStackBuilder;
+import android.support.v7.widget.SwitchCompat;
+
+import com.simplemobiletools.flashlight.Config;
+import com.simplemobiletools.flashlight.R;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+public class SettingsActivity extends SimpleActivity {
+    @BindView(R.id.settings_dark_theme) SwitchCompat mDarkThemeSwitch;
+
+    private static Config mConfig;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_settings);
+        mConfig = Config.newInstance(getApplicationContext());
+        ButterKnife.bind(this);
+
+        setupDarkTheme();
+    }
+
+    private void setupDarkTheme() {
+        mDarkThemeSwitch.setChecked(mConfig.getIsDarkTheme());
+    }
+
+    @OnClick(R.id.settings_dark_theme_holder)
+    public void handleDarkTheme() {
+        mDarkThemeSwitch.setChecked(!mDarkThemeSwitch.isChecked());
+        mConfig.setIsDarkTheme(mDarkThemeSwitch.isChecked());
+        restartActivity();
+    }
+
+    private void restartActivity() {
+        TaskStackBuilder.create(getApplicationContext()).addNextIntentWithParentStack(getIntent()).startActivities();
+    }
+}
diff --git a/app/src/main/java/com/simplemobiletools/flashlight/activities/SimpleActivity.java b/app/src/main/java/com/simplemobiletools/flashlight/activities/SimpleActivity.java
@@ -0,0 +1,35 @@
+package com.simplemobiletools.flashlight.activities;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.view.MenuItem;
+
+import com.simplemobiletools.flashlight.Config;
+import com.simplemobiletools.flashlight.R;
+
+public class SimpleActivity extends AppCompatActivity {
+    protected Config mConfig;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        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;
+        }
+        setTheme(theme);
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                finish();
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+}
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+    android:id="@+id/settings_scrollview"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:id="@+id/settings_holder"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:id="@+id/settings_dark_theme_holder"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/settings_padding"
+            android:background="?android:attr/selectableItemBackground"
+            android:padding="@dimen/activity_margin">
+
+            <TextView
+                android:id="@+id/settings_dark_theme_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:paddingLeft="@dimen/settings_padding"
+                android:text="@string/dark_theme"/>
+
+            <android.support.v7.widget.SwitchCompat
+                android:id="@+id/settings_dark_theme"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:background="@null"
+                android:clickable="false"/>
+
+        </RelativeLayout>
+    </LinearLayout>
+</ScrollView>
diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/settings"
+        android:title="@string/settings"
+        app:showAsAction="never"/>
     <item
         android:id="@+id/about"
         android:title="@string/about"
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -2,6 +2,10 @@
     <string name="app_name">Simple Flashlight</string>
     <string name="camera_error">Rilevamento fotocamera fallito</string>
 
+    <!-- Settings -->
+    <string name="settings">Impostazioni</string>
+    <string name="dark_theme">Tema scuro</string>
+
     <!-- About -->
     <string name="about">Informazioni</string>
     <string name="website">Altre semplici app e codici sorgenti in:\nhttp://simplemobiletools.com</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
@@ -2,6 +2,10 @@
     <string name="app_name">シンプル フラッシュライト</string>
     <string name="camera_error">カメラの取得に失敗しました</string>
 
+    <!-- Settings -->
+    <string name="settings">設定</string>
+    <string name="dark_theme">ダークテーマ</string>
+
     <!-- About -->
     <string name="about">アプリについて</string>
     <string name="website">もっとシンプルなアプリとソースコード:\nhttp://simplemobiletools.com</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
@@ -2,6 +2,10 @@
     <string name="app_name">Simple Flashlight</string>
     <string name="camera_error">Det gick inte att komma åt kameran</string>
 
+    <!-- Settings -->
+    <string name="settings">Inställningar</string>
+    <string name="dark_theme">Mörkt tema</string>
+
     <!-- About -->
     <string name="about">Om</string>
     <string name="website">Fler enkla appar och källkod här:\nhttp://simplemobiletools.com</string>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -2,6 +2,7 @@
     <dimen name="activity_margin">16dp</dimen>
     <dimen name="social_padding">8dp</dimen>
     <dimen name="social_logo">40dp</dimen>
+    <dimen name="settings_padding">8dp</dimen>
 
     <dimen name="normal_text_size">14sp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -2,6 +2,10 @@
     <string name="app_name">Simple Flashlight</string>
     <string name="camera_error">Obtaining the camera failed</string>
 
+    <!-- Settings -->
+    <string name="settings">Settings</string>
+    <string name="dark_theme">Dark theme</string>
+
     <!-- About -->
     <string name="about">About</string>
     <string name="website">More simple apps and source code at:\nhttp://simplemobiletools.com</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -8,10 +8,22 @@
         <item name="android:textSize">@dimen/normal_text_size</item>
     </style>
 
+    <style name="AppTheme.Dark" parent="Theme.AppCompat">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="actionBarStyle">@style/AppTheme.ActionBarStyle</item>
+        <item name="android:textSize">@dimen/normal_text_size</item>
+    </style>
+
     <style name="BlackSplashScreen" parent="AppTheme">
         <item name="android:windowBackground">@null</item>
     </style>
 
+    <style name="BlackSplashScreen.Dark" parent="AppTheme.Dark">
+        <item name="android:windowBackground">@null</item>
+    </style>
+
     <style name="AppTheme.ActionBarStyle" parent="@style/Base.Widget.AppCompat.ActionBar">
         <item name="background">@color/colorPrimary</item>
         <item name="titleTextStyle">@style/AppTheme.ActionBar.TitleTextStyle</item>

Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,12 @@ public boolean getIsFirstRun() {`
`21`	`21`	`public void setIsFirstRun(boolean firstRun) {`
`22`	`22`	`mPrefs.edit().putBoolean(Constants.IS_FIRST_RUN, firstRun).apply();`
`23`	`23`	`}`
	`24`	`+`
	`25`	`+ public boolean getIsDarkTheme() {`
	`26`	`+ return mPrefs.getBoolean(Constants.IS_DARK_THEME, false);`
	`27`	`+ }`
	`28`	`+`
	`29`	`+ public void setIsDarkTheme(boolean isDarkTheme) {`
	`30`	`+ mPrefs.edit().putBoolean(Constants.IS_DARK_THEME, isDarkTheme).apply();`
	`31`	`+ }`
`24`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,5 @@ public class Constants {`
`4`	`4`	`// shared preferences`
`5`	`5`	`public static final String PREFS_KEY = "Flashlight";`
`6`	`6`	`public static final String IS_FIRST_RUN = "is_first_run";`
	`7`	`+ public static final String IS_DARK_THEME = "is_dark_theme";`
`7`	`8`	`}`