kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-17 03:16:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed issue with backtotop and stoptts buttons

Browse Source
This commit is contained in:
Elad Keyshawn 2016-09-04 02:24:10 +03:00
parent 63cc3e294e
commit 0c55ca1b4b
6 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/drawable/kiwix_icon__with_title.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.8 KiB

BIN
res/drawable/kiwix_icon_with_title.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.5 KiB

2
res/drawable/launch_screen.xml
View File

@ -4,7 +4,7 @@
<item android:drawable="@android:color/white"/> <item android:drawable="@android:color/white"/>
<item> <item>
<bitmap <bitmap
android:src="@drawable/kiwix_icon__with_title" android:src="@drawable/kiwix_icon_with_title"
android:gravity="center" android:gravity="center"
/> />
</item> </item>

2
res/layout/main.xml
View File

@ -75,7 +75,7 @@
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:textStyle="bold" android:textStyle="bold"
android:text="stop" android:text="stop"
android:visibility="invisible"/> android:visibility="gone"/>
</RelativeLayout> </RelativeLayout>

2
res/values/strings.xml
View File

@ -62,7 +62,7 @@
<string name="clear_recent_history_dialog">Are you sure you want to delete your search history?</string> <string name="clear_recent_history_dialog">Are you sure you want to delete your search history?</string>
<string name="clear_recent_and_tabs_history_dialog">Are you sure you want to delete your search history and reset all active tabs?</string> <string name="clear_recent_and_tabs_history_dialog">Are you sure you want to delete your search history and reset all active tabs?</string>
<string name="delete_recent_search_item">Delete this item?</string> <string name="delete_recent_search_item">Delete this item?</string>
<string name="pref_clear_all_history_title">Clear History</string> <string name="pref_clear_all_history_title">Clear history</string>
<string name="pref_clear_all_history_summary">Clear recent searches and tabs history</string> <string name="pref_clear_all_history_summary">Clear recent searches and tabs history</string>
<string name="all_history_cleared_toast">All History Cleared</string> <string name="all_history_cleared_toast">All History Cleared</string>
<string name="clear_all_history_dialog_title">Clear All History</string> <string name="clear_all_history_dialog_title">Clear All History</string>

26
src/org/kiwix/kiwixmobile/KiwixMobileActivity.java
View File

@ -322,8 +322,8 @@ public class KiwixMobileActivity extends AppCompatActivity {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
readAloud(); readAloud();
stopTTSButton.setVisibility(View.INVISIBLE); stopTTSButton.setVisibility(View.GONE);
mIsBacktotopEnabled = true;
} }
}); });
@ -608,7 +608,7 @@ public class KiwixMobileActivity extends AppCompatActivity {
public void run() { public void run() {
menu.findItem(R.id.menu_read_aloud) menu.findItem(R.id.menu_read_aloud)
.setTitle(getResources().getString(R.string.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; break;
case R.id.menu_read_aloud: case R.id.menu_read_aloud:
readAloud(); if(stopTTSButton.getVisibility() == View.GONE) {
stopTTSButton.setVisibility(View.VISIBLE); if(mIsBacktotopEnabled) {
if(mIsBacktotopEnabled) { mBackToTopButton.setVisibility(View.INVISIBLE);
mBackToTopButton.setVisibility(View.INVISIBLE); }
mIsBacktotopEnabled = false; } else if (stopTTSButton.getVisibility() == View.VISIBLE){
if(mIsBacktotopEnabled) {
mBackToTopButton.setVisibility(View.VISIBLE);
}
} }
readAloud();
break; break;
case R.id.menu_fullscreen: case R.id.menu_fullscreen:
@ -1270,7 +1276,7 @@ public class KiwixMobileActivity extends AppCompatActivity {
public void onPageChanged(int page, int maxPages) { public void onPageChanged(int page, int maxPages) {
if (mIsBacktotopEnabled) { if (mIsBacktotopEnabled) {
if (getCurrentWebView().getScrollY() > 200) { 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.setText(R.string.button_backtotop);
mBackToTopButton.setVisibility(View.VISIBLE); mBackToTopButton.setVisibility(View.VISIBLE);
@ -1279,7 +1285,7 @@ public class KiwixMobileActivity extends AppCompatActivity {
mBackToTopButton.setVisibility(View.INVISIBLE); mBackToTopButton.setVisibility(View.INVISIBLE);
Animation fadeAnimation = Animation fadeAnimation =
AnimationUtils.loadAnimation(KiwixMobileActivity.this, android.R.anim.fade_out); AnimationUtils.loadAnimation(KiwixMobileActivity.this, android.R.anim.fade_out);
fadeAnimation.setStartOffset(1500); fadeAnimation.setStartOffset(1200);
mBackToTopButton.startAnimation(fadeAnimation); mBackToTopButton.startAnimation(fadeAnimation);
} }
} else { } else {