From a23245435f350d0204cb11ee19d6b8440deaf0f1 Mon Sep 17 00:00:00 2001
From: yuhan6665 <1588741+yuhan6665@users.noreply.github.com>
Date: Fri, 9 Jul 2021 18:16:39 -0400
Subject: [PATCH] Use EditorKit for custom config

https://github.com/massivemadness/Squircle-IDE
---
 V2rayNG/app/build.gradle                      |  2 ++
 V2rayNG/app/src/main/AndroidManifest.xml      |  2 ++
 .../ang/ui/ServerCustomConfigActivity.kt      | 12 +++++----
 .../layout/activity_server_custom_config.xml  | 26 +++++++++----------
 4 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/V2rayNG/app/build.gradle b/V2rayNG/app/build.gradle
index 0faf5fb5..b1cd20d3 100644
--- a/V2rayNG/app/build.gradle
+++ b/V2rayNG/app/build.gradle
@@ -99,6 +99,8 @@ dependencies {
     implementation 'me.dm7.barcodescanner:zxing:1.9.8'
     implementation 'com.github.jorgecastilloprz:fabprogresscircle:1.01@aar'
     implementation 'me.drakeet.support:toastcompat:1.1.0'
+    implementation 'com.blacksquircle.ui:editorkit:2.0.0'
+    implementation 'com.blacksquircle.ui:language-json:2.0.0'
 
     implementation(name: 'libv2ray', ext: 'aar')
     //implementation(name: 'tun2socks', ext: 'aar')
diff --git a/V2rayNG/app/src/main/AndroidManifest.xml b/V2rayNG/app/src/main/AndroidManifest.xml
index 543343ae..89849737 100644
--- a/V2rayNG/app/src/main/AndroidManifest.xml
+++ b/V2rayNG/app/src/main/AndroidManifest.xml
@@ -28,6 +28,8 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <!-- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> -->
 
+    <uses-sdk tools:overrideLibrary="com.blacksquircle.ui.editorkit, com.blacksquircle.ui.language.json, com.blacksquircle.ui.language.base"/>
+
     <application
         android:name=".AngApplication"
         android:allowBackup="true"
diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerCustomConfigActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerCustomConfigActivity.kt
index 5ed48c31..21613077 100644
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerCustomConfigActivity.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerCustomConfigActivity.kt
@@ -1,11 +1,12 @@
 package com.v2ray.ang.ui
 
 import android.os.Bundle
-import androidx.appcompat.app.AlertDialog
 import android.text.TextUtils
 import android.view.Menu
 import android.view.MenuItem
 import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
+import com.blacksquircle.ui.language.json.JsonLanguage
 import com.google.gson.Gson
 import com.tencent.mmkv.MMKV
 import com.v2ray.ang.R
@@ -34,6 +35,7 @@ class ServerCustomConfigActivity : BaseActivity() {
         setContentView(R.layout.activity_server_custom_config)
         title = getString(R.string.title_server)
 
+        editor.language = JsonLanguage()
         val config = MmkvManager.decodeServerConfig(editGuid)
         if (config != null) {
             bindingServer(config)
@@ -50,9 +52,9 @@ class ServerCustomConfigActivity : BaseActivity() {
         et_remarks.text = Utils.getEditable(config.remarks)
         val raw = serverRawStorage?.decodeString(editGuid)
         if (raw.isNullOrBlank()) {
-            tv_content.text = Utils.getEditable(config.fullConfig?.toPrettyPrinting().orEmpty())
+            editor.setTextContent(Utils.getEditable(config.fullConfig?.toPrettyPrinting().orEmpty()))
         } else {
-            tv_content.text = Utils.getEditable(raw)
+            editor.setTextContent(Utils.getEditable(raw))
         }
         return true
     }
@@ -75,7 +77,7 @@ class ServerCustomConfigActivity : BaseActivity() {
         }
 
         val v2rayConfig = try {
-            Gson().fromJson(tv_content.text.toString(), V2rayConfig::class.java)
+            Gson().fromJson(editor.text.toString(), V2rayConfig::class.java)
         } catch (e: Exception) {
             e.printStackTrace()
             ToastCompat.makeText(this, "${getString(R.string.toast_malformed_josn)} ${e.cause?.message}", Toast.LENGTH_LONG).show()
@@ -87,7 +89,7 @@ class ServerCustomConfigActivity : BaseActivity() {
         config.fullConfig = v2rayConfig
 
         MmkvManager.encodeServerConfig(editGuid, config)
-        serverRawStorage?.encode(editGuid, tv_content.text.toString())
+        serverRawStorage?.encode(editGuid, editor.text.toString())
         toast(R.string.toast_success)
         finish()
         return true
diff --git a/V2rayNG/app/src/main/res/layout/activity_server_custom_config.xml b/V2rayNG/app/src/main/res/layout/activity_server_custom_config.xml
index 7924443c..4f0a5e68 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_custom_config.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_custom_config.xml
@@ -8,14 +8,13 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="@dimen/layout_margin_top_height">
+        android:orientation="vertical">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingBottom="@dimen/layout_margin_top_height">
+            android:layout_margin="@dimen/layout_margin_spacing">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -28,7 +27,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:layout_margin="@dimen/layout_margin_spacing">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -40,7 +40,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
+            android:layout_margin="@dimen/layout_margin_spacing"
             android:orientation="vertical">
 
             <TextView
@@ -59,24 +59,24 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
             android:orientation="vertical">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_margin="@dimen/layout_margin_spacing"
                 android:text="@string/server_lab_content"
                 android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
 
-            <EditText
-                android:id="@+id/tv_content"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginTop="@dimen/layout_margin_top_height"
-                android:text="" />
+            <com.blacksquircle.ui.editorkit.widget.TextProcessor
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="top|start"
+                    android:id="@+id/editor"
+                    android:layout_marginTop="@dimen/layout_margin_top_height" />
         </LinearLayout>
 
 
 
     </LinearLayout>
-</ScrollView>
\ No newline at end of file
+</ScrollView>