Move theme activity to fragment

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" />
+        <activity android:name="com.duy.editor.theme.ThemeActivity" />
     </application>
 
 </manifest>

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

@@ -41,6 +41,7 @@
 import com.duy.common.DLog;
 import com.duy.common.purchase.InAppPurchaseHelper;
 import com.duy.common.purchase.Premium;
+import com.duy.editor.theme.ThemeActivity;
 import com.duy.ide.editor.SimpleEditorActivity;
 import com.duy.ide.filemanager.SaveListener;
 import com.jecelyin.common.utils.UIUtils;
@@ -168,7 +169,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 break;
 
             case R.id.action_editor_color_scheme:
-                startActivity(new Intent(this, EditorThemeActivity.class));
+                startActivity(new Intent(this, ThemeActivity.class));
                 break;
         }
         return super.onOptionsItemSelected(item);

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

@@ -1,4 +1,4 @@
-package com.duy.ide.editor.theme;
+package com.duy.editor.theme;
 
 import android.content.Context;
 import android.core.text.SpannableStringBuilder;
@@ -11,7 +11,8 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.duy.ide.editor.editor.R;
+import com.duy.ccppcompiler.R;
+import com.duy.ide.editor.theme.ThemeLoader;
 import com.duy.ide.editor.theme.model.EditorTheme;
 import com.jecelyin.editor.v2.editor.Highlighter;
 import com.jecelyin.editor.v2.highlight.Buffer;
@@ -24,14 +25,13 @@
 import java.util.Comparator;
 import java.util.HashMap;
 
-public class ThemeAdapter extends RecyclerView.Adapter<ThemeAdapter.ViewHolder> implements FastScrollRecyclerView.SectionedAdapter {
+public class EditorThemeAdapter extends RecyclerView.Adapter<EditorThemeAdapter.ViewHolder> implements FastScrollRecyclerView.SectionedAdapter {
     private final ArrayList<EditorTheme> mEditorThemes;
     private Context mContext;
     private OnThemeSelectListener onThemeSelectListener;
 
-    public ThemeAdapter(Context context) {
+    public EditorThemeAdapter(Context context) {
         mContext = context;
-        ThemeLoader.init(context);
         mEditorThemes = ThemeLoader.getAll(context);
         Collections.sort(mEditorThemes, new Comparator<EditorTheme>() {
             @Override

app/src/main/java/com/duy/editor/theme/EditorThemeFragment.java

@@ -0,0 +1,60 @@
+package com.duy.editor.theme;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.DividerItemDecoration;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.duy.ccppcompiler.R;
+import com.duy.ide.editor.theme.model.EditorTheme;
+import com.jecelyin.editor.v2.Preferences;
+
+public class EditorThemeFragment extends Fragment {
+    private RecyclerView mRecyclerView;
+    private EditorThemeAdapter mEditorThemeAdapter;
+    private Preferences mPreferences;
+
+    public static EditorThemeFragment newInstance() {
+
+        Bundle args = new Bundle();
+
+        EditorThemeFragment fragment = new EditorThemeFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_editor_theme, container, false);
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        mPreferences = Preferences.getInstance(getContext());
+        mRecyclerView = view.findViewById(R.id.recyclerView);
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+        mRecyclerView.addItemDecoration(new DividerItemDecoration(getContext(), DividerItemDecoration.VERTICAL));
+        mEditorThemeAdapter = new EditorThemeAdapter(getContext());
+        mEditorThemeAdapter.setOnThemeSelectListener((EditorThemeAdapter.OnThemeSelectListener) getActivity());
+        mRecyclerView.setAdapter(mEditorThemeAdapter);
+        mRecyclerView.scrollToPosition(findThemeIndex(mPreferences.getEditorTheme()));
+
+    }
+
+    private int findThemeIndex(EditorTheme editorTheme) {
+        int position = mEditorThemeAdapter.getPosition(editorTheme);
+        if (position < 0) {
+            return 0;
+        }
+        return position;
+    }
+
+}

app/src/main/java/com/duy/editor/theme/TerminalThemeFragment.java

@@ -0,0 +1,6 @@
+package com.duy.editor.theme;
+
+import android.support.v4.app.Fragment;
+
+public class TerminalThemeFragment extends Fragment {
+}

app/src/main/java/com/duy/editor/EditorThemeActivity.java renamed to app/src/main/java/com/duy/editor/theme/ThemeActivity.java

@@ -1,30 +1,27 @@
-package com.duy.editor;
+package com.duy.editor.theme;
 
 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;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.Spinner;
+import android.widget.Toast;
 
 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.model.EditorTheme;
 import com.jecelyin.editor.v2.Preferences;
 import com.jecelyin.editor.v2.ThemeSupportActivity;
 
-public class EditorThemeActivity extends ThemeSupportActivity implements ThemeAdapter.OnThemeSelectListener {
-    private RecyclerView mRecyclerView;
-    private ThemeAdapter mThemeAdapter;
-    private Spinner mSpinner;
+public class ThemeActivity extends ThemeSupportActivity implements EditorThemeAdapter.OnThemeSelectListener {
     private Preferences mPreferences;
     private InAppPurchaseHelper mInAppPurchaseHelper;
 
@@ -35,20 +32,14 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         setTitle("");
-        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);
-        mRecyclerView.scrollToPosition(findThemeIndex(mPreferences.getEditorTheme()));
+        mPreferences = Preferences.getInstance(this);
+        mInAppPurchaseHelper = new InAppPurchaseHelper(this);
 
         boolean useLightTheme = mPreferences.isUseLightTheme();
-        mSpinner = findViewById(R.id.spinner_themes);
-        mSpinner.setSelection(useLightTheme ? 0 : 1);
-        mSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        Spinner spinner = findViewById(R.id.spinner_themes);
+        spinner.setSelection(useLightTheme ? 0 : 1);
+        spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 useLightTheme(position == 0);
@@ -59,19 +50,41 @@ public void onNothingSelected(AdapterView<?> parent) {
 
             }
         });
-
-        mInAppPurchaseHelper = new InAppPurchaseHelper(this);
         mPreferences.registerOnSharedPreferenceChangeListener(this);
-    }
 
-    private int findThemeIndex(EditorTheme editorTheme) {
-        int position = mThemeAdapter.getPosition(editorTheme);
-        if (position < 0) {
-            return 0;
-        }
-        return position;
-    }
+        ViewPager viewPager = findViewById(R.id.view_pager);
+        viewPager.setAdapter(new FragmentPagerAdapter(getSupportFragmentManager()) {
+            @Override
+            public Fragment getItem(int position) {
+                switch (position) {
+                    case 0:
+                        return new EditorThemeFragment();
+                    case 1:
+                        return new TerminalThemeFragment();
+                }
+                return null;
+            }
 
+            @Nullable
+            @Override
+            public CharSequence getPageTitle(int position) {
+                switch (position) {
+                    case 0:
+                        return getString(R.string.editor);
+                    case 1:
+                        return getString(R.string.terminal);
+                }
+                return "";
+            }
+
+            @Override
+            public int getCount() {
+                return 2;
+            }
+        });
+        TabLayout tabLayout = findViewById(R.id.tab_layout);
+        tabLayout.setupWithViewPager(viewPager);
+    }
 
     private void useLightTheme(boolean useLightTheme) {
         if (mPreferences.isUseLightTheme() != useLightTheme) {
@@ -96,10 +109,11 @@ public void onThemeSelected(EditorTheme theme) {
         if (Premium.isPremiumUser(this)) {
             mPreferences.setEditorTheme(theme.getFileName());
             String text = getString(R.string.selected_theme, theme.getName());
-            Snackbar.make(mRecyclerView, text, Snackbar.LENGTH_SHORT).show();
+            Toast.makeText(this, text, Toast.LENGTH_SHORT).show();
         } else {
             PremiumDialog premiumDialog = new PremiumDialog(this, mInAppPurchaseHelper);
             premiumDialog.show();
         }
     }
+
 }

app/src/main/res/layout/fragment_editor_theme.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/recyclerView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:fastScrollPopupBgColor="?android:windowBackground"
+    app:fastScrollPopupTextColor="?android:textColorPrimary"
+    app:fastScrollPopupTextSize="24sp"
+    app:fastScrollThumbColor="?colorAccent">
+
+</com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView>

editor-view/src/main/res/layout/list_item_theme.xml renamed to app/src/main/res/layout/list_item_theme.xml

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

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

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.design.widget.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
+    <android.support.design.widget.AppBarLayout
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
@@ -18,6 +17,13 @@
             app:popupTheme="?attr/actionBarPopupTheme"
             app:theme="?attr/actionBarTheme">
 
+            <android.support.design.widget.TabLayout
+                android:id="@+id/tab_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+            </android.support.design.widget.TabLayout>
+
             <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
@@ -37,15 +43,11 @@
 
     </android.support.design.widget.AppBarLayout>
 
-    <com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
-        android:id="@+id/recyclerView"
+    <android.support.v4.view.ViewPager
+        android:id="@+id/view_pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:fastScrollPopupBgColor="?android:windowBackground"
-        app:fastScrollPopupTextColor="?android:textColorPrimary"
-        app:fastScrollPopupTextSize="24sp"
-        app:fastScrollThumbColor="?colorAccent">
-
-    </com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView>
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-</LinearLayout>
+    </android.support.v4.view.ViewPager>
+</android.support.design.widget.CoordinatorLayout>