Terminal theme preview

Author: tranleduy2000

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

@@ -2,7 +2,6 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
@@ -40,26 +39,24 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         mPreferences = Preferences.getInstance(getContext());
+
+        mAdapter = new TerminalThemeAdapter(getContext());
+        mAdapter.setOnThemeSelectListener((TerminalThemeAdapter.OnThemeSelectListener) getActivity());
+
         mRecyclerView = view.findViewById(R.id.recyclerView);
         mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         mRecyclerView.addItemDecoration(new DividerItemDecoration(getContext(), DividerItemDecoration.VERTICAL));
-        mAdapter = new TerminalThemeAdapter(getContext());
-        mAdapter.setOnThemeSelectListener((TerminalThemeAdapter.OnThemeSelectListener) getActivity());
         mRecyclerView.setAdapter(mAdapter);
-
     }
 
     public static class TerminalThemeAdapter extends RecyclerView.Adapter<TerminalThemeAdapter.ViewHolder> implements FastScrollRecyclerView.SectionedAdapter {
         private final String[] mThemes;
         private OnThemeSelectListener onThemeSelectListener;
-        private TermSettings mTermSettings;
         private Context mContext;
 
         public TerminalThemeAdapter(Context context) {
             mContext = context;
             mThemes = context.getResources().getStringArray(R.array.entries_emulator_color_preference);
-            mTermSettings = new TermSettings(context.getResources(),
-                    PreferenceManager.getDefaultSharedPreferences(context));
         }
 
         @NonNull
@@ -73,7 +70,7 @@ public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         public void onBindViewHolder(@NonNull final ViewHolder holder, final int position) {
             EmulatorView termView = holder.mTermView;
             TermSession session = new TermSession();
-            session.setTermIn(new StringBufferInputStream(mThemes[position]));
+            session.setTermIn(new StringBufferInputStream(makeTitle(position, mThemes[position])));
             termView.attachSession(session);
             termView.setDensity(mContext.getResources().getDisplayMetrics());
             termView.setTextSize(16);
@@ -119,6 +116,7 @@ static class ViewHolder extends RecyclerView.ViewHolder {
 
             ViewHolder(View itemView) {
                 super(itemView);
+                setIsRecyclable(false);
                 mTermView = itemView.findViewById(R.id.term_view);
                 mBtnSelect = itemView.findViewById(R.id.btn_select);
             }

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

@@ -107,7 +107,7 @@ protected void onDestroy() {
     public void onEditorThemeSelected(EditorTheme theme) {
         if (Premium.isPremiumUser(this)) {
             mPreferences.setEditorTheme(theme.getFileName());
-            String text = getString(R.string.selected_theme, theme.getName());
+            String text = getString(R.string.selected_editor_theme, theme.getName());
             Toast.makeText(this, text, Toast.LENGTH_SHORT).show();
         } else {
             PremiumDialog premiumDialog = new PremiumDialog(this, mInAppPurchaseHelper);
@@ -119,7 +119,7 @@ public void onEditorThemeSelected(EditorTheme theme) {
     public void onTerminalThemeSelected(String name, int index) {
         if (Premium.isPremiumUser(this)) {
             mPreferences.setTerminalTheme(index);
-            String text = getString(R.string.selected_theme, name);
+            String text = getString(R.string.selected_editor_theme, name);
             Toast.makeText(this, text, Toast.LENGTH_SHORT).show();
         } else {
             PremiumDialog premiumDialog = new PremiumDialog(this, mInAppPurchaseHelper);

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

@@ -8,7 +8,7 @@
     <jackpal.androidterm.emulatorview.EmulatorView
         android:id="@+id/term_view"
         android:layout_width="match_parent"
-        android:layout_height="50dp"
+        android:layout_height="70dp"
         tools:background="#000">
 
     </jackpal.androidterm.emulatorview.EmulatorView>
@@ -17,7 +17,9 @@
         android:id="@+id/btn_select"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="end"
+        android:layout_gravity="bottom|end"
+        android:layout_marginRight="8dp"
+        android:layout_marginEnd="8dp"
         android:src="@drawable/baseline_check_24"
         android:text="Select" />
 

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

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