diff --git a/res/drawable/kiwix_icon__with_title.png b/res/drawable/kiwix_icon__with_title.png
deleted file mode 100644
index 5a862da26..000000000
Binary files a/res/drawable/kiwix_icon__with_title.png and /dev/null differ
diff --git a/res/drawable/kiwix_icon_with_title.png b/res/drawable/kiwix_icon_with_title.png
new file mode 100644
index 000000000..72a17064b
Binary files /dev/null and b/res/drawable/kiwix_icon_with_title.png differ
diff --git a/res/drawable/launch_screen.xml b/res/drawable/launch_screen.xml
index 2a216ba3d..8d8181059 100644
--- a/res/drawable/launch_screen.xml
+++ b/res/drawable/launch_screen.xml
@@ -4,7 +4,7 @@
-
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 56c96cb2a..cbf11d19f 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -75,7 +75,7 @@
android:textColor="@android:color/black"
android:textStyle="bold"
android:text="stop"
- android:visibility="invisible"/>
+ android:visibility="gone"/>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e66218295..f04c2f533 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -62,7 +62,7 @@
Are you sure you want to delete your search history?
Are you sure you want to delete your search history and reset all active tabs?
Delete this item?
- Clear History
+ Clear history
Clear recent searches and tabs history
All History Cleared
Clear All History
diff --git a/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java b/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java
index 19c56e44c..c7107d32d 100644
--- a/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java
+++ b/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java
@@ -322,8 +322,8 @@ public class KiwixMobileActivity extends AppCompatActivity {
@Override
public void onClick(View view) {
readAloud();
- stopTTSButton.setVisibility(View.INVISIBLE);
- mIsBacktotopEnabled = true;
+ stopTTSButton.setVisibility(View.GONE);
+
}
});
@@ -608,7 +608,7 @@ public class KiwixMobileActivity extends AppCompatActivity {
public void run() {
menu.findItem(R.id.menu_read_aloud)
.setTitle(getResources().getString(R.string.menu_read_aloud));
- stopTTSButton.setVisibility(View.INVISIBLE);
+ stopTTSButton.setVisibility(View.GONE);
}
});
}
@@ -829,12 +829,18 @@ public class KiwixMobileActivity extends AppCompatActivity {
break;
case R.id.menu_read_aloud:
- readAloud();
- stopTTSButton.setVisibility(View.VISIBLE);
- if(mIsBacktotopEnabled) {
- mBackToTopButton.setVisibility(View.INVISIBLE);
- mIsBacktotopEnabled = false;
+ if(stopTTSButton.getVisibility() == View.GONE) {
+ if(mIsBacktotopEnabled) {
+ mBackToTopButton.setVisibility(View.INVISIBLE);
+ }
+ } else if (stopTTSButton.getVisibility() == View.VISIBLE){
+ if(mIsBacktotopEnabled) {
+ mBackToTopButton.setVisibility(View.VISIBLE);
+ }
}
+ readAloud();
+
+
break;
case R.id.menu_fullscreen:
@@ -1270,7 +1276,7 @@ public class KiwixMobileActivity extends AppCompatActivity {
public void onPageChanged(int page, int maxPages) {
if (mIsBacktotopEnabled) {
if (getCurrentWebView().getScrollY() > 200) {
- if (mBackToTopButton.getVisibility() == View.INVISIBLE) {
+ if (mBackToTopButton.getVisibility() == View.INVISIBLE && stopTTSButton.getVisibility() == View.GONE ) {
mBackToTopButton.setText(R.string.button_backtotop);
mBackToTopButton.setVisibility(View.VISIBLE);
@@ -1279,7 +1285,7 @@ public class KiwixMobileActivity extends AppCompatActivity {
mBackToTopButton.setVisibility(View.INVISIBLE);
Animation fadeAnimation =
AnimationUtils.loadAnimation(KiwixMobileActivity.this, android.R.anim.fade_out);
- fadeAnimation.setStartOffset(1500);
+ fadeAnimation.setStartOffset(1200);
mBackToTopButton.startAnimation(fadeAnimation);
}
} else {