Skip to content

Commit 80c38d1

Browse files
authored
Merge pull request #8 from deton/merge37
Merge AndroidSKK 3.7
2 parents 474d94d + a4db949 commit 80c38d1

44 files changed

Lines changed: 15198 additions & 321 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,5 @@ local.properties
2525
.settings/
2626

2727
/svg
28+
29+
/release

app/build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
applicationId "io.github.deton.androidtutcode"
99
minSdkVersion 21
1010
targetSdk 34
11-
versionCode 7
12-
versionName "1.4.0"
11+
versionCode 8
12+
versionName "1.5.0"
1313
}
1414

1515
buildTypes {
@@ -32,15 +32,16 @@ android {
3232
targetCompatibility JavaVersion.VERSION_17
3333
}
3434
kotlinOptions {
35-
jvmTarget = "17"
35+
jvmTarget = '17'
3636
}
3737
}
3838

3939
dependencies {
4040
implementation files('libs/jdbm-1.0.jar')
4141
/* implementation 'androidx.legacy:legacy-support-v4:1.0.0-beta01' */
42-
implementation 'androidx.appcompat:appcompat:1.6.1'
42+
implementation 'androidx.appcompat:appcompat:1.7.0'
4343
implementation 'androidx.preference:preference-ktx:1.2.1'
44+
implementation 'androidx.core:core-ktx:1.13.1'
4445
}
4546
repositories {
4647
mavenCentral()

app/src/main/AndroidManifest.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@
2525

2626
<activity android:name=".SKKSettingsActivity"
2727
android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
28-
android:label="@string/label_pref_activity" >
28+
android:label="@string/label_pref_activity"
29+
android:exported="true">
30+
<intent-filter>
31+
<action android:name="android.intent.action.MAIN"/>
32+
<category android:name="android.intent.category.LAUNCHER"/>
33+
</intent-filter>
2934
</activity>
3035
<activity android:name=".SKKUserDicTool"
3136
android:theme="@style/Theme.AppCompat.Light.DarkActionBar"

0 commit comments

Comments
 (0)