version 2.2

suragch · May 23, 2020 · a83aaa2 · a83aaa2
1 parent 1475cf6
commit a83aaa2
Show file tree

Hide file tree

Showing 11 changed files with 609 additions and 147 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "com.aepronunciation.ipa"
         minSdkVersion 14
         targetSdkVersion 29
-        versionCode 16
-        versionName "2.1.4"
+        versionCode 17
+        versionName "2.2.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/src/main/java/com/aepronunciation/ipa/AppLocale.java b/app/src/main/java/com/aepronunciation/ipa/AppLocale.java
@@ -18,6 +18,12 @@ static Locale getLocale(Context context) {
                 return Locale.TRADITIONAL_CHINESE;
             case "ru":
                 return new Locale("ru","RU");
+            case "mn":
+                return new Locale("mn", "MN");
+            case "ja":
+                return new Locale("ja", "JP");
+            case "vi":
+                return new Locale("vi", "VN");
             default:
                 return Locale.US;
         }

diff --git a/app/src/main/java/com/aepronunciation/ipa/KeyboardInputFragment.java b/app/src/main/java/com/aepronunciation/ipa/KeyboardInputFragment.java
@@ -121,7 +121,7 @@ private void initializeMaps() {
         mClickMap.put(R.id.key_r, getString(R.string.key_r));
         mClickMap.put(R.id.key_flap_t, getString(R.string.key_flap_t));
         mClickMap.put(R.id.key_glottal_stop, getString(R.string.key_glottal_stop));
-        mClickMap.put(R.id.key_brackets, getString(R.string.key_left_bracket));
+        mClickMap.put(R.id.key_undertie, getString(R.string.key_undertie));
         mClickMap.put(R.id.key_slash, getString(R.string.key_slash));
         mClickMap.put(R.id.key_space, getString(R.string.key_space));
         mClickMap.put(R.id.key_stress, getString(R.string.key_primary_stress));
@@ -143,8 +143,8 @@ private void initializeMaps() {
         mLongClickMap.put(R.id.key_w, getString(R.string.key_alt_w));
         mLongClickMap.put(R.id.key_h, getString(R.string.key_alt_h));
         mLongClickMap.put(R.id.key_r, getString(R.string.key_alt_r));
-        mLongClickMap.put(R.id.key_brackets, getString(R.string.key_right_bracket));
-        mLongClickMap.put(R.id.key_slash, getString(R.string.key_undertie));
+        mLongClickMap.put(R.id.key_undertie, getString(R.string.key_left_bracket));
+        mLongClickMap.put(R.id.key_slash, getString(R.string.key_right_bracket));
         mLongClickMap.put(R.id.key_stress, getString(R.string.key_secondary_stress));
     }
 

diff --git a/app/src/main/res/layout/activity_personal_evaluation.xml b/app/src/main/res/layout/activity_personal_evaluation.xml
diff --git a/app/src/main/res/layout/fragment_keyboard_input.xml b/app/src/main/res/layout/fragment_keyboard_input.xml
@@ -660,19 +660,19 @@
         </RelativeLayout>
 
         <RelativeLayout
-            android:id="@+id/key_brackets"
+            android:id="@+id/key_undertie"
             style="@style/AppTheme.KeyLayoutStyle"
             android:layout_weight="1" >
 
             <com.aepronunciation.ipa.IpaTextView
-                android:id="@+id/tvKey_left_bracket"
+                android:id="@+id/tvKey_undertie"
                 style="@style/AppTheme.KeyTextStyle"
-                android:text="@string/key_left_bracket" />
+                android:text="@string/key_undertie" />
 
             <com.aepronunciation.ipa.IpaTextView
-                android:id="@+id/tvKey_right_bracket"
+                android:id="@+id/tvKey_left_bracket"
                 style="@style/AppTheme.LongPressKeyTextStyle"
-                android:text="@string/key_right_bracket" />
+                android:text="@string/key_left_bracket" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -686,9 +686,9 @@
                 android:text="@string/key_slash" />
 
             <com.aepronunciation.ipa.IpaTextView
-                android:id="@+id/tvKey_undertie"
+                android:id="@+id/tvKey_right_bracket"
                 style="@style/AppTheme.LongPressKeyTextStyle"
-                android:text="@string/key_undertie" />
+                android:text="@string/key_right_bracket" />
 
         </RelativeLayout>