Display sample code for each language in themes

tranleduy2000 · tranleduy2000 · commit a37ea154cd51 · 2018-06-11T00:41:35.000+07:00
diff --git a/app/src/main/java/com/duy/ccppcompiler/ide/editor/theme/ThemeActivity.java b/app/src/main/java/com/duy/ccppcompiler/ide/editor/theme/ThemeActivity.java
@@ -65,7 +65,6 @@ public Fragment getItem(int position) {
                 return null;
             }
 
-            @Nullable
             @Override
             public CharSequence getPageTitle(int position) {
                 switch (position) {
diff --git a/lib-n-ide/src/main/assets/templates/cplusplus.template b/lib-n-ide/src/main/assets/templates/cplusplus.template
@@ -0,0 +1,44 @@
+/*
+ * Block comment 
+ */
+#include <vector>
+
+using namespace std;  // line comment
+namespace foo {
+
+  typedef struct Struct {
+    int field;
+  } Typedef;
+  enum Enum {Foo = 1, Bar = 2};
+
+  Typedef *globalVar;
+  extern Typedef *externVar;
+
+  template<typename T, int N>
+  class Class {
+    T n;
+  public:
+    /**
+     * Semantic highlighting:
+     * Generated spectrum to pick colors for local variables and parameters:
+     *  Color#1 SC1.1 SC1.2 SC1.3 SC1.4 Color#2 SC2.1 SC2.2 SC2.3 SC2.4 Color#3
+     *  Color#3 SC3.1 SC3.2 SC3.3 SC3.4 Color#4 SC4.1 SC4.2 SC4.3 SC4.4 Color#5
+     */
+    void function(int param1, int param2, int param3) {
+      int localVar1, localVar2, localVar3;
+      int *localVar = new int[1];
+      this->n = N;
+      localVar1 = param1 + param2 + localVar3;
+
+    label:
+      printf("Formatted string %d\n\g", localVar[0]);
+      printf(R"**(Formatted raw-string %d\n)**", 1);
+      std::cout << (1 << 2) << std::endl;  
+
+    #define FOO(A) A
+    #ifdef DEBUG
+      printf("debug");
+    #endif
+    }
+  };
+}
diff --git a/lib-n-ide/src/main/assets/templates/java.template b/lib-n-ide/src/main/assets/templates/java.template
@@ -0,0 +1,51 @@
+/* Block comment */
+import java.util.Date;
+/**
+ * Doc comment here for <code>SomeClass</code>
+ * @param T type parameter
+ * @see Math#sin(double)
+ */
+@Annotation (name=value)
+public class SomeClass<T extends Runnable> { // some comment
+  private T field = null;
+  private double unusedField = 12345.67890;
+  private UnknownType anotherString = "Another\nStrin\g";
+  public static int staticField = 0;
+  public final int instanceFinalField = 0;
+
+  /**
+   * Semantic highlighting:
+   * Generated spectrum to pick colors for local variables and parameters:
+   *  Color#1 SC1.1 SC1.2 SC1.3 SC1.4 Color#2 SC2.1 SC2.2 SC2.3 SC2.4 Color#3
+   *  Color#3 SC3.1 SC3.2 SC3.3 SC3.4 Color#4 SC4.1 SC4.2 SC4.3 SC4.4 Color#5
+   * @param param1
+   * @param reassignedParam
+   * @param param2
+   * @param param3
+   */
+  public SomeClass(AnInterface param1, int[] reassignedParam,
+                  int param2
+                  int param3) {
+    int reassignedValue = this.staticField + param2 + param3;
+    long localVar1, localVar2, localVar3, localVar4;
+    int localVar = "IntelliJ"; // Error, incompatible types
+    System.out.println(anotherString + toString() + localVar);
+    long time = Date.parse("1.2.3"); // Method is deprecated
+    new Thread().countStackFrames(); // Method is deprecated and marked for removal
+    reassignedValue ++;
+    field.run();
+    new SomeClass() {
+      {
+        int a = localVar;
+      }
+    };
+    reassignedParam = new ArrayList<String>().toArray(new int[0]);
+  }
+}
+enum AnEnum { CONST1, CONST2 }
+interface AnInterface {
+  int CONSTANT = 2;
+  void method();
+}
+abstract class SomeAbstractClass {
+}
diff --git a/lib-n-ide/src/main/assets/templates/pascal.template b/lib-n-ide/src/main/assets/templates/pascal.template
@@ -0,0 +1,16 @@
+{ File header }
+program sample;
+var
+  i, j: Integer;
+  s: string;
+  a: array[0..5] of string;
+const
+  c = 'a';
+begin
+  @s[1] := 'str';
+  i := j mod 200 + j xor j^ + Round(0.7 + .1);
+  for i := 0 to length(s)-1 do begin
+    writeln('Hello world!');
+  end;
+  @error?;
+end.
diff --git a/lib-n-ide/src/main/java/com/duy/ide/editor/theme/EditorThemeFragment.java b/lib-n-ide/src/main/java/com/duy/ide/editor/theme/EditorThemeFragment.java
@@ -2,6 +2,7 @@
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.content.res.AssetManager;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -19,18 +20,20 @@
 
 import com.duy.ide.editor.Highlighter;
 import com.duy.ide.editor.editor.R;
+import com.duy.ide.editor.theme.model.Constants;
 import com.duy.ide.editor.theme.model.EditorTheme;
 import com.duy.ide.editor.view.IEditAreaView;
 import com.jecelyin.editor.v2.Preferences;
 import com.jecelyin.editor.v2.highlight.Buffer;
 import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView;
 
+import org.apache.commons.io.IOUtils;
 import org.gjt.sp.jedit.Catalog;
 import org.gjt.sp.jedit.Mode;
 
+import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
+import java.util.Arrays;
 import java.util.HashMap;
 
 public class EditorThemeFragment extends Fragment {
@@ -54,8 +57,12 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         mRecyclerView = view.findViewById(R.id.recyclerView);
         mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         mRecyclerView.addItemDecoration(new DividerItemDecoration(getContext(), DividerItemDecoration.VERTICAL));
-        loadData();
 
+        mEditorThemeAdapter = new EditorThemeAdapter(getContext());
+        mEditorThemeAdapter.setOnThemeSelectListener((EditorThemeAdapter.OnThemeSelectListener) getActivity());
+        mRecyclerView.setAdapter(mEditorThemeAdapter);
+
+        loadData();
     }
 
     private void loadData() {
@@ -83,17 +90,36 @@ public static class EditorThemeAdapter extends RecyclerView.Adapter<EditorThemeA
         private final ArrayList<EditorTheme> mEditorThemes;
         private Context mContext;
         private OnThemeSelectListener onThemeSelectListener;
-        private Mode mLanguage = Catalog.getModeByName("C++");
+        private Mode mLanguage;
+        private String mSampleCode;
 
         EditorThemeAdapter(Context context) {
             mContext = context;
-            mEditorThemes = ThemeLoader.getAll(context);
-            Collections.sort(mEditorThemes, new Comparator<EditorTheme>() {
-                @Override
-                public int compare(EditorTheme o1, EditorTheme o2) {
-                    return o1.getName().compareTo(o2.getName());
+            mEditorThemes = new ArrayList<>();
+            resolveLanguage();
+        }
+
+        private void resolveLanguage() {
+            if (mSampleCode == null) {
+                try {
+                    String fileName = null;
+                    if (mContext.getPackageName().contains("cpp")) {
+                        fileName = "templates/cplusplus.template";
+                        mLanguage = Catalog.getModeByName("C++");
+                    } else if (mContext.getPackageName().contains("java")) {
+                        fileName = "templates/java.template";
+                        mLanguage = Catalog.getModeByName("Java");
+                    } else if (mContext.getPackageName().contains("pascal")) {
+                        fileName = "templates/pascal.template";
+                        mLanguage = Catalog.getModeByName("Pascal");
+                    }
+                    InputStream input = mContext.getAssets().open(fileName);
+                    mSampleCode = IOUtils.toString(input);
+                    input.close();
+                } catch (Exception e) {
+                    e.printStackTrace();
                 }
-            });
+            }
         }
 
         int getPosition(EditorTheme editorTheme) {
@@ -150,39 +176,13 @@ public int getItemCount() {
             return mEditorThemes.size();
         }
 
+
         private String getSampleData() {
-            return "// C++ Program to Find Largest Element of an Array\n" +
-                    "\n" +
-                    "// This program takes n number of element from user (where, n is specified by user) and stores data in an array. Then, this program displays the largest element of that array using loops.\n" +
-                    "\n" +
-                    "#include <iostream>\n" +
-                    "\n" +
-                    "using namespace std;\n" +
-                    "\n" +
-                    "int main() {\n" +
-                    "    int i, n;\n" +
-                    "    float arr[100];\n" +
-                    "\n" +
-                    "    cout << \"Enter total number of elements(1 to 100): \";\n" +
-                    "    cin >> n;\n" +
-                    "    cout << endl;\n" +
-                    "\n" +
-                    "    // Store number entered by the user\n" +
-                    "    for (i = 0; i < n; ++i) {\n" +
-                    "        cout << \"Enter Number \" << i + 1 << \" : \";\n" +
-                    "        cin >> arr[i];\n" +
-                    "    }\n" +
-                    "\n" +
-                    "    // Loop to store largest number to arr[0]\n" +
-                    "    for (i = 1; i < n; ++i) {\n" +
-                    "        // Change < to > if you want to find the smallest element\n" +
-                    "        if (arr[0] < arr[i])\n" +
-                    "            arr[0] = arr[i];\n" +
-                    "    }\n" +
-                    "    cout << \"Largest element = \" << arr[0];\n" +
-                    "\n" +
-                    "    return 0;\n" +
-                    "}";
+
+            if (mSampleCode == null) {
+                mSampleCode = Constants.C_PLUS_PLUS_SAMPLE;
+            }
+            return mSampleCode;
         }
 
         @NonNull
@@ -195,6 +195,11 @@ public void setOnThemeSelectListener(OnThemeSelectListener onThemeSelectListener
             this.onThemeSelectListener = onThemeSelectListener;
         }
 
+        public void addTheme(EditorTheme theme) {
+            mEditorThemes.add(theme);
+            notifyItemInserted(mEditorThemes.size() - 1);
+        }
+
         public interface OnThemeSelectListener {
             void onEditorThemeSelected(EditorTheme theme);
         }
@@ -204,7 +209,7 @@ static class ViewHolder extends RecyclerView.ViewHolder {
             IEditAreaView mEditorView;
             TextView mTxtName;
 
-            public ViewHolder(View itemView) {
+            ViewHolder(View itemView) {
                 super(itemView);
                 mEditorView = itemView.findViewById(R.id.editor_view);
                 mTxtName = itemView.findViewById(R.id.txt_name);
@@ -213,8 +218,11 @@ public ViewHolder(View itemView) {
         }
     }
 
-    private class LoadThemeTask extends AsyncTask<Void, Void, Void> {
+    @SuppressLint("StaticFieldLeak")
+    private class LoadThemeTask extends AsyncTask<Void, EditorTheme, Void> {
+        private static final String TAG = "LoadThemeTask";
         private Context context;
+        private AssetManager mAssetManager;
 
         LoadThemeTask(Context context) {
             this.context = context;
@@ -227,27 +235,49 @@ public Context getContext() {
         @Override
         protected void onPreExecute() {
             super.onPreExecute();
+            mAssetManager = getContext().getAssets();
+
             mProgressBar.setVisibility(View.VISIBLE);
             mProgressBar.setIndeterminate(true);
         }
 
         @Override
         protected Void doInBackground(Void... voids) {
-            ThemeLoader.init(getContext());
+            try {
+                String[] list = mAssetManager.list(ThemeLoader.ASSET_PATH);
+                Arrays.sort(list);
+                for (String name : list) {
+                    if (isCancelled()) {
+                        return null;
+                    }
+                    Thread.sleep(1);
+                    EditorTheme theme = ThemeLoader.getTheme(context, name);
+                    publishProgress(theme);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
             return null;
         }
 
+        @Override
+        protected void onProgressUpdate(EditorTheme... themes) {
+            super.onProgressUpdate(themes);
+            try {
+                mEditorThemeAdapter.addTheme(themes[0]);
+            } catch (Exception e) {
+            }
+        }
+
         @Override
         protected void onPostExecute(Void aVoid) {
             super.onPostExecute(aVoid);
             if (isCancelled()) {
                 return;
             }
-            mEditorThemeAdapter = new EditorThemeAdapter(getContext());
-            mEditorThemeAdapter.setOnThemeSelectListener((EditorThemeAdapter.OnThemeSelectListener) getActivity());
-            mRecyclerView.setAdapter(mEditorThemeAdapter);
             mRecyclerView.scrollToPosition(findThemeIndex(mPreferences.getEditorTheme()));
             mProgressBar.setVisibility(View.GONE);
+
         }
     }
 }
diff --git a/lib-n-ide/src/main/java/com/duy/ide/editor/theme/ThemeLoader.java b/lib-n-ide/src/main/java/com/duy/ide/editor/theme/ThemeLoader.java
@@ -16,7 +16,7 @@
 import java.util.Properties;
 
 public class ThemeLoader {
-    private static final String ASSET_PATH = "themes/vscode";
+    public static final String ASSET_PATH = "themes/vscode";
     private static final String DEFAULT_EDITOR_THEME_LIGHT = "github-light.json.properties";
     private static final HashMap<String, EditorTheme> CACHED = new HashMap<>();
     private static final String TAG = "ThemeLoader";
diff --git a/lib-n-ide/src/main/java/com/duy/ide/editor/theme/model/Constants.java b/lib-n-ide/src/main/java/com/duy/ide/editor/theme/model/Constants.java
diff --git a/lib-n-ide/src/main/res/layout/list_item_theme.xml b/lib-n-ide/src/main/res/layout/list_item_theme.xml

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,6 @@ public Fragment getItem(int position) {`
`65`	`65`	`return null;`
`66`	`66`	`}`
`67`	`67`
`68`		`- @Nullable`
`69`	`68`	`@Override`
`70`	`69`	`public CharSequence getPageTitle(int position) {`
`71`	`70`	`switch (position) {`