Merge pull request #8 from deton/merge37

Merge AndroidSKK 3.7
deton · Oct 27, 2024 · 80c38d1 · 80c38d1
2 parents 474d94d + a4db949
commit 80c38d1
Show file tree

Hide file tree

Showing 44 changed files with 15,198 additions and 321 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,3 +25,5 @@ local.properties
 .settings/
 
 /svg
+
+/release
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "io.github.deton.androidtutcode"
         minSdkVersion 21
         targetSdk 34
-        versionCode 7
-        versionName "1.4.0"
+        versionCode 8
+        versionName "1.5.0"
     }
 
     buildTypes {
@@ -32,15 +32,16 @@ android {
         targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = '17'
     }
 }
 
 dependencies {
     implementation files('libs/jdbm-1.0.jar')
 /*    implementation 'androidx.legacy:legacy-support-v4:1.0.0-beta01' */
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.preference:preference-ktx:1.2.1'
+    implementation 'androidx.core:core-ktx:1.13.1'
 }
 repositories {
     mavenCentral()

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -25,7 +25,12 @@
 
 		<activity android:name=".SKKSettingsActivity"
 			android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
-			android:label="@string/label_pref_activity" >
+			android:label="@string/label_pref_activity"
+			android:exported="true">
+			<intent-filter>
+				<action android:name="android.intent.action.MAIN"/>
+				<category android:name="android.intent.category.LAUNCHER"/>
+			</intent-filter>
 		</activity>
 		<activity android:name=".SKKUserDicTool"
 			android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,3 +25,5 @@ local.properties
		.settings/

		/svg

		/release