add dark theme

tibbi · tibbi · commit 77d0e9a7d4d4 · 2016-07-24T11:13:42.000+02:00
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -29,15 +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:label="@string/settings"
+            android:parentActivityName=".activities.MainActivity"/>
 
         <receiver
             android:name=".MyWidgetProvider"
diff --git a/app/src/main/java/com/simplemobiletools/notes/Config.java b/app/src/main/java/com/simplemobiletools/notes/Config.java
@@ -22,6 +22,14 @@ 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();
+    }
+
     public boolean getIsAutosaveEnabled() {
         return mPrefs.getBoolean(Constants.AUTOSAVE, false);
     }
diff --git a/app/src/main/java/com/simplemobiletools/notes/Constants.java b/app/src/main/java/com/simplemobiletools/notes/Constants.java
@@ -6,6 +6,7 @@ public class Constants {
     // shared preferences
     public static final String PREFS_KEY = "Notes";
     public static final String IS_FIRST_RUN = "is_first_run";
+    public static final String IS_DARK_THEME = "is_dark_theme";
     public static final String AUTOSAVE = "autosave";
     public static final String WIDGET_BG_COLOR = "widget_bg_color";
     public static final String WIDGET_TEXT_COLOR = "widget_text_color";
diff --git a/app/src/main/java/com/simplemobiletools/notes/activities/AboutActivity.java b/app/src/main/java/com/simplemobiletools/notes/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/notes/activities/LicenseActivity.java b/app/src/main/java/com/simplemobiletools/notes/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.notes.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/notes/activities/MainActivity.java b/app/src/main/java/com/simplemobiletools/notes/activities/MainActivity.java
@@ -7,7 +7,6 @@
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.inputmethod.InputMethodManager;
@@ -22,7 +21,7 @@
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class MainActivity extends AppCompatActivity {
+public class MainActivity extends SimpleActivity {
     @BindView(R.id.notes_view) EditText mNotesView;
 
     private SharedPreferences mPrefs;
diff --git a/app/src/main/java/com/simplemobiletools/notes/activities/SettingsActivity.java b/app/src/main/java/com/simplemobiletools/notes/activities/SettingsActivity.java
@@ -1,7 +1,7 @@
 package com.simplemobiletools.notes.activities;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import android.support.v4.app.TaskStackBuilder;
 import android.support.v7.widget.SwitchCompat;
 
 import com.simplemobiletools.notes.Config;
@@ -11,7 +11,8 @@
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
-public class SettingsActivity extends AppCompatActivity {
+public class SettingsActivity extends SimpleActivity {
+    @BindView(R.id.settings_dark_theme) SwitchCompat mDarkThemeSwitch;
     @BindView(R.id.settings_autosave) SwitchCompat mAutosaveSwitch;
 
     private static Config mConfig;
@@ -23,16 +24,32 @@ protected void onCreate(Bundle savedInstanceState) {
         mConfig = Config.newInstance(getApplicationContext());
         ButterKnife.bind(this);
 
+        setupDarkTheme();
         setupAutosave();
     }
 
+    private void setupDarkTheme() {
+        mDarkThemeSwitch.setChecked(mConfig.getIsDarkTheme());
+    }
+
     private void setupAutosave() {
         mAutosaveSwitch.setChecked(mConfig.getIsAutosaveEnabled());
     }
 
+    @OnClick(R.id.settings_dark_theme_holder)
+    public void handleDarkTheme() {
+        mDarkThemeSwitch.setChecked(!mDarkThemeSwitch.isChecked());
+        mConfig.setIsDarkTheme(mDarkThemeSwitch.isChecked());
+        restartActivity();
+    }
+
     @OnClick(R.id.settings_autosave_holder)
     public void handleAutosave() {
         mAutosaveSwitch.setChecked(!mAutosaveSwitch.isChecked());
         mConfig.setIsAutosaveEnabled(mAutosaveSwitch.isChecked());
     }
+
+    private void restartActivity() {
+        TaskStackBuilder.create(getApplicationContext()).addNextIntentWithParentStack(getIntent()).startActivities();
+    }
 }
diff --git a/app/src/main/java/com/simplemobiletools/notes/activities/SimpleActivity.java b/app/src/main/java/com/simplemobiletools/notes/activities/SimpleActivity.java
@@ -0,0 +1,31 @@
+package com.simplemobiletools.notes.activities;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.view.MenuItem;
+
+import com.simplemobiletools.notes.Config;
+import com.simplemobiletools.notes.R;
+
+public class SimpleActivity extends AppCompatActivity {
+    protected Config mConfig;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        mConfig = Config.newInstance(getApplicationContext());
+        setTheme(mConfig.getIsDarkTheme() ? R.style.AppTheme_Dark : R.style.AppTheme);
+        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_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -10,6 +10,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@null"
-        android:gravity="top"
-        android:textColor="@color/dark_grey"/>
+        android:gravity="top"/>
+
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
@@ -11,6 +11,32 @@
         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>
+
         <RelativeLayout
             android:id="@+id/settings_autosave_holder"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -10,6 +10,7 @@
 
     <!-- Settings -->
     <string name="settings">Impostazioni</string>
+    <string name="dark_theme">Tema scuro</string>
     <string name="autosave">Autosalvataggio</string>
 
     <!-- About -->
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
@@ -10,6 +10,7 @@
 
     <!-- Settings -->
     <string name="settings">設定</string>
+    <string name="dark_theme">ダークテーマ</string>
     <string name="autosave">自動保存</string>
 
     <!-- About -->
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
@@ -10,6 +10,7 @@
 
     <!-- Settings -->
     <string name="settings">Inställningar</string>
+    <string name="dark_theme">Mörkt tema</string>
     <string name="autosave">Spara automatiskt</string>
 
     <!-- About -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -10,6 +10,7 @@
 
     <!-- Settings -->
     <string name="settings">Settings</string>
+    <string name="dark_theme">Dark theme</string>
     <string name="autosave">Autosave</string>
 
     <!-- About -->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -8,6 +8,14 @@
         <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="MyWidgetConfigTheme" parent="@style/AppTheme">
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowShowWallpaper">true</item>

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,14 @@ public void setIsFirstRun(boolean firstRun) {`
`22`	`22`	`mPrefs.edit().putBoolean(Constants.IS_FIRST_RUN, firstRun).apply();`
`23`	`23`	`}`
`24`	`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`	`+ }`
	`32`	`+`
`25`	`33`	`public boolean getIsAutosaveEnabled() {`
`26`	`34`	`return mPrefs.getBoolean(Constants.AUTOSAVE, false);`
`27`	`35`	`}`