add nisi

.gitignore

@@ -13,3 +13,5 @@
 .externalNativeBuild
 .cxx
 local.properties
+/app/release
+/app/winrelease

app/build.gradle

@@ -2,7 +2,6 @@ plugins {
     id 'com.android.application'
     id 'kotlin-android'
     id 'kotlin-android-extensions'
-    id 'AndResGuard'
 }
 
 android {
@@ -13,30 +12,18 @@ android {
         applicationId "top.fumiama.simpledict"
         minSdkVersion 26
         targetSdkVersion 30
-        versionCode 8
+        versionCode 9
-        versionName '1.6'
+        versionName '1.7'
         resConfigs "zh", "zh-rCN"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
-    signingConfigs {
-        winrelease {
-            storeFile file('C:/Users/spayi/OneDrive/swc/developer/android_key/open_key')
-            storePassword 'fumiama'
-            keyAlias 'default'
-            keyPassword 'fumiama'
-            v1SigningEnabled true
-            v2SigningEnabled true
-        }
-    }
-
     buildTypes {
-        winrelease {
+        release {
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.winrelease
         }
         /*debug{
             minifyEnabled true
@@ -67,39 +54,4 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     implementation 'com.lapism:search:2.4.1@aar'
-}
-
-andResGuard {
-    // mappingFile = file("./resource_mapping.txt")
-    mappingFile = null
-    use7zip = true
-    useSign = true
-    // It will keep the origin path of your resources when it's true
-    keepRoot = false
-    // If set, name column in arsc those need to proguard will be kept to this value
-    fixedResName = "arg"
-    // It will merge the duplicated resources, but don't rely on this feature too much.
-    // it's always better to remove duplicated resource from repo
-    mergeDuplicatedRes = true
-    whiteList = [
-            // your icon
-            "R.drawable.icon",
-            // for fabric
-            "R.string.com.crashlytics.*",
-            // for google-services
-            "R.string.google_app_id",
-            "R.string.gcm_defaultSenderId",
-            "R.string.default_web_client_id",
-            "R.string.ga_trackingId",
-            "R.string.firebase_database_url",
-            "R.string.google_api_key",
-            "R.string.google_crash_reporting_api_key"
-    ]
-    compressFilePattern = [
-            "resources.arsc"
-    ]
-    sevenzip {
-        artifact = 'com.tencent.mm:SevenZip:1.2.20'
-        //path = "/usr/local/bin/7za"
-    }
 }

app/release/output-metadata.json

@@ -0,0 +1,18 @@
+{
+  "version": 2,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "top.fumiama.simpledict",
+  "variantName": "processReleaseResources",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "versionCode": 9,
+      "versionName": "1.7",
+      "outputFile": "app-release.apk"
+    }
+  ]
+}

app/src/main/java/top/fumiama/simpledict/MainActivity.kt

@@ -166,6 +166,7 @@ class MainActivity : AppCompatActivity() {
                             delKey.setSpan(StrikethroughSpan(), 0, key.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
                             delData.setSpan(StrikethroughSpan(), 0, (data?.length?:0), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
                             ta.text = delKey
+                            tn.text = delKey
                             tb.text = delData
                         }
                     }.start()
@@ -228,6 +229,7 @@ class MainActivity : AppCompatActivity() {
                             Log.d("MyMain", "Like status of $key is $like")
                             holder.itemView.apply {
                                 runOnUiThread {
+                                    tn.text = key
                                     ta.text = key
                                     tb.text = data
                                     vl.setBackgroundResource(if(like) R.drawable.ic_like_filled else R.drawable.ic_like)

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

@@ -12,25 +12,35 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
+        <TextView
+            android:id="@+id/tn"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="10dp"
+            android:fontFamily="@font/nisi"
+            android:textColor="?attr/colorOnSurface"
+            android:textSize="30sp"
+            android:textStyle="bold" />
+
         <TextView
             android:id="@+id/ta"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginTop="8dp"
             android:layout_marginEnd="16dp"
             android:fontFamily="@font/gotham"
             android:textColor="?attr/colorOnSurface"
-            android:textSize="22sp" />
+            android:textSize="18sp" />
 
         <TextView
             android:id="@+id/tb"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginTop="8dp"
             android:layout_marginEnd="16dp"
-            android:layout_marginBottom="8dp" />
+            android:layout_marginBottom="10dp" />
     </LinearLayout>
 
     <View

build.gradle

@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.4.30"
+    ext.kotlin_version = '1.4.31'
     repositories {
         google()
         jcenter()
@@ -8,7 +8,6 @@ buildscript {
     dependencies {
         classpath "com.android.tools.build:gradle:4.1.2"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.tencent.mm:AndResGuard-gradle-plugin:1.2.20'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files