Theme select listener

Author: tranleduy2000

app/src/main/AndroidManifest.xml

@@ -125,7 +125,7 @@
         <activity
             android:name="jackpal.androidterm.TermPreferencesActivity"
             android:label="@string/preferences" />
-
+        <activity android:name="com.duy.editor.EditorThemeActivity" />
     </application>
 
 </manifest>

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

@@ -166,6 +166,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
             case R.id.action_premium:
                 clickUpgrade();
                 break;
+
+            case R.id.action_editor_color_scheme:
+                startActivity(new Intent(this, EditorThemeActivity.class));
+                break;
         }
         return super.onOptionsItemSelected(item);
     }

editor-view/src/main/java/com/duy/ide/editor/theme/EditorThemeActivity.java renamed to app/src/main/java/com/duy/editor/EditorThemeActivity.java

@@ -1,8 +1,9 @@
-package com.duy.ide.editor.theme;
+package com.duy.editor;
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.design.widget.Snackbar;
 import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -11,16 +12,22 @@
 import android.widget.AdapterView;
 import android.widget.Spinner;
 
-import com.duy.ide.editor.editor.R;
+import com.duy.ccppcompiler.R;
+import com.duy.ccppcompiler.ui.dialogs.PremiumDialog;
+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;
 
-public class EditorThemeActivity extends ThemeSupportActivity {
-    private static final String EXTRA_USE_LIGHT_THEME = "EXTRA_USE_LIGHT_THEME";
+public class EditorThemeActivity extends ThemeSupportActivity implements ThemeAdapter.OnThemeSelectListener {
     private RecyclerView mRecyclerView;
     private ThemeAdapter mThemeAdapter;
     private Spinner mSpinner;
     private Preferences mPreferences;
+    private InAppPurchaseHelper mInAppPurchaseHelper;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -37,7 +44,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         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);
 
@@ -57,6 +64,7 @@ public void onNothingSelected(AdapterView<?> parent) {
             }
         });
 
+        mInAppPurchaseHelper = new InAppPurchaseHelper(this);
         mPreferences.registerOnSharedPreferenceChangeListener(this);
     }
 
@@ -69,16 +77,24 @@ private void useLightTheme(boolean useLightTheme) {
 
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-        if (key.equals(getString(R.string.pref_current_theme))) {
-
-        } else {
-            super.onSharedPreferenceChanged(sharedPreferences, key);
-        }
+        super.onSharedPreferenceChanged(sharedPreferences, key);
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        Preferences.getInstance(this).unregisterOnSharedPreferenceChangeListener(this);
+        mPreferences.unregisterOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    public void onThemeSelected(EditorTheme theme) {
+        if (Premium.isPremiumUser(this)) {
+            mPreferences.setEditorTheme(theme.getName());
+            String text = getString(R.string.selected_theme, theme.getName());
+            Snackbar.make(mRecyclerView, text, Snackbar.LENGTH_SHORT).show();
+        } else {
+            PremiumDialog premiumDialog = new PremiumDialog(this, mInAppPurchaseHelper);
+            premiumDialog.show();
+        }
     }
 }

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

@@ -32,5 +32,7 @@
         2. Editor color schemes\n
         3. Change editor fonts
     </string>
+
     <string name="button_purchase_restore">Restore</string>
+    <string name="selected_theme">Selected %s</string>
 </resources>

editor-view/src/main/AndroidManifest.xml

@@ -23,6 +23,5 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <application android:supportsRtl="false">
-        <activity android:name="com.duy.ide.editor.theme.EditorThemeActivity" />
     </application>
 </manifest>

editor-view/src/main/java/com/duy/ide/editor/SimpleEditorActivity.java

@@ -48,14 +48,13 @@
 import com.duy.ide.editor.dialogs.DialogNewFile;
 import com.duy.ide.editor.editor.BuildConfig;
 import com.duy.ide.editor.editor.R;
-import com.duy.ide.editor.theme.EditorThemeActivity;
 import com.duy.ide.filemanager.FileManager;
 import com.jecelyin.common.utils.DLog;
 import com.jecelyin.common.utils.IOUtils;
 import com.jecelyin.common.utils.SysUtils;
 import com.jecelyin.common.utils.UIUtils;
-import com.jecelyin.editor.v2.ThemeSupportActivity;
 import com.jecelyin.editor.v2.Preferences;
+import com.jecelyin.editor.v2.ThemeSupportActivity;
 import com.jecelyin.editor.v2.common.Command;
 import com.jecelyin.editor.v2.dialog.CharsetsDialog;
 import com.jecelyin.editor.v2.dialog.GotoLineDialog;
@@ -437,9 +436,7 @@ public void run() {
             StoreUtil.shareThisApp(this);
         } else if (id == R.id.action_rate) {
             StoreUtil.gotoPlayStore(this, getPackageName());
-        } else if (id == R.id.action_editor_color_scheme){
-            startActivity(new Intent(this, EditorThemeActivity.class));
-        }else {
+        } else {
             commandEnum = MenuFactory.getInstance(this).idToCommandEnum(id);
             if (commandEnum != Command.CommandEnum.NONE)
                 doCommand(new Command(commandEnum));

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

@@ -27,6 +27,8 @@
 public class ThemeAdapter extends RecyclerView.Adapter<ThemeAdapter.ViewHolder> implements FastScrollRecyclerView.SectionedAdapter {
     private final ArrayList<EditorTheme> mEditorThemes;
     private Context mContext;
+    private OnThemeSelectListener onThemeSelectListener;
+
 
     public ThemeAdapter(Context context) {
         mContext = context;
@@ -40,7 +42,6 @@ public int compare(EditorTheme o1, EditorTheme o2) {
         });
     }
 
-
     @NonNull
     @Override
     public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
@@ -52,7 +53,7 @@ public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
     public void onBindViewHolder(@NonNull final ViewHolder holder, int position) {
         final EditorTheme editorTheme = mEditorThemes.get(position);
 
-        String title = makeTitle(position, editorTheme);
+        final String title = makeTitle(position, editorTheme);
         holder.mTxtName.setText(title);
         EditAreaView editorView = holder.mEditorView;
 
@@ -72,6 +73,15 @@ public void onBindViewHolder(@NonNull final ViewHolder holder, int position) {
         HashMap<Integer, ArrayList<? extends CharacterStyle>> colorsMap = new HashMap<>();
         int lineCount = buffer.getLineManager().getLineCount();
         highlighter.highlight(buffer, editorTheme, colorsMap, editorView.getText(), 0, lineCount - 1);
+
+        holder.mBtnSelect.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (onThemeSelectListener != null){
+                    onThemeSelectListener.onThemeSelected(editorTheme);
+                }
+            }
+        });
     }
 
     private String makeTitle(int position, EditorTheme editorTheme) {
@@ -97,7 +107,6 @@ private String refine(String name) {
         return builder.toString();
     }
 
-
     @Override
     public int getItemCount() {
         return mEditorThemes.size();
@@ -144,14 +153,24 @@ public String getSectionName(int position) {
         return mEditorThemes.get(position).getName();
     }
 
+    public void setOnThemeSelectListener(OnThemeSelectListener onThemeSelectListener) {
+        this.onThemeSelectListener = onThemeSelectListener;
+    }
+
+    public interface OnThemeSelectListener {
+        void onThemeSelected(EditorTheme theme);
+    }
+
     static class ViewHolder extends RecyclerView.ViewHolder {
+         View mBtnSelect;
         EditAreaView mEditorView;
         TextView mTxtName;
 
         public ViewHolder(View itemView) {
             super(itemView);
             mEditorView = itemView.findViewById(R.id.editor_view);
             mTxtName = itemView.findViewById(R.id.txt_name);
+            mBtnSelect = itemView.findViewById(R.id.btn_select);
         }
     }
 }

editor-view/src/main/java/com/jecelyin/editor/v2/Preferences.java

@@ -385,6 +385,10 @@ public boolean isUseLightTheme() {
         return getTheme() == 0;
     }
 
+    public void setEditorTheme(String name) {
+        preferences.edit().putString(context.getString(R.string.pref_theme_editor_theme), name).apply();
+    }
+
     @IntDef({SCREEN_ORIENTATION_AUTO, SCREEN_ORIENTATION_LANDSCAPE, SCREEN_ORIENTATION_PORTRAIT})
     public @interface ScreenOrientation {
     }

editor-view/src/main/res/values/do_not_translate.xml

@@ -3,4 +3,5 @@
     <string name="pref_key_fullscreen" translatable="false">fullscreen_mode</string>
     <string name="pref_auto_save" translatable="false">pref_auto_save</string>
     <string name="pref_current_theme" translatable="false">pref_current_theme</string>
+    <string name="pref_theme_editor_theme">pref_key_editor_theme</string>
 </resources>