Improve theme preview

Author: tranleduy2000

app/src/main/java/com/duy/editor/EditorThemeActivity.java

@@ -17,7 +17,6 @@
 import com.duy.common.purchase.InAppPurchaseHelper;
 import com.duy.common.purchase.Premium;
 import com.duy.ide.editor.theme.ThemeAdapter;
-import com.duy.ide.editor.theme.ThemeLoader;
 import com.duy.ide.editor.theme.model.EditorTheme;
 import com.jecelyin.editor.v2.Preferences;
 import com.jecelyin.editor.v2.ThemeSupportActivity;
@@ -32,21 +31,19 @@ public class EditorThemeActivity extends ThemeSupportActivity implements ThemeAd
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
         setContentView(R.layout.activity_editor_theme);
         setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         setTitle("");
-
-        ThemeLoader.init(this);
+        mPreferences = Preferences.getInstance(this);
 
         mRecyclerView = findViewById(R.id.recyclerView);
         mRecyclerView.setLayoutManager(new LinearLayoutManager(this));
         mRecyclerView.addItemDecoration(new DividerItemDecoration(this, DividerItemDecoration.VERTICAL));
         mThemeAdapter = new ThemeAdapter(this);
         mThemeAdapter.setOnThemeSelectListener(this);
         mRecyclerView.setAdapter(mThemeAdapter);
-        mPreferences = Preferences.getInstance(this);
+        mRecyclerView.scrollToPosition(findThemeIndex(mPreferences.getEditorTheme()));
 
         boolean useLightTheme = mPreferences.isUseLightTheme();
 
@@ -68,6 +65,15 @@ public void onNothingSelected(AdapterView<?> parent) {
         mPreferences.registerOnSharedPreferenceChangeListener(this);
     }
 
+    private int findThemeIndex(EditorTheme editorTheme) {
+        int position = mThemeAdapter.getPosition(editorTheme);
+        if (position < 0) {
+            return 0;
+        }
+        return position;
+    }
+
+
     private void useLightTheme(boolean useLightTheme) {
         if (mPreferences.isUseLightTheme() != useLightTheme) {
             mPreferences.setTheme(useLightTheme ? 0 : 1);

app/src/main/res/values/strings.xml

@@ -35,5 +35,5 @@
     </string>
 
     <string name="button_purchase_restore">Restore</string>
-    <string name="selected_theme">Selected %s</string>
+    <string name="selected_theme">Selected %s. Restart app to apply theme.</string>
 </resources>

editor-view/src/main/java/com/duy/ide/editor/theme/ThemeAdapter.java

@@ -29,7 +29,6 @@ public class ThemeAdapter extends RecyclerView.Adapter<ThemeAdapter.ViewHolder>
     private Context mContext;
     private OnThemeSelectListener onThemeSelectListener;
 
-
     public ThemeAdapter(Context context) {
         mContext = context;
         ThemeLoader.init(context);
@@ -42,6 +41,10 @@ public int compare(EditorTheme o1, EditorTheme o2) {
         });
     }
 
+    public int getPosition(EditorTheme editorTheme) {
+        return mEditorThemes.indexOf(editorTheme);
+    }
+
     @NonNull
     @Override
     public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
@@ -77,23 +80,15 @@ public void onBindViewHolder(@NonNull final ViewHolder holder, int position) {
         holder.mBtnSelect.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (onThemeSelectListener != null){
+                if (onThemeSelectListener != null) {
                     onThemeSelectListener.onThemeSelected(editorTheme);
                 }
             }
         });
     }
 
     private String makeTitle(int position, EditorTheme editorTheme) {
-        StringBuilder builder = new StringBuilder(String.valueOf(position + 1));
-        builder.append(". ");
-        builder.append(editorTheme.getName());
-        for (int i = 0; i < builder.length(); i++) {
-            if (builder.charAt(i) == ' ' && i + 1 < builder.length()) {
-                builder.setCharAt(i + 1, Character.toUpperCase(builder.charAt(i + 1)));
-            }
-        }
-        return builder.toString();
+        return (position + 1) + ". " + editorTheme.getName();
     }
 
     @Override
@@ -151,7 +146,7 @@ public interface OnThemeSelectListener {
     }
 
     static class ViewHolder extends RecyclerView.ViewHolder {
-         View mBtnSelect;
+        View mBtnSelect;
         EditAreaView mEditorView;
         TextView mTxtName;
 

editor-view/src/main/java/com/duy/ide/editor/theme/model/EditorTheme.java

@@ -1,10 +1,12 @@
 package com.duy.ide.editor.theme.model;
 
 import android.graphics.Color;
+import android.support.annotation.NonNull;
 
 import com.duy.ide.editor.theme.SyntaxUtilities;
 import com.jecelyin.common.utils.DLog;
 
+import java.util.Arrays;
 import java.util.Properties;
 
 
@@ -92,8 +94,19 @@ public String getName() {
         return name;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public void setName(@NonNull String name) {
+        if (name.isEmpty()){
+            return;
+        }
+        StringBuilder builder = new StringBuilder();
+        builder.append(name.replace("-", " "));
+        builder.setCharAt(0, Character.toUpperCase(builder.charAt(0)));
+        for (int i = 0; i < builder.length(); i++) {
+            if (builder.charAt(i) == ' ' && i + 1 < builder.length()) {
+                builder.setCharAt(i + 1, Character.toUpperCase(builder.charAt(i + 1)));
+            }
+        }
+        this.name = builder.toString();
     }
 
     public String getFileName() {
@@ -104,6 +117,34 @@ public void setFileName(String fileName) {
         this.fileName = fileName;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof EditorTheme)) return false;
+
+        EditorTheme that = (EditorTheme) o;
+
+        if (getGutterStyle() != null ? !getGutterStyle().equals(that.getGutterStyle()) : that.getGutterStyle() != null)
+            return false;
+        if (getWhiteSpaceStyle() != null ? !getWhiteSpaceStyle().equals(that.getWhiteSpaceStyle()) : that.getWhiteSpaceStyle() != null)
+            return false;
+        // Probably incorrect - comparing Object[] arrays with Arrays.equals
+        if (!Arrays.equals(getSyntaxStyles(), that.getSyntaxStyles())) return false;
+        if (getFileName() != null ? !getFileName().equals(that.getFileName()) : that.getFileName() != null)
+            return false;
+        return getName() != null ? getName().equals(that.getName()) : that.getName() == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getGutterStyle() != null ? getGutterStyle().hashCode() : 0;
+        result = 31 * result + (getWhiteSpaceStyle() != null ? getWhiteSpaceStyle().hashCode() : 0);
+        result = 31 * result + Arrays.hashCode(getSyntaxStyles());
+        result = 31 * result + (getFileName() != null ? getFileName().hashCode() : 0);
+        result = 31 * result + (getName() != null ? getName().hashCode() : 0);
+        return result;
+    }
+
     public enum ThemeAttr {
         SCHEME_NAME("theme.name"),
         TYPE("theme.type"),