Dark theme

(cherry picked from commit 26461fe) With substantial rework to better implement app-wide theme change and pref setting. Signed-off-by: Maksim Lin <[email protected]>
sheimi · maks · Aug 23, 2016 · Nov 17, 2015 · Aug 4, 2016 · Aug 4, 2016
commit 870d78acf64286ae9e5cbde5d72db256853b8939
diff --git a/src/main/assets/midnight.css → src/main/assets/css/midnight.css b/src/main/assets/midnight.css → src/main/assets/css/midnight.css
diff --git a/src/main/assets/editor.html b/src/main/assets/editor.html
@@ -3,6 +3,7 @@
 <head>
   <title>ACE in Action</title>
   <link rel="stylesheet" href="css/codemirror.css">
+  <link rel="stylesheet" href="css/midnight.css">
   <script src="js/codemirror-compressed.js" type="text/javascript" charset="utf-8"></script>
   <script src="js/jquery.js"></script>
   <script src="js/editor.js"></script>

diff --git a/src/main/assets/js/editor.js b/src/main/assets/js/editor.js
diff --git a/src/main/java/me/sheimi/android/activities/SheimiFragmentActivity.java b/src/main/java/me/sheimi/android/activities/SheimiFragmentActivity.java
@@ -3,13 +3,16 @@
 import java.io.File;
 
 import me.sheimi.android.utils.BasicFunctions;
+import me.sheimi.android.utils.Profile;
 import me.sheimi.sgit.R;
+import me.sheimi.sgit.SGitApplication;
 import me.sheimi.sgit.dialogs.DummyDialogListener;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -33,6 +36,7 @@ public static interface OnBackClickListener {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         BasicFunctions.setActiveActivity(this);
+        setTheme(Profile.getThemeResource(getApplicationContext()));
     }
 
     @Override

diff --git a/src/main/java/me/sheimi/android/utils/Profile.java b/src/main/java/me/sheimi/android/utils/Profile.java
@@ -2,6 +2,8 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.content.res.TypedArray;
+import android.util.Log;
 
 import me.sheimi.sgit.R;
 import me.sheimi.sgit.SGitApplication;
@@ -16,6 +18,7 @@ public class Profile {
 
     private static boolean sHasLastCloneFail = false;
     private static Repo sLastFailRepo;
+    private static int sTheme = -1;
 
     private static SharedPreferences getProfileSharedPreference(Context context) {
         if (sSharedPreference == null) {
@@ -52,6 +55,28 @@ public static void setLastCloneFailed(Repo repo) {
     public static void setLastCloneSuccess() {
         sHasLastCloneFail = false;
     }
+
+    public static synchronized int getTheme(Context context) {
+        // silly, but Android framework want strings as value array for ListPreference
+        return Integer.parseInt(getProfileSharedPreference(context).getString(context.getString(R.string.pref_key_use_theme_id), "0"));
+    }
+
+    public static int getThemeResource(Context context) {
+        final int[] themes = { R.style.AppTheme, R.style.DarkAppTheme };
+        return themes[getTheme(context)];
+    }
+
+    public static String getCodeMirrorTheme(Context context) {
+        final String[] themes = context.getResources().getStringArray(R.array.codemirror_theme_names);
+        return themes[getTheme(context)];
+    }
+
+    public static int getStyledResource(Context context, int unstyled) {
+        TypedArray a = context.getTheme().obtainStyledAttributes(getThemeResource(context), new int[] {unstyled});
+        int styled = a.getResourceId(0, 0);
+        a.recycle();
+        return styled;
+    }
 }
 
 

diff --git a/src/main/java/me/sheimi/sgit/activities/CommitDiffActivity.java b/src/main/java/me/sheimi/sgit/activities/CommitDiffActivity.java
@@ -5,13 +5,16 @@
 import me.sheimi.android.activities.SheimiFragmentActivity;
 import me.sheimi.android.utils.CodeGuesser;
 import me.sheimi.android.utils.FsUtils;
+import me.sheimi.android.utils.Profile;
 import me.sheimi.sgit.R;
 import me.sheimi.sgit.database.models.Repo;
 import me.sheimi.sgit.repo.tasks.repo.CommitDiffTask;
 import me.sheimi.sgit.repo.tasks.repo.CommitDiffTask.CommitDiffResult;
 
 import org.eclipse.jgit.diff.DiffEntry;
 
+import android.content.Context;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
@@ -88,6 +91,7 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
                 return false;
             }
         });
+        mDiffContent.setBackgroundColor(Color.TRANSPARENT);
     }
 
     private void setupActionBar() {
@@ -257,6 +261,10 @@ public int getDiffSize() {
             return mDiffEntries.size();
         }
 
+        @JavascriptInterface
+        public String getTheme() {
+            return Profile.getCodeMirrorTheme(getApplicationContext());
+        }
     }
 
     private static final String HTML_TMPL = "<!doctype html>"

diff --git a/src/main/java/me/sheimi/sgit/activities/UserSettingsActivity.java b/src/main/java/me/sheimi/sgit/activities/UserSettingsActivity.java
@@ -1,14 +1,14 @@
 package me.sheimi.sgit.activities;
 
-import android.app.Activity;
 import android.os.Bundle;
 
+import me.sheimi.android.activities.SheimiFragmentActivity;
 import me.sheimi.sgit.fragments.SettingsFragment;
 
 /**
  * Activity for user settings
  */
-public class UserSettingsActivity extends Activity {
+public class UserSettingsActivity extends SheimiFragmentActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {

diff --git a/src/main/java/me/sheimi/sgit/activities/ViewFileActivity.java b/src/main/java/me/sheimi/sgit/activities/ViewFileActivity.java
@@ -7,6 +7,7 @@
 import me.sheimi.android.utils.BasicFunctions;
 import me.sheimi.android.utils.CodeGuesser;
 import me.sheimi.android.utils.FsUtils;
+import me.sheimi.android.utils.Profile;
 import me.sheimi.sgit.R;
 import me.sheimi.sgit.dialogs.ChooseLanguageDialog;
 
@@ -17,8 +18,10 @@
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Message;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -68,6 +71,7 @@ private void initViewFile() {
         WebSettings webSettings = mFileContent.getSettings();
         webSettings.setJavaScriptEnabled(true);
         mFileContent.setWebChromeClient(new WebChromeClient() {
+            @Override
             public void onConsoleMessage(String message, int lineNumber,
                     String sourceID) {
                 Log.d("MyApplication", message + " -- From line " + lineNumber
@@ -78,6 +82,7 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
                 return false;
             }
         });
+        mFileContent.setBackgroundColor(Color.TRANSPARENT);
     }
 
     @Override
@@ -249,6 +254,11 @@ public void run() {
             thread.start();
         }
 
+        @JavascriptInterface
+        public String getTheme() {
+            return Profile.getCodeMirrorTheme(getApplicationContext());
+        }
+
         private void display() {
             runOnUiThread(new Runnable() {
                 @Override

diff --git a/src/main/java/me/sheimi/sgit/activities/delegate/actions/MergeAction.java b/src/main/java/me/sheimi/sgit/activities/delegate/actions/MergeAction.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import me.sheimi.android.utils.Profile;
 import me.sheimi.android.views.SheimiDialogFragment;
 import me.sheimi.sgit.R;
 import me.sheimi.sgit.activities.RepoDetailActivity;
@@ -123,10 +124,10 @@ public View getView(int position, View convertView, ViewGroup parent) {
                 switch (commitType) {
                     case Repo.COMMIT_TYPE_HEAD:
                         holder.commitIcon
-                                .setImageResource(R.drawable.ic_branch_d);
+                                .setImageResource(Profile.getStyledResource(getContext(), R.drawable.ic_branch_l));
                         break;
                     case Repo.COMMIT_TYPE_TAG:
-                        holder.commitIcon.setImageResource(R.drawable.ic_tag_d);
+                        holder.commitIcon.setImageResource(Profile.getStyledResource(getContext(), R.drawable.ic_tag_l));
                         break;
                 }
                 holder.commitTitle.setText(displayName);

diff --git a/src/main/java/me/sheimi/sgit/activities/delegate/actions/RebaseAction.java b/src/main/java/me/sheimi/sgit/activities/delegate/actions/RebaseAction.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import me.sheimi.android.utils.Profile;
 import me.sheimi.android.views.SheimiDialogFragment;
 import me.sheimi.sgit.R;
 import me.sheimi.sgit.activities.RepoDetailActivity;
@@ -126,10 +127,10 @@ public View getView(int position, View convertView, ViewGroup parent) {
                 switch (commitType) {
                     case Repo.COMMIT_TYPE_HEAD:
                         holder.commitIcon
-                                .setImageResource(R.drawable.ic_branch_d);
+                                .setImageResource(Profile.getStyledResource(getContext(), R.drawable.ic_branch_l));
                         break;
                     case Repo.COMMIT_TYPE_TAG:
-                        holder.commitIcon.setImageResource(R.drawable.ic_tag_d);
+                        holder.commitIcon.setImageResource(Profile.getStyledResource(getContext(), R.drawable.ic_tag_l));
                         break;
                 }
                 holder.commitTitle.setText(displayName);

diff --git a/src/main/java/me/sheimi/sgit/adapters/FilesListAdapter.java b/src/main/java/me/sheimi/sgit/adapters/FilesListAdapter.java
@@ -5,6 +5,7 @@
 import java.util.Arrays;
 import java.util.Comparator;
 
+import me.sheimi.android.utils.Profile;
 import me.sheimi.sgit.R;
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -47,9 +48,9 @@ public View getView(int position, View convertView, ViewGroup parent) {
         File item = getItem(position);
         holder.fileTitle.setText(item.getName());
         if (item.isDirectory()) {
-            holder.fileIcon.setImageResource(R.drawable.ic_folder_d);
+            holder.fileIcon.setImageResource(Profile.getStyledResource(getContext(), R.drawable.ic_folder_fl));
         } else {
-            holder.fileIcon.setImageResource(R.drawable.ic_file_d);
+            holder.fileIcon.setImageResource(Profile.getStyledResource(getContext(), R.drawable.ic_file_fl));
         }
         // set if selected
         if (convertView.isSelected()) {

diff --git a/src/main/java/me/sheimi/sgit/fragments/SettingsFragment.java b/src/main/java/me/sheimi/sgit/fragments/SettingsFragment.java
@@ -1,13 +1,20 @@
 package me.sheimi.sgit.fragments;
 
 import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
+import android.support.v4.app.TaskStackBuilder;
+import android.util.Log;
 
 import me.sheimi.sgit.R;
+import me.sheimi.sgit.RepoListActivity;
 
 public class SettingsFragment extends PreferenceFragment {
+    private SharedPreferences.OnSharedPreferenceChangeListener mListener;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -19,6 +26,35 @@ public void onCreate(Bundle savedInstanceState) {
 
         // Load the preferences from an XML resource
         addPreferencesFromResource(R.xml.preferences);
+
+        final String themePrefKey = getString(R.string.pref_key_use_theme_id);
+
+        mListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
+            @Override
+            public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+                if (themePrefKey.equals(key)) {
+                    // nice trick to recreate the back stack, to ensure existing activities onCreate() are
+                    // called to set new theme, courtesy of: http://stackoverflow.com/a/28799124/85472
+                    TaskStackBuilder.create(getActivity())
+                            .addNextIntent(new Intent(getActivity(), RepoListActivity.class))
+                            .addNextIntent(getActivity().getIntent())
+                            .startActivities();
+                }
+            }
+        };
+    }
+
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        getPreferenceManager().getSharedPreferences().registerOnSharedPreferenceChangeListener(mListener);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        getPreferenceManager().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(mListener);
     }
 }
 
diff --git a/src/main/res/drawable-hdpi/ic_folder_w.png b/src/main/res/drawable-hdpi/ic_folder_w.png
diff --git a/src/main/res/drawable-mdpi/ic_folder_w.png b/src/main/res/drawable-mdpi/ic_folder_w.png
diff --git a/src/main/res/drawable-xhdpi/ic_folder_w.png b/src/main/res/drawable-xhdpi/ic_folder_w.png
diff --git a/src/main/res/layout/activity_repo_detail.xml b/src/main/res/layout/activity_repo_detail.xml
@@ -10,7 +10,7 @@
         android:layout_width="240dp"
         android:layout_height="match_parent"
         android:layout_gravity="end"
-        android:background="#eee" >
+        android:background="?drawable/drawer_background" >
 
         <ListView
             android:id="@+id/repoOperationList"

diff --git a/src/main/res/layout/activity_repo_detail_content.xml b/src/main/res/layout/activity_repo_detail_content.xml
@@ -13,7 +13,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="top"
-            android:background="#33b5e5"
+            android:background="?drawable/pager_title_strip_background"
             android:paddingBottom="4dp"
             android:paddingTop="4dp"
             android:textColor="#fff" />
@@ -24,7 +24,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:background="@drawable/bt_branch_name_bg"
+        android:background="?drawable/bt_branch_name_bg"
         android:gravity="center"
         android:padding="@dimen/branch_label_padding"
         android:text="@string/default_text"
@@ -91,4 +91,4 @@
         </RelativeLayout>
     </LinearLayout>
 
-</RelativeLayout>
+</RelativeLayout>
diff --git a/src/main/res/layout/dialog_profile.xml b/src/main/res/layout/dialog_profile.xml
diff --git a/src/main/res/layout/drawer_list_item.xml b/src/main/res/layout/drawer_list_item.xml
@@ -13,6 +13,6 @@
         android:paddingLeft="16dp"
         android:paddingRight="16dp"
         android:textAppearance="?android:attr/textAppearanceListItemSmall"
-        android:textColor="#333" />
+        android:textColor="?drawable/drawer_text_color" />
 
 </RelativeLayout>