kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-08 06:42:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use page title as toc header if h1 is not used

Browse Source 
(cherry picked from commit 4c6bff34cb2ea23a18d6ab0c32ed513046f9c021)
This commit is contained in:
mhutti1 2018-08-24 17:13:02 +05:30 committed by Abdul Wadood
parent 50b2f4a036
commit 9b67de0f0b
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/BasicTest.java
View File

@ -76,7 +76,7 @@ public class BasicTest {
openDrawerWithGravity(R.id.drawer_layout, Gravity.RIGHT); openDrawerWithGravity(R.id.drawer_layout, Gravity.RIGHT);
assertDrawerIsOpenWithGravity(R.id.drawer_layout, Gravity.RIGHT); assertDrawerIsOpenWithGravity(R.id.drawer_layout, Gravity.RIGHT);
assertDisplayed(R.string.no_section_info); assertDisplayed(R.string.menu_help);
closeDrawerWithGravity(R.id.drawer_layout, Gravity.RIGHT); closeDrawerWithGravity(R.id.drawer_layout, Gravity.RIGHT);
assertDrawerIsClosedWithGravity(R.id.drawer_layout, Gravity.RIGHT);*/ assertDrawerIsClosedWithGravity(R.id.drawer_layout, Gravity.RIGHT);*/

2
app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
View File

@ -751,7 +751,7 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
} }
} }
private KiwixWebView getCurrentWebView() { KiwixWebView getCurrentWebView() {
if (webViewList.size() == 0) return newTab(); if (webViewList.size() == 0) return newTab();
if (currentWebViewIndex < webViewList.size()) { if (currentWebViewIndex < webViewList.size()) {
return webViewList.get(currentWebViewIndex); return webViewList.get(currentWebViewIndex);

15
app/src/main/java/org/kiwix/kiwixmobile/main/TableDrawerAdapter.java
View File

@ -20,6 +20,7 @@ package org.kiwix.kiwixmobile.main;
import android.content.Context; import android.content.Context;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.util.TypedValue; import android.util.TypedValue;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -45,7 +46,7 @@ public class TableDrawerAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
private int selectedPosition = 0; private int selectedPosition = 0;
public TableDrawerAdapter() { TableDrawerAdapter() {
sections = new ArrayList<>(); sections = new ArrayList<>();
} }
@ -54,8 +55,9 @@ public class TableDrawerAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
return 1; return 1;
} }
@NonNull
@Override @Override
public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
int resource = R.layout.section_list; int resource = R.layout.section_list;
Context context = parent.getContext(); Context context = parent.getContext();
View v = LayoutInflater.from(context).inflate(resource, parent, false); View v = LayoutInflater.from(context).inflate(resource, parent, false);
@ -72,7 +74,7 @@ public class TableDrawerAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
} }
@Override @Override
public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
ViewHolder vh = (ViewHolder) holder; ViewHolder vh = (ViewHolder) holder;
Context context = holder.itemView.getContext(); Context context = holder.itemView.getContext();
@ -85,6 +87,9 @@ public class TableDrawerAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
vh.title.setText(title); vh.title.setText(title);
} else { } else {
String empty = context.getString(R.string.no_section_info); String empty = context.getString(R.string.no_section_info);
if (context instanceof MainActivity) {
empty = ((MainActivity) context).getCurrentWebView().getTitle();
}
vh.title.setText(empty); vh.title.setText(empty);
} }
vh.itemView.setOnClickListener(v -> { vh.itemView.setOnClickListener(v -> {
@ -152,14 +157,14 @@ public class TableDrawerAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
public static class HeaderViewHolder extends ViewHolder { public static class HeaderViewHolder extends ViewHolder {
public HeaderViewHolder(View v) { HeaderViewHolder(View v) {
super(v); super(v);
} }
} }
public static class SectionViewHolder extends ViewHolder { public static class SectionViewHolder extends ViewHolder {
public SectionViewHolder(View v) { SectionViewHolder(View v) {
super(v); super(v);
} }
} }