From 02fcc9b3bbe62291780bed578a12b7e91fe25b67 Mon Sep 17 00:00:00 2001 From: Oleksandr Yeropudov Date: Tue, 19 Dec 2017 15:41:57 +0300 Subject: [PATCH 1/3] fix call methods on null=) --- .../animated_vector_drawable_24_2_0.xml | 12 ------------ .idea/libraries/appcompat_v7_24_2_0.xml | 15 --------------- .idea/libraries/design_24_2_0.xml | 15 --------------- .idea/libraries/firebase_analytics_10_0_1.xml | 10 ---------- .../libraries/firebase_analytics_impl_10_0_1.xml | 10 ---------- .idea/libraries/firebase_common_10_0_1.xml | 10 ---------- .idea/libraries/firebase_core_10_0_1.xml | 10 ---------- .idea/libraries/firebase_iid_10_0_1.xml | 10 ---------- .idea/libraries/firebase_messaging_10_0_1.xml | 10 ---------- .idea/libraries/hamcrest_core_1_3.xml | 11 ----------- .idea/libraries/junit_4_12.xml | 11 ----------- .idea/libraries/mobmetricalib_2_51.xml | 12 ------------ .../libraries/play_services_basement_10_0_1.xml | 10 ---------- .idea/libraries/play_services_tasks_10_0_1.xml | 10 ---------- .idea/libraries/recyclerview_v7_24_2_0.xml | 15 --------------- .idea/libraries/support_annotations_24_2_0.xml | 11 ----------- .idea/libraries/support_compat_24_2_0.xml | 16 ---------------- .idea/libraries/support_core_ui_24_2_0.xml | 16 ---------------- .idea/libraries/support_core_utils_24_2_0.xml | 13 ------------- .idea/libraries/support_fragment_24_2_0.xml | 16 ---------------- .idea/libraries/support_media_compat_24_2_0.xml | 16 ---------------- .idea/libraries/support_v4_24_2_0.xml | 10 ---------- .../libraries/support_vector_drawable_24_2_0.xml | 12 ------------ .idea/libraries/volley_1_0_0.xml | 12 ------------ .idea/modules.xml | 2 +- app/src/main/java/ru/aacidov/distalkpro/TTS.java | 4 +++- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 28 files changed, 7 insertions(+), 298 deletions(-) delete mode 100644 .idea/libraries/animated_vector_drawable_24_2_0.xml delete mode 100644 .idea/libraries/appcompat_v7_24_2_0.xml delete mode 100644 .idea/libraries/design_24_2_0.xml delete mode 100644 .idea/libraries/firebase_analytics_10_0_1.xml delete mode 100644 .idea/libraries/firebase_analytics_impl_10_0_1.xml delete mode 100644 .idea/libraries/firebase_common_10_0_1.xml delete mode 100644 .idea/libraries/firebase_core_10_0_1.xml delete mode 100644 .idea/libraries/firebase_iid_10_0_1.xml delete mode 100644 .idea/libraries/firebase_messaging_10_0_1.xml delete mode 100644 .idea/libraries/hamcrest_core_1_3.xml delete mode 100644 .idea/libraries/junit_4_12.xml delete mode 100644 .idea/libraries/mobmetricalib_2_51.xml delete mode 100644 .idea/libraries/play_services_basement_10_0_1.xml delete mode 100644 .idea/libraries/play_services_tasks_10_0_1.xml delete mode 100644 .idea/libraries/recyclerview_v7_24_2_0.xml delete mode 100644 .idea/libraries/support_annotations_24_2_0.xml delete mode 100644 .idea/libraries/support_compat_24_2_0.xml delete mode 100644 .idea/libraries/support_core_ui_24_2_0.xml delete mode 100644 .idea/libraries/support_core_utils_24_2_0.xml delete mode 100644 .idea/libraries/support_fragment_24_2_0.xml delete mode 100644 .idea/libraries/support_media_compat_24_2_0.xml delete mode 100644 .idea/libraries/support_v4_24_2_0.xml delete mode 100644 .idea/libraries/support_vector_drawable_24_2_0.xml delete mode 100644 .idea/libraries/volley_1_0_0.xml diff --git a/.idea/libraries/animated_vector_drawable_24_2_0.xml b/.idea/libraries/animated_vector_drawable_24_2_0.xml deleted file mode 100644 index 0a374b7..0000000 --- a/.idea/libraries/animated_vector_drawable_24_2_0.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/appcompat_v7_24_2_0.xml b/.idea/libraries/appcompat_v7_24_2_0.xml deleted file mode 100644 index f11eefb..0000000 --- a/.idea/libraries/appcompat_v7_24_2_0.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/design_24_2_0.xml b/.idea/libraries/design_24_2_0.xml deleted file mode 100644 index 79d967c..0000000 --- a/.idea/libraries/design_24_2_0.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/firebase_analytics_10_0_1.xml b/.idea/libraries/firebase_analytics_10_0_1.xml deleted file mode 100644 index 4cf6b2b..0000000 --- a/.idea/libraries/firebase_analytics_10_0_1.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/firebase_analytics_impl_10_0_1.xml b/.idea/libraries/firebase_analytics_impl_10_0_1.xml deleted file mode 100644 index f01eed7..0000000 --- a/.idea/libraries/firebase_analytics_impl_10_0_1.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/firebase_common_10_0_1.xml b/.idea/libraries/firebase_common_10_0_1.xml deleted file mode 100644 index 5e58fd2..0000000 --- a/.idea/libraries/firebase_common_10_0_1.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/firebase_core_10_0_1.xml b/.idea/libraries/firebase_core_10_0_1.xml deleted file mode 100644 index 7eac249..0000000 --- a/.idea/libraries/firebase_core_10_0_1.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/firebase_iid_10_0_1.xml b/.idea/libraries/firebase_iid_10_0_1.xml deleted file mode 100644 index 8b20884..0000000 --- a/.idea/libraries/firebase_iid_10_0_1.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/firebase_messaging_10_0_1.xml b/.idea/libraries/firebase_messaging_10_0_1.xml deleted file mode 100644 index 9274a51..0000000 --- a/.idea/libraries/firebase_messaging_10_0_1.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/hamcrest_core_1_3.xml b/.idea/libraries/hamcrest_core_1_3.xml deleted file mode 100644 index 157e3f3..0000000 --- a/.idea/libraries/hamcrest_core_1_3.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/junit_4_12.xml b/.idea/libraries/junit_4_12.xml deleted file mode 100644 index 305df30..0000000 --- a/.idea/libraries/junit_4_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/mobmetricalib_2_51.xml b/.idea/libraries/mobmetricalib_2_51.xml deleted file mode 100644 index a617f70..0000000 --- a/.idea/libraries/mobmetricalib_2_51.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_basement_10_0_1.xml b/.idea/libraries/play_services_basement_10_0_1.xml deleted file mode 100644 index b4d86ac..0000000 --- a/.idea/libraries/play_services_basement_10_0_1.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_tasks_10_0_1.xml b/.idea/libraries/play_services_tasks_10_0_1.xml deleted file mode 100644 index b9e9877..0000000 --- a/.idea/libraries/play_services_tasks_10_0_1.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/recyclerview_v7_24_2_0.xml b/.idea/libraries/recyclerview_v7_24_2_0.xml deleted file mode 100644 index 7685fa4..0000000 --- a/.idea/libraries/recyclerview_v7_24_2_0.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_annotations_24_2_0.xml b/.idea/libraries/support_annotations_24_2_0.xml deleted file mode 100644 index b01b9db..0000000 --- a/.idea/libraries/support_annotations_24_2_0.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_compat_24_2_0.xml b/.idea/libraries/support_compat_24_2_0.xml deleted file mode 100644 index 47523fc..0000000 --- a/.idea/libraries/support_compat_24_2_0.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_core_ui_24_2_0.xml b/.idea/libraries/support_core_ui_24_2_0.xml deleted file mode 100644 index d556aee..0000000 --- a/.idea/libraries/support_core_ui_24_2_0.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_core_utils_24_2_0.xml b/.idea/libraries/support_core_utils_24_2_0.xml deleted file mode 100644 index d25d4e2..0000000 --- a/.idea/libraries/support_core_utils_24_2_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_fragment_24_2_0.xml b/.idea/libraries/support_fragment_24_2_0.xml deleted file mode 100644 index 0454e30..0000000 --- a/.idea/libraries/support_fragment_24_2_0.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_media_compat_24_2_0.xml b/.idea/libraries/support_media_compat_24_2_0.xml deleted file mode 100644 index a384736..0000000 --- a/.idea/libraries/support_media_compat_24_2_0.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_v4_24_2_0.xml b/.idea/libraries/support_v4_24_2_0.xml deleted file mode 100644 index c8f65e5..0000000 --- a/.idea/libraries/support_v4_24_2_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_vector_drawable_24_2_0.xml b/.idea/libraries/support_vector_drawable_24_2_0.xml deleted file mode 100644 index f11f5ef..0000000 --- a/.idea/libraries/support_vector_drawable_24_2_0.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/volley_1_0_0.xml b/.idea/libraries/volley_1_0_0.xml deleted file mode 100644 index 319ac37..0000000 --- a/.idea/libraries/volley_1_0_0.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 211abac..8740b82 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/java/ru/aacidov/distalkpro/TTS.java b/app/src/main/java/ru/aacidov/distalkpro/TTS.java index 87542d6..c5cd6f4 100755 --- a/app/src/main/java/ru/aacidov/distalkpro/TTS.java +++ b/app/src/main/java/ru/aacidov/distalkpro/TTS.java @@ -16,7 +16,9 @@ public TTS() { tts = new TextToSpeech(MainActivity.context, new TextToSpeech.OnInitListener() { @Override public void onInit(int i) { - tts.setLanguage(Locale.getDefault()); + if(i == TextToSpeech.SUCCESS) { + tts.setLanguage(Locale.getDefault()); + } } }); diff --git a/build.gradle b/build.gradle index 363efae..17e953a 100755 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' classpath 'com.yandex.android:mobmetricalib:2.51' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 297777f..fe07b48 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 18 22:13:25 MSK 2017 +#Tue Dec 19 14:46:08 MSK 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip From 6a88a0e5ce76119ba472e518c4a3e817fdd009da Mon Sep 17 00:00:00 2001 From: Oleksandr Yeropudov Date: Tue, 19 Dec 2017 16:19:35 +0300 Subject: [PATCH 2/3] fix call methods on null don't init TTS on v23 (tbd) --- .../java/ru/aacidov/distalkpro/GridViewController.java | 3 ++- app/src/main/java/ru/aacidov/distalkpro/TTS.java | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/ru/aacidov/distalkpro/GridViewController.java b/app/src/main/java/ru/aacidov/distalkpro/GridViewController.java index 5adf7c8..a34eff5 100755 --- a/app/src/main/java/ru/aacidov/distalkpro/GridViewController.java +++ b/app/src/main/java/ru/aacidov/distalkpro/GridViewController.java @@ -34,8 +34,9 @@ public class GridViewController implements AdapterView.OnItemLongClickListener, public GridViewController() { mfs = FileStorage.getInstance(); - tts = TTS.getInstance(); + cxt = MainActivity.context; + tts = TTS.getInstance(); gv=(GridView) ((Activity)cxt).findViewById(R.id.gridView); load(); gv.setOnItemClickListener(this); diff --git a/app/src/main/java/ru/aacidov/distalkpro/TTS.java b/app/src/main/java/ru/aacidov/distalkpro/TTS.java index c5cd6f4..114376c 100755 --- a/app/src/main/java/ru/aacidov/distalkpro/TTS.java +++ b/app/src/main/java/ru/aacidov/distalkpro/TTS.java @@ -2,6 +2,7 @@ import android.content.Context; import android.speech.tts.TextToSpeech; +import android.widget.Toast; import java.util.Locale; @@ -19,9 +20,13 @@ public void onInit(int i) { if(i == TextToSpeech.SUCCESS) { tts.setLanguage(Locale.getDefault()); } + else if (i == TextToSpeech.LANG_MISSING_DATA || + i == TextToSpeech.LANG_NOT_SUPPORTED) { + Toast.makeText(MainActivity.context, "Error initializing text to speech!", Toast.LENGTH_LONG).show(); + return; + } } }); - } public static TTS getInstance() { From 542f90b7ca3518f109b06f44471196d8376461e5 Mon Sep 17 00:00:00 2001 From: Oleksandr Yeropudov Date: Tue, 19 Dec 2017 16:20:27 +0300 Subject: [PATCH 3/3] fix call methods on null don't init TTS on v23 (tbd) --- .../main/java/ru/aacidov/distalkpro/GridViewController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/ru/aacidov/distalkpro/GridViewController.java b/app/src/main/java/ru/aacidov/distalkpro/GridViewController.java index a34eff5..5adf7c8 100755 --- a/app/src/main/java/ru/aacidov/distalkpro/GridViewController.java +++ b/app/src/main/java/ru/aacidov/distalkpro/GridViewController.java @@ -34,9 +34,8 @@ public class GridViewController implements AdapterView.OnItemLongClickListener, public GridViewController() { mfs = FileStorage.getInstance(); - - cxt = MainActivity.context; tts = TTS.getInstance(); + cxt = MainActivity.context; gv=(GridView) ((Activity)cxt).findViewById(R.id.gridView); load(); gv.setOnItemClickListener(this);