diff --git a/app/build.gradle b/app/build.gradle
index 8ad422cf2..353684d5e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -99,6 +99,7 @@ android {
// Warnings
warning 'InvalidPackage'
+ warning 'StringFormatInvalid'
}
buildTypes {
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/utils/KiwixTextToSpeech.java b/app/src/main/java/org/kiwix/kiwixmobile/utils/KiwixTextToSpeech.java
index 4e8a2ae3b..67b3f9830 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/utils/KiwixTextToSpeech.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/utils/KiwixTextToSpeech.java
@@ -1,7 +1,10 @@
package org.kiwix.kiwixmobile.utils;
+import android.annotation.SuppressLint;
import android.content.Context;
import android.os.Build;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
import android.speech.tts.TextToSpeech;
import android.speech.tts.UtteranceProgressListener;
import android.util.Log;
@@ -78,7 +81,9 @@ public class KiwixTextToSpeech {
currentTTSTask = null;
} else if (tts.isSpeaking()) {
if (tts.stop() == TextToSpeech.SUCCESS) {
- tts.setOnUtteranceProgressListener(null);
+ if (VERSION.SDK_INT >= VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
+ tts.setOnUtteranceProgressListener(null);
+ }
onSpeakingListener.onSpeakingEnded();
}
} else {
@@ -122,7 +127,9 @@ public class KiwixTextToSpeech {
public void stop() {
if (tts.stop() == TextToSpeech.SUCCESS) {
currentTTSTask = null;
- tts.setOnUtteranceProgressListener(null);
+ if (VERSION.SDK_INT >= VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
+ tts.setOnUtteranceProgressListener(null);
+ }
onSpeakingListener.onSpeakingEnded();
}
}
@@ -196,10 +203,13 @@ public class KiwixTextToSpeech {
public void pause() {
paused = true;
currentPiece.decrementAndGet();
- tts.setOnUtteranceProgressListener(null);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
+ tts.setOnUtteranceProgressListener(null);
+ }
tts.stop();
}
+ @SuppressLint("NewApi")
public void start() {
if (!paused)
return;
diff --git a/app/src/main/res/drawable/get_content_ripple_shape.xml b/app/src/main/res/drawable/get_content_ripple_shape.xml
deleted file mode 100644
index d6348d507..000000000
--- a/app/src/main/res/drawable/get_content_ripple_shape.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
new file mode 100644
index 000000000..75021fc70
--- /dev/null
+++ b/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b75df7e02..7a62e194d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -29,7 +29,6 @@
- @color/primary
- true
- @color/white
- - @color/greyed_out_selected