Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bottom toolbar hide text on help screen fixed #604

Closed
wants to merge 4 commits into from
Closed

Bottom toolbar hide text on help screen fixed #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f408e81
Bottom toolbar hide text on help screen fixed
jb1998 Mar 8, 2018
50eb799
Bottom toolbar hide text on help screen fixed
jb1998 Mar 8, 2018
e343cce
Minor fix
jb1998 Mar 24, 2018
3bf4122
fixed
jb1998 Mar 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added app/captures/org.kiwix.kiwixmobile_2018.03.28_16.52.li
View file
Open in desktop
Binary file not shown.
22 changes: 22 additions & 0 deletions app/src/main/java/org/kiwix/kiwixmobile/KiwixMobileActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.Color;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
Expand All @@ -48,6 +49,7 @@
import android.support.v7.app.ActionBarDrawerToggle;
import android.support.v7.app.AlertDialog;
import android.support.v7.view.menu.ActionMenuItemView;
import android.support.v7.widget.CardView;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
Expand Down Expand Up @@ -133,6 +135,7 @@
import static org.kiwix.kiwixmobile.utils.Constants.EXTRA_SEARCH;
import static org.kiwix.kiwixmobile.utils.Constants.EXTRA_ZIM_FILE;
import static org.kiwix.kiwixmobile.utils.Constants.EXTRA_ZIM_FILE_2;
import static org.kiwix.kiwixmobile.utils.Constants.PREF_BOTTOM_TOOLBAR;
import static org.kiwix.kiwixmobile.utils.Constants.PREF_KIWIX_MOBILE;
import static org.kiwix.kiwixmobile.utils.Constants.REQUEST_FILE_SEARCH;
import static org.kiwix.kiwixmobile.utils.Constants.REQUEST_FILE_SELECT;
Expand Down Expand Up @@ -1210,9 +1213,28 @@ private void popBookmarkSnackbar(boolean isBookmark) {
}
}

public static int dpToPx(int dp)
{
return (int) (dp * Resources.getSystem().getDisplayMetrics().density);
}
@Override
public void onResume() {
super.onResume();
CardView cardView=(CardView)findViewById(R.id.feedback_card);
if (sharedPreferenceUtil.getPrefBottomToolbar()) {
if(cardView!=null) {
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
params.setMargins(0, 0, 0, dpToPx(56));
cardView.setLayoutParams(params);
}
}else{
if(cardView!=null) {
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
params.setMargins(0, 0, 0, 0);
cardView.setLayoutParams(params);
}
}

invalidateOptionsMenu();
if (wasHideToolbar != isHideToolbar) {
wasHideToolbar = isHideToolbar;
Expand Down
27 changes: 27 additions & 0 deletions app/src/main/java/org/kiwix/kiwixmobile/KiwixWebViewClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,30 @@
package org.kiwix.kiwixmobile;

import android.content.Intent;
import android.content.SharedPreferences;
import android.content.res.Resources;
import android.net.Uri;
import android.preference.PreferenceManager;
import android.support.v7.widget.CardView;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.webkit.MimeTypeMap;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;

import org.kiwix.kiwixmobile.utils.StyleUtils;

import java.util.HashMap;

import static org.kiwix.kiwixmobile.utils.Constants.CONTACT_EMAIL_ADDRESS;
import static org.kiwix.kiwixmobile.utils.Constants.EXTRA_EXTERNAL_LINK;
import static org.kiwix.kiwixmobile.utils.Constants.PREF_BOTTOM_TOOLBAR;

public class KiwixWebViewClient extends WebViewClient {

Expand Down Expand Up @@ -89,6 +97,8 @@ public void onReceivedError(WebView view, int errorCode, String description, Str

@Override
public void onPageFinished(WebView view, String url) {
SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(view.getContext());

if ((url.equals("content://" + BuildConfig.APPLICATION_ID + ".zim.base/null")) && !BuildConfig.IS_CUSTOM_APP) {
callback.showHelpPage();
return;
Expand All @@ -98,14 +108,27 @@ public void onPageFinished(WebView view, String url) {
} else if (!BuildConfig.IS_CUSTOM_APP) {
if (view.findViewById(R.id.get_content_card) == null) {
LayoutInflater inflater = LayoutInflater.from(view.getContext());

help = (LinearLayout) inflater.inflate(R.layout.help, null);

CardView cardView=help.findViewById(R.id.feedback_card);
if (settings.getBoolean(PREF_BOTTOM_TOOLBAR, false)) {
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
params.setMargins(0,0,0,dpToPx(56));
cardView.setLayoutParams(params);
}else{
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
params.setMargins(0,0,0,0);
cardView.setLayoutParams(params);
}
help.findViewById(R.id.get_content_card)
.setOnClickListener(card -> {
help.findViewById(R.id.get_content_card).setEnabled(false);
callback.manageZimFiles(1);
}
);
view.addView(help);

ImageView welcome_image = help.findViewById(R.id.welcome_image);
if (KiwixMobileActivity.nightMode) {
welcome_image.setImageResource(R.drawable.kiwix_welcome_night);
Expand All @@ -119,4 +142,8 @@ public void onPageFinished(WebView view, String url) {
}
callback.webViewUrlFinishedLoading();
}
public static int dpToPx(int dp)
{
return (int) (dp * Resources.getSystem().getDisplayMetrics().density);
}
}
3 changes: 2 additions & 1 deletion app/src/main/res/layout/help.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,8 @@
android:layout_gravity="center"
android:paddingLeft="@dimen/help_cardview_horizontal_padding"
android:paddingRight="@dimen/help_cardview_horizontal_padding"
card_view:cardCornerRadius="@dimen/help_cardview_card_corner_radius"
android:id="@+id/feedback_card"
card_view:cardCornerRadius="@dimen/dimen_small_padding"
card_view:cardElevation="@dimen/help_cardview_card_elevation"
card_view:cardUseCompatPadding="true">

Expand Down