diff --git a/.gitignore b/.gitignore index aa724b7..1078f3a 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ .externalNativeBuild .cxx local.properties +/app/release +/app/winrelease \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 20af80a..9ff2760 100644 --- a/app/build.gradle +++ b/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 - versionName '1.6' + versionCode 9 + 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" - } } \ No newline at end of file diff --git a/app/release/app-release.apk b/app/release/app-release.apk new file mode 100644 index 0000000..1998968 Binary files /dev/null and b/app/release/app-release.apk differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json new file mode 100644 index 0000000..3c5b757 --- /dev/null +++ b/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" + } + ] +} \ No newline at end of file diff --git a/app/src/main/java/top/fumiama/simpledict/MainActivity.kt b/app/src/main/java/top/fumiama/simpledict/MainActivity.kt index 5c0abbf..6d8f3cc 100644 --- a/app/src/main/java/top/fumiama/simpledict/MainActivity.kt +++ b/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) diff --git a/app/src/main/res/font/nisi.ttf b/app/src/main/res/font/nisi.ttf new file mode 100644 index 0000000..91f1562 Binary files /dev/null and b/app/src/main/res/font/nisi.ttf differ diff --git a/app/src/main/res/layout/line_word.xml b/app/src/main/res/layout/line_word.xml index 13f3a6b..51d56c2 100644 --- a/app/src/main/res/layout/line_word.xml +++ b/app/src/main/res/layout/line_word.xml @@ -12,25 +12,35 @@ android:layout_height="match_parent" android:orientation="vertical"> + + + android:textSize="18sp" /> + android:layout_marginBottom="10dp" />