From 0681d007f1849387019cd80e77f2b3654b53e177 Mon Sep 17 00:00:00 2001
From: dirk41 <1378902882@qq.com>
Date: Mon, 7 Jun 2021 15:29:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                                    | 2 ++
 README.OPENSOURCE                                             | 4 ++--
 README.md                                                     | 4 ++--
 entry/build.gradle                                            | 3 +--
 .../java/com/protectsoft/webviewcodedemo/ShowAbility.java     | 4 ++--
 entry/src/main/resources/base/layout/ability_show.xml         | 4 ++--
 .../java/com/protectsoft/webviewcodedemo/ExampleOhosTest.java | 2 +-
 library/build.gradle                                          | 1 -
 .../main/java/com/protectsoft/webviewcode/HighlightLib.java   | 4 ++--
 .../src/main/java/com/protectsoft/webviewcode/Settings.java   | 4 ++--
 10 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 37a4eb8..23df972 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@
 .externalNativeBuild
 /entry/.preview
 .cxx
+/library/build.gradle
+/upload.gradle
\ No newline at end of file
diff --git a/README.OPENSOURCE b/README.OPENSOURCE
index 1934273..43ad419 100644
--- a/README.OPENSOURCE
+++ b/README.OPENSOURCE
@@ -1,8 +1,8 @@
 [
     {
         "Name": " Codeview ",
-        "License": "",
-        "License File": "",
+        "License": "无",
+        "License File": "无",
         "Version Number": " 2 ",
         "Upstream URL": " https://github.com/avraampiperidis/Codeview ",
         "Description": " Codeview is a ohos library tha lets you preview code in webview very easy and simple with highlighs and colors. With styles to chooses and language."
diff --git a/README.md b/README.md
index fe1c9ad..b747165 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 - 功能：代码块高亮显示。
 - 项目移植状态：主功能完成
 - 调用差异：无
-- 开发版本：sdk5，DevEco Studio2.1 Beta4
+- 开发版本：sdk5，DevEco Studio 2.1 Release
 - 基线版本：Release 2
 
 #### 效果演示
@@ -30,7 +30,7 @@ dependencies {
 	......  
 }
 ```
-在sdk5，DevEco Studio2.1 beta4下项目可直接运行 如无法运行，删除项目.gradle,.idea,build,gradle,build.gradle文件， 并依据自己的版本创建新项目，将新项目的对应文件复制到根目录下
+在sdk5，DevEco Studio 2.1 Release下项目可直接运行 如无法运行，删除项目.gradle,.idea,build,gradle,build.gradle文件， 并依据自己的版本创建新项目，将新项目的对应文件复制到根目录下
 
 #### 使用说明
 
diff --git a/entry/build.gradle b/entry/build.gradle
index ac00f24..c32d31f 100644
--- a/entry/build.gradle
+++ b/entry/build.gradle
@@ -18,11 +18,10 @@ ohos {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.har'])
-    implementation project(path: ':library')
     testImplementation 'junit:junit:4.13'
     ohosTestImplementation 'com.huawei.ohos.testkit:runner:1.0.0.100'
     testImplementation 'org.mockito:mockito-core:2.23.0'
-    testImplementation 'com.google.truth:truth:0.39'
+    implementation project(":library")
 }
 decc {
     supportType = ['html', 'xml']
diff --git a/entry/src/main/java/com/protectsoft/webviewcodedemo/ShowAbility.java b/entry/src/main/java/com/protectsoft/webviewcodedemo/ShowAbility.java
index c7a29fc..3bea5d6 100644
--- a/entry/src/main/java/com/protectsoft/webviewcodedemo/ShowAbility.java
+++ b/entry/src/main/java/com/protectsoft/webviewcodedemo/ShowAbility.java
@@ -40,7 +40,7 @@ public class ShowAbility extends Ability {
         ResourceTable.Id_btn_ATELIER_FOREST_DARK,ResourceTable.Id_btn_DARKSTYLE,
         ResourceTable.Id_btn_DARKULA,ResourceTable.Id_btn_DOCCO,ResourceTable.Id_btn_FAR,
         ResourceTable.Id_btn_GITHUB,ResourceTable.Id_btn_GITHUBGIST,
-        ResourceTable.Id_btn_GOOGLECODE,ResourceTable.Id_btn_IDEA,ResourceTable.Id_btn_MAGULA,
+        ResourceTable.Id_btn_GGCODE,ResourceTable.Id_btn_IDEA,ResourceTable.Id_btn_MAGULA,
         ResourceTable.Id_btn_OBSIDIAN,ResourceTable.Id_btn_XCODE};
     private final String[] styles = {
         Settings.WithStyle.DEFAULT,Settings.WithStyle.AGATE,
@@ -49,7 +49,7 @@ public class ShowAbility extends Ability {
         Settings.WithStyle.ATELIER_LIGHT,Settings.WithStyle.ATELIER_FOREST_DARK,Settings.WithStyle.DARKSTYLE,
         Settings.WithStyle.DARKULA,Settings.WithStyle.DOCCO,
         Settings.WithStyle.FAR,Settings.WithStyle.GITHUB,Settings.WithStyle.GITHUBGIST,
-        Settings.WithStyle.GOOGLECODE,Settings.WithStyle.IDEA,
+        Settings.WithStyle.GGCODE,Settings.WithStyle.IDEA,
         Settings.WithStyle.MAGULA,Settings.WithStyle.OBSIDIAN,Settings.WithStyle.XCODE};
     private final Button[] buttons = new Button[NUM_20];
     private Text textStyle;
diff --git a/entry/src/main/resources/base/layout/ability_show.xml b/entry/src/main/resources/base/layout/ability_show.xml
index 1006b8c..d33b288 100644
--- a/entry/src/main/resources/base/layout/ability_show.xml
+++ b/entry/src/main/resources/base/layout/ability_show.xml
@@ -258,13 +258,13 @@
         ohos:orientation="horizontal">
 
         <Button
-            ohos:id="$+id:btn_GOOGLECODE"
+            ohos:id="$+id:btn_GGCODE"
             ohos:top_margin="5vp"
             ohos:bottom_margin="5vp"
             ohos:left_margin="3vp"
             ohos:right_margin="3vp"
             ohos:height="35vp"
-            ohos:text="GOOGLECODE"
+            ohos:text="GGCODE"
             ohos:text_size="12vp"
             ohos:layout_alignment="horizontal_center"
             ohos:background_element="$graphic:background_bt_color"
diff --git a/entry/src/ohosTest/java/com/protectsoft/webviewcodedemo/ExampleOhosTest.java b/entry/src/ohosTest/java/com/protectsoft/webviewcodedemo/ExampleOhosTest.java
index c1fa035..808f174 100644
--- a/entry/src/ohosTest/java/com/protectsoft/webviewcodedemo/ExampleOhosTest.java
+++ b/entry/src/ohosTest/java/com/protectsoft/webviewcodedemo/ExampleOhosTest.java
@@ -6,7 +6,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 
 public class ExampleOhosTest {
-	//（全UI应用、不支持Context等等原因）不支持单元测试
+    //（全UI应用、不支持Context等等原因）不支持单元测试
     @Test
     public void testBundleName() {
         final String actualBundleName = AbilityDelegatorRegistry.getArguments().getTestBundleName();
diff --git a/library/build.gradle b/library/build.gradle
index 722f853..d65602b 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -19,5 +19,4 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     testImplementation 'junit:junit:4.13'
     testImplementation 'org.mockito:mockito-core:2.23.0'
-    testImplementation 'com.google.truth:truth:0.39'
 }
diff --git a/library/src/main/java/com/protectsoft/webviewcode/HighlightLib.java b/library/src/main/java/com/protectsoft/webviewcode/HighlightLib.java
index df89824..0cde85a 100644
--- a/library/src/main/java/com/protectsoft/webviewcode/HighlightLib.java
+++ b/library/src/main/java/com/protectsoft/webviewcode/HighlightLib.java
@@ -1222,9 +1222,9 @@ final class HighlightLib {
             "  text-decoration: underline;\n" +
             "}\n";
 
-    static final String CSS_GOOGLECODE = "/*\n" +
+    static final String CSS_GGCODE = "/*\n" +
             "\n" +
-            "Google Code style (c) Aahan Krish <geekpanth3r@gmail.com>\n" +
+            "Gg Code style (c) Aahan Krish <geekpanth3r@gmail.com>\n" +
             "\n" +
             "*/\n" +
             "\n" +
diff --git a/library/src/main/java/com/protectsoft/webviewcode/Settings.java b/library/src/main/java/com/protectsoft/webviewcode/Settings.java
index 42601cc..7d225fe 100644
--- a/library/src/main/java/com/protectsoft/webviewcode/Settings.java
+++ b/library/src/main/java/com/protectsoft/webviewcode/Settings.java
@@ -117,9 +117,9 @@ public final class Settings {
          */
         public static final String GITHUBGIST = HighlightLib.CSS_GIHUBGIST;
         /**
-         * GOOGLECODE
+         * GGCODE
          */
-        public static final String GOOGLECODE = HighlightLib.CSS_GOOGLECODE;
+        public static final String GGCODE = HighlightLib.CSS_GGCODE;
         /**
          * IDEA
          */
-- 
Gitee