Fix contains \r in sample code

Author: tranleduy2000

lib-n-ide/src/main/java/com/duy/ide/editor/theme/EditorThemeFragment.java

@@ -114,7 +114,9 @@ private void resolveLanguage() {
                         mLanguage = Catalog.getModeByName("Pascal");
                     }
                     InputStream input = mContext.getAssets().open(fileName);
-                    mSampleCode = IOUtils.toString(input);
+                    mSampleCode = IOUtils.toString(input, "UTF-8");
+                    mSampleCode = mSampleCode.replace("\r\n", "\n");
+                    mSampleCode = mSampleCode.replace("\r", "\n");
                     input.close();
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -133,6 +135,7 @@ public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
             return new ViewHolder(view);
         }
 
+        @SuppressLint("UseSparseArrays")
         @Override
         public void onBindViewHolder(@NonNull final ViewHolder holder, int position) {
             final EditorTheme editorTheme = mEditorThemes.get(position);
@@ -145,17 +148,22 @@ public void onBindViewHolder(@NonNull final ViewHolder holder, int position) {
             Highlighter highlighter = new Highlighter();
             editorView.setTheme(editorTheme);
 
+            String sampleData = getSampleData();
+
             buffer.setMode(mLanguage, mContext);
-            editorView.setText("");
-            editorView.getText().insert(0, getSampleData());
+            editorView.getEditableText().clearSpans();
+            editorView.setText(sampleData);
 
             buffer.setEditable(editorView.getText());
-            buffer.insert(0, getSampleData());
 
-            @SuppressLint("UseSparseArrays")
-            HashMap<Integer, ArrayList<? extends CharacterStyle>> colorsMap = new HashMap<>();
+            buffer.insert(0, sampleData);
+
             int lineCount = buffer.getLineManager().getLineCount();
-            highlighter.highlight(buffer, editorTheme, colorsMap, editorView.getText(), 0, lineCount - 1);
+            highlighter.highlight(buffer, editorTheme,
+                    new HashMap<Integer, ArrayList<? extends CharacterStyle>>(),
+                    editorView.getText(),
+                    0,
+                    lineCount - 1);
 
             holder.mBtnSelect.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -211,6 +219,7 @@ static class ViewHolder extends RecyclerView.ViewHolder {
 
             ViewHolder(View itemView) {
                 super(itemView);
+                setIsRecyclable(false);
                 mEditorView = itemView.findViewById(R.id.editor_view);
                 mTxtName = itemView.findViewById(R.id.txt_name);
                 mBtnSelect = itemView.findViewById(R.id.btn_select);

lib-n-ide/src/main/res/values-vi/strings.xml

@@ -104,7 +104,7 @@
     <string name="cursor_width">Chiều rộng con trỏ</string>
     <string name="editor">Soạn thảo</string>
     <string name="touch_to_adjust_text_size">Chạm để thay đổi kích thước văn bản</string>
-    <string name="word_wrap_in_editor">Tự động ngắt dòng</string>
+    <string name="word_wrap_in_editor">Ngắt dòng</string>
     <string name="show_linenumber">Hiển thị số dòng</string>
     <string name="show_whitespace">Hiển thị khoảng trắng</string>
     <string name="auto_indent">Tự động thụt lề</string>

lib-n-ide/src/main/res/values/strings.xml

@@ -126,7 +126,7 @@
     <string name="font_size">Font Size</string>
     <string name="cursor_width">Cursor Width</string>
     <string name="touch_to_adjust_text_size">Touch to change text size</string>
-    <string name="word_wrap_in_editor">Auto wordwrap</string>
+    <string name="word_wrap_in_editor">Wordwrap</string>
     <string name="show_linenumber">Show Linenumber</string>
     <string name="show_whitespace">Show Whitespace</string>
     <string name="auto_indent">Auto Indent</string>

lib-n-ide/src/main/res/xml/preference_editor.xml

@@ -8,10 +8,12 @@
 
         <CheckBoxPreference
             android:key="@string/pref_touch_to_adjust_text_size"
+            android:summary="Change font size (Zoom) with two finger"
             android:title="@string/touch_to_adjust_text_size" />
 
         <CheckBoxPreference
             android:key="@string/pref_word_wrap"
+            android:summary="Use soft wrap in editor"
             android:title="@string/word_wrap_in_editor" />
 
         <CheckBoxPreference
@@ -25,6 +27,7 @@
         <CheckBoxPreference
             android:key="@string/pref_auto_indent"
             android:title="@string/auto_indent" />
+
         <CheckBoxPreference
             android:key="@string/pref_auto_pair"
             android:summary="@string/pref_desc_auto_pair"
@@ -44,6 +47,7 @@
 
         <CheckBoxPreference
             android:key="@string/pref_auto_capitalize"
+            android:summary="Not recommend"
             android:title="@string/auto_capitalize" />
 
 
@@ -52,11 +56,10 @@
             android:maxLines="7"
             android:negativeButtonText="@string/reset"
             android:scrollbars="vertical"
-            android:summary=""
             android:title="@string/custom_symbol_list" />
 
         <CheckBoxPreference
-            android:id="@+id/pref_volume_move"
+            android:key="@string/pref_volume_move"
             android:defaultValue="true"
             android:summary="Press volume up (+) to move cursor to right, press volume down (-) to move cursor to left"
             android:title="Volume move" />