Skip to content

Commit b82a2e5

Browse files
sh0sh0
committed
Moved project to Gradle based build. Also added new icon and modified app name.
1 parent 8fa6fac commit b82a2e5

Some content is hidden

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

75 files changed

+643
-67
lines changed

‎.classpath

-9
This file was deleted.

‎.gitignore

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
assets/
2-
bin/
3-
gen/
4-
.metadata
5-
.settings/
1+
# Defaults
2+
.gradle
3+
/local.properties
4+
/.idea
5+
.DS_Store
6+
/app/build
7+
8+
# Assets
9+
/app/src/main/assets

‎README.md

+3-9

‎app/app.iml

+85
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="git-android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="android-gradle" name="Android-Gradle">
5+
<configuration>
6+
<option name="GRADLE_PROJECT_PATH" value=":app" />
7+
</configuration>
8+
</facet>
9+
<facet type="android" name="Android">
10+
<configuration>
11+
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12+
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
13+
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
14+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
16+
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
17+
<afterSyncTasks>
18+
<task>generateDebugAndroidTestSources</task>
19+
<task>generateDebugSources</task>
20+
</afterSyncTasks>
21+
<option name="ALLOW_USER_CONFIGURATION" value="false" />
22+
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
23+
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
24+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
25+
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
26+
</configuration>
27+
</facet>
28+
</component>
29+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
30+
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
31+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
32+
<exclude-output />
33+
<content url="file://$MODULE_DIR$">
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
44+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
46+
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
47+
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
49+
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
62+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
63+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
67+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
68+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
69+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
70+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
71+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
72+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
73+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
74+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
75+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
76+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
77+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
78+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
79+
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
81+
</content>
82+
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
83+
<orderEntry type="sourceFolder" forTests="false" />
84+
</component>
85+
</module>

‎app/build.gradle

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
apply plugin: 'com.android.application'
2+
3+
android {
4+
compileSdkVersion 23
5+
buildToolsVersion "23.0.2"
6+
7+
defaultConfig {
8+
applicationId "ee.yutani.kotoba"
9+
minSdkVersion 19
10+
targetSdkVersion 23
11+
}
12+
13+
buildTypes {
14+
release {
15+
minifyEnabled false
16+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
17+
}
18+
}
19+
}

‎app/lint.xml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<lint>
3+
</lint>

‎AndroidManifest.xml ‎app/src/main/AndroidManifest.xml

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="ee.yutani.kotoba"
4-
android:versionCode="3"
5-
android:versionName="2.00" >
6-
7-
<uses-sdk
8-
android:minSdkVersion="11"
9-
android:targetSdkVersion="17" />
4+
android:versionCode="4"
5+
android:versionName="2.10" >
106

117
<application
128
android:name=".AppMain"

‎src/ee/yutani/kotoba/AppMain.java ‎app/src/main/java/ee/yutani/kotoba/AppMain.java

File renamed without changes.

‎src/ee/yutani/kotoba/DataDatabase.java ‎app/src/main/java/ee/yutani/kotoba/DataDatabase.java

File renamed without changes.

‎src/ee/yutani/kotoba/DataFileBase.java ‎app/src/main/java/ee/yutani/kotoba/DataFileBase.java

File renamed without changes.

‎src/ee/yutani/kotoba/DataFileCategory.java ‎app/src/main/java/ee/yutani/kotoba/DataFileCategory.java

File renamed without changes.

‎src/ee/yutani/kotoba/DataFileSentence.java ‎app/src/main/java/ee/yutani/kotoba/DataFileSentence.java

File renamed without changes.

‎src/ee/yutani/kotoba/DataFileWord.java ‎app/src/main/java/ee/yutani/kotoba/DataFileWord.java

File renamed without changes.

‎src/ee/yutani/kotoba/DataMain.java ‎app/src/main/java/ee/yutani/kotoba/DataMain.java

File renamed without changes.

‎src/ee/yutani/kotoba/DataSearch.java ‎app/src/main/java/ee/yutani/kotoba/DataSearch.java

File renamed without changes.

‎src/ee/yutani/kotoba/DataStream.java ‎app/src/main/java/ee/yutani/kotoba/DataStream.java

File renamed without changes.

‎src/ee/yutani/kotoba/DataTrainQuestion.java ‎app/src/main/java/ee/yutani/kotoba/DataTrainQuestion.java

File renamed without changes.

‎src/ee/yutani/kotoba/DataTrainSelector.java ‎app/src/main/java/ee/yutani/kotoba/DataTrainSelector.java

File renamed without changes.

‎src/ee/yutani/kotoba/DataTrainWord.java ‎app/src/main/java/ee/yutani/kotoba/DataTrainWord.java

File renamed without changes.

‎src/ee/yutani/kotoba/DataUserWord.java ‎app/src/main/java/ee/yutani/kotoba/DataUserWord.java

File renamed without changes.

‎src/ee/yutani/kotoba/DictionaryView.java ‎app/src/main/java/ee/yutani/kotoba/DictionaryView.java

File renamed without changes.

‎src/ee/yutani/kotoba/FuriganaView.java ‎app/src/main/java/ee/yutani/kotoba/FuriganaView.java

File renamed without changes.

‎src/ee/yutani/kotoba/MainActivity.java ‎app/src/main/java/ee/yutani/kotoba/MainActivity.java

File renamed without changes.

‎src/ee/yutani/kotoba/MainPreferences.java ‎app/src/main/java/ee/yutani/kotoba/MainPreferences.java

File renamed without changes.

‎src/ee/yutani/kotoba/MainSearchSection.java ‎app/src/main/java/ee/yutani/kotoba/MainSearchSection.java

File renamed without changes.

‎src/ee/yutani/kotoba/MainWordsSection.java ‎app/src/main/java/ee/yutani/kotoba/MainWordsSection.java

File renamed without changes.

‎src/ee/yutani/kotoba/MainWordsTrain.java ‎app/src/main/java/ee/yutani/kotoba/MainWordsTrain.java

File renamed without changes.

‎src/ee/yutani/kotoba/MainWordsView.java ‎app/src/main/java/ee/yutani/kotoba/MainWordsView.java

File renamed without changes.

‎src/ee/yutani/kotoba/QuadraticOptimizer.java ‎app/src/main/java/ee/yutani/kotoba/QuadraticOptimizer.java

File renamed without changes.

‎src/ee/yutani/kotoba/SentenceFragment.java ‎app/src/main/java/ee/yutani/kotoba/SentenceFragment.java

File renamed without changes.

‎src/ee/yutani/kotoba/SentenceView.java ‎app/src/main/java/ee/yutani/kotoba/SentenceView.java

File renamed without changes.

‎app/src/main/res/drawable-hdpi/ic_launcher.png

3.92 KB

‎app/src/main/res/drawable-mdpi/ic_launcher.png

2.74 KB

‎app/src/main/res/drawable-xhdpi/ic_launcher.png

5.2 KB

‎app/src/main/res/drawable-xxhdpi/ic_launcher.png

7.38 KB

‎res/layout/activity_main.xml ‎app/src/main/res/layout/activity_main.xml

File renamed without changes.

‎res/layout/dictionary_view.xml ‎app/src/main/res/layout/dictionary_view.xml

File renamed without changes.

‎res/layout/search_section.xml ‎app/src/main/res/layout/search_section.xml

File renamed without changes.

‎res/layout/sentence_item.xml ‎app/src/main/res/layout/sentence_item.xml

File renamed without changes.

‎res/layout/words_section.xml ‎app/src/main/res/layout/words_section.xml

File renamed without changes.

‎res/layout/words_section_bar.xml ‎app/src/main/res/layout/words_section_bar.xml

File renamed without changes.

‎res/layout/words_section_header.xml ‎app/src/main/res/layout/words_section_header.xml

File renamed without changes.

‎res/layout/words_section_item.xml ‎app/src/main/res/layout/words_section_item.xml

File renamed without changes.

‎res/layout/words_train_choice.xml ‎app/src/main/res/layout/words_train_choice.xml

File renamed without changes.

‎res/layout/words_train_root.xml ‎app/src/main/res/layout/words_train_root.xml

File renamed without changes.

‎res/layout/words_view_item.xml ‎app/src/main/res/layout/words_view_item.xml

File renamed without changes.

‎res/layout/words_view_root.xml ‎app/src/main/res/layout/words_view_root.xml

File renamed without changes.

‎res/menu/main.xml ‎app/src/main/res/menu/main.xml

File renamed without changes.

‎res/menu/progress_menu.xml ‎app/src/main/res/menu/progress_menu.xml

File renamed without changes.

‎res/values-sw600dp/dimens.xml ‎app/src/main/res/values-sw600dp/dimens.xml

File renamed without changes.

‎res/values-sw720dp-land/dimens.xml ‎app/src/main/res/values-sw720dp-land/dimens.xml

File renamed without changes.

‎res/values-v11/styles.xml ‎app/src/main/res/values-v11/styles.xml

File renamed without changes.

‎res/values/arrays.xml ‎app/src/main/res/values/arrays.xml

File renamed without changes.

‎res/values/dimens.xml ‎app/src/main/res/values/dimens.xml

File renamed without changes.

‎res/values/strings.xml ‎app/src/main/res/values/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33

4-
<string name="app_name">Kotoba-chan</string>
4+
<string name="app_name">Kotoba</string>
55

66
<string name="preferences">Settings</string>
77

‎res/values/styles.xml ‎app/src/main/res/values/styles.xml

File renamed without changes.

‎res/xml/preferences.xml ‎app/src/main/res/xml/preferences.xml

File renamed without changes.

‎art/func-1024x500.png

46.5 KB

0 commit comments

Comments
 (0)