Skip to content

Commit 8485d1b

Browse files
detondeton
authored
Merge pull request #4 from deton/merge341
Merge AndroidSKK 3.4.1
2 parents ef4824b + 2ea4062 commit 8485d1b

Some content is hidden

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

62 files changed

+1575
-1414
lines changed

‎.gitignore

+35-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,41 @@
1+
*.apk
2+
*.ap_
3+
*.dex
4+
*.class
5+
bin/
6+
gen/
7+
out/
8+
19
*.iml
210
.gradle
3-
/local.properties
4-
/.idea/workspace.xml
5-
/.idea/libraries
6-
/.idea/misc.xml
7-
/.idea/caches
8-
/.idea/codeStyles
11+
!/gradle/wrapper/gradle-wrapper.jar
12+
13+
local.properties
14+
.idea/workspace.xml
15+
.idea/libraries
16+
.idea/.name
17+
.idea/compiler.xml
18+
.idea/copyright/profiles_settings.xml
19+
.idea/encodings.xml
20+
.idea/misc.xml
21+
.idea/modules.xml
22+
.idea/scopes/scope_settings.xml
23+
.idea/dictionaries
24+
.idea/vcs.xml
25+
.idea/jsLibraryMappings.xml
26+
.idea/datasources.xml
27+
.idea/dataSources.ids
28+
.idea/sqlDataSources.xml
29+
.idea/dynamic.xml
30+
.idea/uiDesigner.xml
31+
.idea/caches
32+
.idea/codeStyles
33+
.idea/assetWizardSettings.xml
34+
35+
.DS_Store
936
/build
1037
/captures
1138
/app/release/output.json
39+
.externalNativeBuild
1240

13-
/svg
41+
/svg

‎.idea/compiler.xml

+1-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/deploymentTargetDropDown.xml

+17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/gradle.xml

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/jarRepositories.xml

+35
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/modules.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/runConfigurations.xml

-12
This file was deleted.

‎.project

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>AndroidSKK</name>
4+
<comment>Project AndroidSKK created by Buildship.</comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
16+
</natures>
17+
</projectDescription>

‎.settings/org.eclipse.buildship.core.prefs

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
connection.project.dir=
2+
eclipse.preferences.version=1

‎app/.classpath

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
4+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
5+
<classpathentry kind="output" path="bin/default"/>
6+
</classpath>

‎app/.project

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>app</name>
4+
<comment>Project app created by Buildship.</comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
22+
</natures>
23+
</projectDescription>

‎app/.settings/org.eclipse.buildship.core.prefs

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
connection.project.dir=..
2+
eclipse.preferences.version=1

‎app/build.gradle

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43

54
android {
6-
compileSdkVersion 28
5+
compileSdkVersion 31
76

87
defaultConfig {
98
applicationId "io.github.deton.androidtutcode"
109
minSdkVersion 14
11-
targetSdkVersion 28
12-
versionCode 3
13-
versionName "1.0.2"
10+
targetSdkVersion 30
11+
versionCode 4
12+
versionName "1.1.0"
1413
}
1514

1615
buildTypes {
@@ -19,16 +18,19 @@ android {
1918
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
2019
}
2120
}
22-
lintOptions {
21+
buildFeatures {
22+
viewBinding true
23+
}
24+
lint {
2325
abortOnError false
2426
}
2527
}
2628

2729
dependencies {
2830
implementation files('libs/jdbm-1.0.jar')
2931
/* implementation 'androidx.legacy:legacy-support-v4:1.0.0-beta01' */
30-
implementation 'androidx.appcompat:appcompat:1.0.0-beta01'
31-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
32+
implementation 'androidx.appcompat:appcompat:1.4.1'
33+
implementation 'androidx.preference:preference-ktx:1.2.0'
3234
}
3335
repositories {
3436
mavenCentral()

‎app/src/main/AndroidManifest.xml

+4-8
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
package="jp.deadend.noname.skk">
44
<uses-permission android:name="android.permission.RECORD_AUDIO" />
55
<application android:label="@string/ime_name"
6-
android:allowBackup="true" >
6+
android:allowBackup="true"
7+
android:name=".SKKApplication"
8+
>
79
<service android:name=".SKKService"
810
android:permission="android.permission.BIND_INPUT_METHOD" >
911
<intent-filter>
@@ -12,16 +14,10 @@
1214
<meta-data android:name="android.view.im" android:resource="@xml/method" />
1315
</service>
1416

15-
<activity android:name=".SKKPrefs"
17+
<activity android:name=".SKKSettingsActivity"
1618
android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
1719
android:label="@string/label_pref_activity" >
1820
</activity>
19-
<activity android:name=".SKKDicExtractActivity"
20-
android:label="@string/label_extdic_activity"
21-
android:configChanges="keyboard|keyboardHidden|orientation"
22-
android:screenOrientation="nosensor"
23-
android:theme="@style/Theme.AppCompat.Light.Dialog" >
24-
</activity>
2521
<activity android:name=".SKKUserDicTool"
2622
android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
2723
android:label="@string/label_dictool_activity" >

0 commit comments

Comments
 (0)