Version 3.0.0 rc 1

suragch · Nov 19, 2018 · 32cacb1 · 32cacb1
1 parent ec82f9b
commit 32cacb1
Show file tree

Hide file tree

Showing 12 changed files with 221 additions and 290 deletions.
diff --git a/..._studymongolian_mongol_library_1_16_4.xml → ..._studymongolian_mongol_library_1_16_5.xml b/..._studymongolian_mongol_library_1_16_4.xml → ..._studymongolian_mongol_library_1_16_5.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/app/app.iml b/app/app.iml
@@ -84,6 +84,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
@@ -92,12 +93,14 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkReleaseClasspath" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_main_apk_resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_split_apk_resources" />
@@ -109,6 +112,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
@@ -120,14 +124,15 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Gradle: com.android.support:customview-28.0.0" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:localbroadcastmanager-28.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: net.studymongolian:mongol-library-1.16.5" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: net.studymongolian:mongol-library-1.16.4" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:interpolator-28.0.0" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-core-utils-28.0.0" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-core-ui-28.0.0" level="project" />

diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "net.studymongolian.chimee"
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 24
-        versionName "3.0.0 测试版7"
+        versionCode 25
+        versionName "3.0.0"
     }
 
     buildTypes {
@@ -25,5 +25,5 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support:recyclerview-v7:28.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation 'net.studymongolian:mongol-library:1.16.4'
+    implementation 'net.studymongolian:mongol-library:1.16.5'
 }
diff --git a/app/src/main/java/net/studymongolian/chimee/ChimeeInputMethodService.java b/app/src/main/java/net/studymongolian/chimee/ChimeeInputMethodService.java
@@ -2,6 +2,7 @@
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.graphics.Color;
 import android.inputmethodservice.ExtractEditText;
 import android.inputmethodservice.InputMethodService;
 import android.view.LayoutInflater;
@@ -26,6 +27,7 @@ public View onCreateInputView() {
         imeContainer.showSystemKeyboardsOption("ᠰᠢᠰᠲ᠋ᠧᠮ");
         imeContainer.setDataSource(new ImeDataSourceHelper(this));
         imeContainer.setOnSystemImeListener(this);
+        imeContainer.setBackgroundColor(getResources().getColor(R.color.keyboard_background));
         return imeContainer;
     }
 

diff --git a/app/src/main/res/layout/activity_add_edit_message.xml b/app/src/main/res/layout/activity_add_edit_message.xml
@@ -50,21 +50,26 @@
         android:layout_weight="0.4">
 
         <net.studymongolian.chimee.KeyboardChagaanTolgoi
+            style="@style/KeyboardStyle"
+            app:primaryTextSize="@dimen/aeiou_kbd_text_size"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:candidatesLocation="vertical_left" />
 
         <net.studymongolian.chimee.KeyboardComputer
+            style="@style/KeyboardStyle"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:candidatesLocation="horizontal_top" />
 
         <net.studymongolian.mongollibrary.KeyboardLatin
+            style="@style/KeyboardStyle"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:candidatesLocation="none" />
 
         <net.studymongolian.mongollibrary.KeyboardCyrillic
+            style="@style/KeyboardStyle"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:candidatesLocation="none" />

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -72,24 +72,30 @@
         android:id="@+id/imeContainer"
         android:layout_width="wrap_content"
         android:layout_height="0dp"
-        android:layout_weight=".4">
+        android:layout_weight=".4"
+        android:background="@color/very_light_grey">
 
         <net.studymongolian.chimee.KeyboardChagaanTolgoi
+            style="@style/KeyboardStyle"
+            app:primaryTextSize="@dimen/aeiou_kbd_text_size"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:candidatesLocation="vertical_left" />
 
         <net.studymongolian.chimee.KeyboardComputer
+            style="@style/KeyboardStyle"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:candidatesLocation="horizontal_top" />
 
         <net.studymongolian.mongollibrary.KeyboardLatin
+            style="@style/KeyboardStyle"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:candidatesLocation="none" />
 
         <net.studymongolian.mongollibrary.KeyboardCyrillic
+            style="@style/KeyboardStyle"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:candidatesLocation="none" />

diff --git a/app/src/main/res/layout/activity_save.xml b/app/src/main/res/layout/activity_save.xml
@@ -79,21 +79,26 @@
         >
 
         <net.studymongolian.chimee.KeyboardChagaanTolgoi
+            style="@style/KeyboardStyle"
+            app:primaryTextSize="@dimen/aeiou_kbd_text_size"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:candidatesLocation="vertical_left" />
 
         <net.studymongolian.chimee.KeyboardComputer
+            style="@style/KeyboardStyle"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:candidatesLocation="horizontal_top" />
 
         <net.studymongolian.mongollibrary.KeyboardLatin
+            style="@style/KeyboardStyle"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:candidatesLocation="none" />
 
         <net.studymongolian.mongollibrary.KeyboardCyrillic
+            style="@style/KeyboardStyle"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:candidatesLocation="none" />

diff --git a/app/src/main/res/layout/system_keyboard.xml b/app/src/main/res/layout/system_keyboard.xml
@@ -6,21 +6,26 @@
     android:layout_height="wrap_content">
 
     <net.studymongolian.chimee.KeyboardChagaanTolgoi
+        style="@style/KeyboardStyle"
+        app:primaryTextSize="@dimen/aeiou_kbd_text_size"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:candidatesLocation="vertical_left" />
 
     <net.studymongolian.chimee.KeyboardComputer
+        style="@style/KeyboardStyle"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:candidatesLocation="horizontal_top" />
 
     <net.studymongolian.mongollibrary.KeyboardLatin
+        style="@style/KeyboardStyle"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:candidatesLocation="none" />
 
     <net.studymongolian.mongollibrary.KeyboardCyrillic
+        style="@style/KeyboardStyle"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:candidatesLocation="none" />

diff --git a/app/src/main/res/values/color.xml b/app/src/main/res/values/color.xml
@@ -20,19 +20,7 @@
 
 
     <!-- keyboard -->
-    <color name="keyboard_background">@color/black</color>
-    <color name="keyboard_keys_normal">@color/primary</color>
-    <color name="keyboard_keys_normal_shadow">@color/medium_grey_lighter</color>
-    <color name="keyboard_keys_pressed">@color/accent</color>
-    <color name="keyboard_keys_pressed_shadow">@color/dusty_blue_lighter</color>
-    <color name="keyboard_format_keys_normal">@color/primary_dark</color>
-    <color name="keyboard_format_keys_normal_shadow">@color/dark_grey_lighter</color>
-    <color name="keyboard_suggestionbar_text">@color/dark_grey</color>
-    <color name="keyboard_suggestionbar_divider">@color/primary</color>
-    <color name="keyboard_suggestionbar_highlight">@color/accent</color>
-    <color name="keyboard_letters">@color/white</color>
-    <color name="keyboard_longtouch_letters">@color/secondary_text_white</color>
-
+    <color name="keyboard_background">@color/very_light_grey</color>
 
 
     <color name="custom_ripple">@color/accent</color>

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="aeiou_kbd_text_size">27sp</dimen>
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="KeyboardStyle">
+        <item name="keyBorderWidth">1dp</item>
+        <item name="keyBorderColor">@color/grey_500</item>
+        <item name="keySpacing">2dp</item>
+    </style>
+</resources>