Skip to content

Commit 0e3d5e0

Browse files
SupremeRulerSupremeRuler
committed
Updated Android sample (Android Studio 3.3.2)
1 parent 98d76e7 commit 0e3d5e0

File tree

14 files changed

+68
-42
lines changed

14 files changed

+68
-42
lines changed

‎Android/sample_astudio/.idea/caches/build_file_checksums.ser

0 Bytes
Binary file not shown.

‎Android/sample_astudio/.idea/gradle.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Android/sample_astudio/.idea/misc.xml

Lines changed: 8 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Android/sample_astudio/app/app.iml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1818
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
1919
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
20-
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
20+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
2121
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
2222
</configuration>
2323
</facet>
@@ -28,17 +28,15 @@
2828
<exclude-output />
2929
<content url="file://$MODULE_DIR$">
3030
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
31-
<sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r" isTestSource="false" generated="true" />
32-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
31+
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
3332
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
34-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
33+
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
3534
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3635
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3736
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
38-
<sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debugAndroidTest/processDebugAndroidTestResources/r" isTestSource="true" generated="true" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
4038
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
41-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
4240
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4341
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4442
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
@@ -84,21 +82,27 @@
8482
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
8583
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8684
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
8989
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
9090
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
9191
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundle_manifest" />
9293
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
9394
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
9495
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
9596
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkReleaseClasspath" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
9698
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
9799
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
98100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
99101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
100102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
101103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_app_manifest" />
105+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_app_info_output_file" />
102106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_main_apk_resources" />
103107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
104108
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_split_apk_resources" />
@@ -108,6 +112,7 @@
108112
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
109113
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
110114
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
115+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/metadata_feature_manifest" />
111116
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
112117
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
113118
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
@@ -116,10 +121,12 @@
116121
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
117122
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
118123
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
124+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/signing_config" />
119125
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
120126
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split_list" />
121127
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
122128
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
129+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/validate_signing_config" />
123130
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
124131
<excludeFolder url="file://$MODULE_DIR$/build/obj" />
125132
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />

‎Android/sample_astudio/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ android {
3636
into 'lib/'
3737
}
3838

39-
// TODO: to reduce jar size, replace APP_ABI=all with list list of CPUs you want to support
39+
// TODO: to reduce jar size, replace APP_ABI=all with list of CPUs you want to support
4040

4141
task ndkBuild(type: Exec, description: 'Compile JNI source via NDK') {
4242

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.phatware.android.recotest"
4-
android:versionName="5.8.0"
4+
android:versionName="5.9.0"
55
android:installLocation="auto"
6-
android:versionCode="35">
6+
android:versionCode="36">
77
<supports-screens
88
android:largeScreens="true"
99
android:xlargeScreens="true"

‎Android/sample_astudio/app/src/main/java/com/phatware/android/MainSettings.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,11 @@ protected void onCreate(Bundle savedInstanceState) {
7373
languagePreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
7474
@Override
7575
public boolean onPreferenceClick(final Preference preference) {
76-
DialogHelper.createLanguageDialog(MainSettings.this, getCurrentFocus().getWindowToken()).show();
76+
try {
77+
DialogHelper.createLanguageDialog(MainSettings.this, getWindow().getDecorView().getRootView().getWindowToken()).show();
78+
} catch( Throwable e) {
79+
Log.e(TAG, e.getMessage(), e);
80+
}
7781
return true;
7882
}
7983
});
@@ -89,7 +93,6 @@ public boolean onPreferenceClick(final Preference preference) {
8993
}
9094

9195

92-
9396
public static String getLanguage(Context context) {
9497
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
9598
return sharedPreferences.getString(context.getResources().getString(R.string.preference_main_settings_language_key), null);
@@ -119,4 +122,9 @@ public static boolean isSeparateLetterModeEnabled(Context context) {
119122
public static boolean isSingleWordEnabled(Context context) {
120123
return getCheckBoxPreference(context, context.getResources(), R.string.preference_recognizer_single_word_only_key, false);
121124
}
125+
126+
@Override
127+
public void onBackPressed() {
128+
finish();
129+
}
122130
}

‎Android/sample_astudio/app/src/main/java/com/phatware/android/WritePadManager.java

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,7 @@ public void setInit(boolean init) {
102102

103103
static Language language = Language.en;
104104

105-
106-
public static boolean reloadAutocorrector() {
105+
public static boolean reloadAutocorrector() {
107106
return writePadAPI.recoReloadAutocorrector();
108107
}
109108

@@ -180,7 +179,7 @@ public static String recoInkData(int nDataLen, boolean bAsync, boolean bFlipY, b
180179
return writePadAPI.recoInkData(nDataLen, bAsync, bFlipY, bSort );
181180
}
182181

183-
public static int recoInit(Context context) {
182+
public static int recoInit(Context context) {
184183
int result = -1;
185184
try {
186185
String dir = context.getDir("user", 0).getAbsolutePath();
@@ -197,19 +196,19 @@ public static void recoFree() {
197196
language.setInit(false);
198197
}
199198

200-
public static Language getLangByString(String defaultLanguage) {
201-
defaultLanguage = defaultLanguage == null ? Locale.getDefault().getLanguage() : defaultLanguage;
202-
if (defaultLanguage == null) {
203-
return Language.en;
204-
}
205-
Language language;
206-
try {
207-
language = Language.valueOf(defaultLanguage);
208-
} catch (Exception ignored) {
209-
language = Language.en;
210-
}
199+
public static Language getLangByString(String defaultLanguage) {
200+
defaultLanguage = defaultLanguage == null ? Locale.getDefault().getLanguage() : defaultLanguage;
201+
if (defaultLanguage == null) {
202+
return Language.en;
203+
}
204+
Language language;
205+
try {
206+
language = Language.valueOf(defaultLanguage);
207+
} catch (Exception ignored) {
208+
language = Language.en;
209+
}
211210

212-
return language;
211+
return language;
213212
}
214213

215214
public static void setLanguage(String pLanguage, Context context) {

‎Android/sample_astudio/app/src/main/java/com/phatware/android/recotest/RecoTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ protected void onCreate(Bundle savedInstanceState) {
101101
Point size = new Point();
102102
defaultDisplay.getSize(size);
103103
int screenHeight = size.y;
104-
int textViewHeight = 15 * screenHeight / 100;
104+
int textViewHeight = (15 * screenHeight) / 100;
105105
final LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, textViewHeight);
106106
recognizedTextContainer.setLayoutParams(params);
107107
readyText.setLayoutParams(params);

‎Android/sample_astudio/app/src/main/res/layout/main.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
>
77
<TextView
88
android:id="@+id/ready_text_title"
9-
android:text="Ready Text"
9+
android:text="@string/ready_text"
1010
android:layout_width="fill_parent"
1111
android:layout_height="wrap_content"
1212
android:background="@color/candidate_recommended_background"
1313
android:textColor="@color/white"
14-
android:paddingLeft="2dp"
15-
android:textSize="12dp"
14+
android:paddingStart="2dp"
15+
android:textSize="12sp"
1616
/>
1717

1818
<TextView
@@ -21,19 +21,19 @@
2121
android:layout_height="34dp"
2222
android:layout_margin="2dp"
2323
android:background="@color/white"
24-
android:paddingLeft="2dp"
24+
android:paddingStart="2dp"
2525
android:textColor="@color/black"
26-
android:textSize="16dp" />
26+
android:textSize="16sp" />
2727

2828
<TextView
2929
android:id="@+id/recognized_text_title"
30-
android:text="Recognized Text"
30+
android:text="@string/recognized_text"
3131
android:layout_width="fill_parent"
3232
android:layout_height="wrap_content"
3333
android:background="@color/candidate_recommended_background"
34-
android:paddingLeft="2dp"
34+
android:paddingStart="2dp"
3535
android:textColor="@color/white"
36-
android:textSize="12dp"
36+
android:textSize="12sp"
3737
/>
3838

3939
<LinearLayout

0 commit comments

Comments
 (0)