eUgEntOptIc44/LibreraReader
1
0
Fork 0
mirror of https://github.com/foobnix/LibreraReader.git synced 2025-10-06 00:02:43 +02:00
Code Issues Releases Activity

Support android 35,36 with edge to edge

Browse Source
This commit is contained in:
Ivan Ivanenko
2025-07-07 17:15:35 +03:00
parent a0458a2421
commit 5d6d65852a
15 changed files with 737 additions and 644 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Builder/jni/libmupdf-librera.c
View File

@@ -502,7 +502,7 @@ JNICALL Java_org_ebookdroid_droids_mupdf_codec_MuPdfDocument_getPageCount(JNIEn
fontSize = size;
DEBUG("fontSize set %d", fontSize);
fz_layout_document(doc->ctx, doc->document, width, height, size);
fz_layout_document(doc->ctx, doc->document, width, height, ssizeize);
int count = fz_count_pages(doc->ctx, doc->document);
fz_save_accelerator(doc->ctx, doc->document, doc->accel);

10
Builder/link_to_mupdf_1.23.7.sh
View File

@@ -107,15 +107,21 @@ cp -rpv $SRC/context.h $MUPDF_ROOT/include/mupdf/fitz/context.h
cd $MUPDF_JAVA
NDK_VERSION="27.2.12479018"
NDK_VERSION="28.0.12674087"
FDRIOD_NDK_VERSION="21.4.7075529"
if [ "$(uname)" == "Darwin" ]; then
FDRIOD_NDK_VERSION=$NDK_VERSION
fi
PATH1=/Volumes/SSD-USB/Android/Sdk/ndk
PATH1=/Users/ivanivanenko/Library/Android/sdk/ndk
PATH2=/home/dev/Android/Sdk/ndk
if [ ! -d "$PATH1/$NDK_VERSION" ]; then
echo "-- NDK ERROR --"
echo "$PATH1/$NDK_VERSION NDK NOT FOUND"
echo "----"
fi
if [ "$1" == "clean_ndk" ]; then
if [ "$2" == "fdroid" ]; then
$PATH1/$FDRIOD_NDK_VERSION/ndk-build clean

2
README.md
View File

@@ -12,7 +12,7 @@ Librera Reader is an e-book reader for Android devices;
it supports the following formats: PDF, EPUB, EPUB3, MOBI, DjVu, FB2, TXT, RTF, AZW, AZW3, HTML, CBZ, CBR, DOC, DOCX,
and OPDS Catalogs
### Download application
# Download application
[Librera Reader on Google Play](https://play.google.com/store/apps/details?id=com.foobnix.pdf.reader)

7
app/src/main/java/com/foobnix/pdf/info/TintUtil.java
View File

@@ -307,12 +307,7 @@ public class TintUtil {
@SuppressLint("NewApi")
public static void setStatusBarColor(Activity activity, int color) {
if (Build.VERSION.SDK_INT >= 21) {
Window window = activity.getWindow();
window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
window.setStatusBarColor(MagicHelper.darkerColor(color));
}
}
public static void grayScaleImageView(ImageView v) {

53
app/src/main/java/com/foobnix/pdf/info/wrapper/DocumentController.java
View File

@@ -4,7 +4,6 @@ import android.app.Activity;
import android.app.AlertDialog;
import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.graphics.PointF;
@@ -18,9 +17,12 @@ import android.view.ViewGroup;
import android.view.WindowManager;
import android.widget.FrameLayout;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
import androidx.core.graphics.Insets;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
import com.foobnix.android.utils.Apps;
import com.foobnix.android.utils.Dips;
import com.foobnix.android.utils.IntegerResponse;
@@ -206,6 +208,7 @@ public abstract class DocumentController {
public static void setNavBarTintColor(Activity a) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
a.getWindow().setNavigationBarColor(TintUtil.color);
a.getWindow().setStatusBarColor(TintUtil.color);
}
}
@@ -300,8 +303,13 @@ public abstract class DocumentController {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && a.getWindow().getDecorView().getRootWindowInsets().getDisplayCutout() != null) {
List<Integer> ids = Arrays.asList(AppState.FULL_SCREEN_FULLSCREEN_CUTOUT, AppState.FULL_SCREEN_FULLSCREEN, AppState.FULL_SCREEN_NORMAL);
MyPopupMenu popup = new MyPopupMenu(a, v);
for (int id : ids)
for (int id : ids) {
if (Build.VERSION.SDK_INT >= 35 && id == AppState.FULL_SCREEN_FULLSCREEN_CUTOUT) {
continue;
}
if (id == AppState.FULL_SCREEN_FULLSCREEN_CUTOUT && Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
LOG.d("getDisplayCutout", a.getWindow().getDecorView().getRootWindowInsets().getDisplayCutout());
@@ -318,13 +326,15 @@ public abstract class DocumentController {
});
}
popup.show();
popup.show();
}
} else {
if (currentMode == AppState.FULL_SCREEN_NORMAL) {
response.onResultRecive(AppState.FULL_SCREEN_FULLSCREEN);
} else {
response.onResultRecive(AppState.FULL_SCREEN_NORMAL);
}
}
}
@@ -336,6 +346,38 @@ public abstract class DocumentController {
}
}
public static void applyEdgeToEdge(final Activity a) {
if (Build.VERSION.SDK_INT >= 35) {
View parentParent = a.findViewById(R.id.parentParent);
View statusBarHack = a.findViewById(R.id.systemBarHack);
if (parentParent != null) {
ViewCompat.setOnApplyWindowInsetsListener(parentParent, (v, windowInsets) -> {
Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
ViewGroup.MarginLayoutParams mlp = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
mlp.leftMargin = insets.left;
mlp.bottomMargin = insets.bottom;
mlp.rightMargin = insets.right;
v.setLayoutParams(mlp);
if (statusBarHack != null) {
ViewGroup.LayoutParams statusBarHackLayoutParams = statusBarHack.getLayoutParams();
statusBarHackLayoutParams.height = insets.top;
statusBarHack.setLayoutParams(statusBarHackLayoutParams);
statusBarHack.setBackgroundColor(TintUtil.color);
}
return WindowInsetsCompat.CONSUMED;
});
}
}
}
public static void doRotation(final Activity a) {
try {
// LOG.d("isSystemAutoRotation isSystemAutoRotation",
@@ -584,6 +626,7 @@ public abstract class DocumentController {
public List<OutlineLinkWrapper> getCurrentOutline() {
return outline;
}
public Boolean isEpub3;
public String getCurrentChapter() {
@@ -743,7 +786,7 @@ public abstract class DocumentController {
}
public void showAnnotation(Annotation annotation) {
Dialogs.showTextDialog(activity,annotation.text);
Dialogs.showTextDialog(activity, annotation.text);
//Toast.makeText(activity, "" + annotation.text, Toast.LENGTH_SHORT).show();
}

2
app/src/main/java/com/foobnix/pdf/search/activity/HorizontalViewActivity.java
View File

@@ -110,7 +110,6 @@ import com.foobnix.ui2.MyContextWrapper;
import org.ebookdroid.common.settings.SettingsManager;
import org.ebookdroid.common.settings.books.SharedBooks;
import org.ebookdroid.droids.mupdf.codec.MuPdfDocument;
import org.ebookdroid.droids.mupdf.codec.exceptions.MuPdfPasswordException;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
@@ -291,6 +290,7 @@ public class HorizontalViewActivity extends AdsFragmentActivity {
PageImageState.get().cleanSelectedWords();
setContentView(R.layout.activity_horiziontal_view);
DocumentController.applyEdgeToEdge(this);
if (!Android6.canWrite(this)) {
Android6.checkPermissions(this, true);

5
app/src/main/java/com/foobnix/ui2/MainTabs2.java
View File

@@ -13,7 +13,6 @@ import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.view.KeyEvent;
import android.view.View;
import android.view.View.OnClickListener;
@@ -110,6 +109,7 @@ public class MainTabs2 extends AdsFragmentActivity {
Handler handler;
MyProgressBar fab;
SwipeRefreshLayout swipeRefreshLayout;
boolean isMyKey = false;
OnPageChangeListener onPageChangeListener = new OnPageChangeListener() {
UIFragment uiFragment = null;
@@ -328,7 +328,9 @@ public class MainTabs2 extends AdsFragmentActivity {
DocumentController.doRotation(this);
DocumentController.doContextMenu(this);
setContentView(R.layout.main_tabs);
DocumentController.applyEdgeToEdge(this);
imageMenu = findViewById(R.id.imageMenu1);
imageMenuParent = findViewById(R.id.imageParent1);
@@ -729,6 +731,7 @@ public class MainTabs2 extends AdsFragmentActivity {
DocumentController.chooseFullScreen(this, AppState.get().fullScreenMainMode);
TintUtil.updateAll();
LocalBroadcastManager.getInstance(this).registerReceiver(broadcastReceiver, new IntentFilter(UIFragment.INTENT_TINT_CHANGE));
if (swipeRefreshLayout != null) {
swipeRefreshLayout.setEnabled(isPullToRefreshEnable());

9
app/src/main/java/com/foobnix/ui2/fragment/PrefFragment2.java
View File

@@ -119,7 +119,7 @@ public class PrefFragment2 extends UIFragment {
private static final String WWW_SITE = "https://librera.mobi";
private static final String WWW_BETA_SITE = "http://beta.librera.mobi";
private static final String WWW_WIKI_SITE = "https://librera.mobi/faq";
View section1, section2, section3, section4, section5, section6, section7, section8, section9, overlay;
View section1, section2, section3, section4, section5, section6, section7, section8, section9, overlay, statusBarHack;
TextView singIn, syncInfo, syncInfo2, syncHeader;
CheckBox isEnableSync;
private TextView curBrightness, themeColor, profileLetter;
@@ -185,6 +185,9 @@ public class PrefFragment2 extends UIFragment {
TintUtil.setBackgroundFillColor(section7, TintUtil.color);
TintUtil.setBackgroundFillColor(section8, TintUtil.color);
TintUtil.setBackgroundFillColor(section9, TintUtil.color);
if (statusBarHack != null) {
statusBarHack.setBackgroundColor(TintUtil.color);
}
if (profileLetter != null && getActivity() != null) {
final String p = AppProfile.getCurrent(getActivity());
@@ -1678,7 +1681,7 @@ public class PrefFragment2 extends UIFragment {
TempHolder.listHash++;
});
CheckBox isAlwaysOpenOnPage1 = inflate.findViewById(R.id.isAlwaysOpenOnPage1);
CheckBox isAlwaysOpenOnPage1 = inflate.findViewById(R.id.isAlwaysOpenOnPage1);
isAlwaysOpenOnPage1.setChecked(AppState.get().isAlwaysOpenOnPage1);
isAlwaysOpenOnPage1.setOnCheckedChangeListener((buttonView, isChecked) -> {
AppState.get().isAlwaysOpenOnPage1 = isChecked;
@@ -2598,6 +2601,8 @@ public class PrefFragment2 extends UIFragment {
}
});
statusBarHack = getActivity().findViewById(R.id.systemBarHack);
overlay =
getActivity().

1
app/src/main/java/org/ebookdroid/ui/viewer/VerticalViewActivity.java
View File

@@ -137,6 +137,7 @@ public class VerticalViewActivity extends AbstractActionActivity<VerticalViewAct
return;
}
setContentView(R.layout.activity_vertical_view);
DocumentController.applyEdgeToEdge(this);
if (!Android6.canWrite(this)) {
Android6.checkPermissions(this, true);

794
app/src/main/res/layout/activity_horiziontal_view.xml
View File

@@ -1,417 +1,429 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/parentParent"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusable="true"
android:focusableInTouchMode="true"
android:orientation="vertical">
<com.foobnix.pdf.search.view.VerticalViewPager
android:id="@+id/pager2"
<View
android:id="@+id/systemBarHack"
android:layout_width="match_parent"
android:layout_height="0dp" />
<RelativeLayout
android:id="@+id/parentParent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="false" />
<LinearLayout
android:id="@+id/musicButtonPanel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:orientation="horizontal"
android:padding="2dip">
<HorizontalScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1">
<LinearLayout
android:id="@+id/pageshelper"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"></LinearLayout>
</HorizontalScrollView>
<ImageView
android:id="@+id/pagesBookmark"
android:layout_width="40dip"
android:layout_height="40dip"
android:layout_marginLeft="4dip"
android:layout_weight="0"
android:background="@drawable/bg_border_ltgray_dash2"
android:src="@drawable/glyphicons_73_bookmark"
android:tint="@color/lt_grey_dima" />
</LinearLayout>
<TextView
android:id="@+id/floatingBookmark"
android:layout_width="wrap_content"
android:layout_height="@dimen/wh_button"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginRight="4dip"
android:layout_marginBottom="20dip"
android:background="@drawable/bg_border_ltgray_dash2"
android:gravity="center"
android:paddingLeft="10dip"
android:paddingRight="10dip"
android:singleLine="true"
android:text="718"
android:textSize="16sp"
android:textStyle="bold" />
<FrameLayout
android:id="@+id/adFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_gravity="center_horizontal"
android:layout_marginTop="160dip"
android:layout_weight="0"></FrameLayout>
<TextView
android:id="@+id/pannelBookTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dip"
android:singleLine="true"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:text="--:--"
android:textColor="@color/tint_gray"
android:textSize="9sp" />
<LinearLayout
android:id="@+id/bottomPanel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:orientation="vertical">
<LinearLayout
android:id="@+id/bottomIndicators"
<com.foobnix.pdf.search.view.VerticalViewPager
android:id="@+id/pager2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="-1dip"
android:clickable="true"
android:orientation="horizontal">
<TextView
android:id="@+id/pagesTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dip"
android:layout_weight="1"
android:minWidth="50dip"
android:singleLine="true"
android:text="--:--"
android:textColor="@color/tint_gray"
android:textSize="9sp" />
<TextView
android:id="@+id/pagesCountIndicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@+id/progressDraw"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_weight="1"
android:ellipsize="start"
android:gravity="center"
android:singleLine="true"
android:text="-/-"
android:textColor="@color/tint_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/flippingIntervalView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginLeft="10dip"
android:layout_toRightOf="@+id/pagesCountIndicator"
android:minEms="3"
android:singleLine="true"
android:text="{10}"
android:textColor="@color/tint_gray"
android:textSize="12sp"
android:visibility="gone" />
<TextView
android:id="@+id/pagesPower"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="15dip"
android:layout_weight="1"
android:drawablePadding="0dip"
android:gravity="right"
android:minWidth="50dip"
android:singleLine="true"
android:text="--%"
android:textColor="@color/tint_gray"
android:textSize="9sp" />
</LinearLayout>
<com.foobnix.pdf.info.view.ProgressDraw
android:id="@+id/progressDraw"
android:layout_marginLeft="15dip"
android:layout_marginRight="15dip"
android:layout_width="match_parent"
android:layout_height="@dimen/progress" />
</LinearLayout>
<LinearLayout
android:id="@+id/actionBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#96aa39"
android:clickable="true"
android:gravity="center"
android:orientation="vertical"
android:visibility="visible">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:gravity="center"
android:orientation="horizontal">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="50dip"
android:layout_marginRight="50dip"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:singleLine="true"
android:text="@string/msg_loading"
android:textColor="#ffffff"
android:textSize="16sp"
android:textStyle="normal"></TextView>
<TextView
android:id="@+id/chapter"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:singleLine="true"
android:text="@string/msg_loading"
android:textColor="#ffffff"
android:textSize="12sp"
android:visibility="gone"></TextView>
</LinearLayout>
<TextView
android:id="@+id/pagesTime1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="20dip"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_marginTop="2dip"
android:layout_weight="1"
android:minWidth="50dip"
android:singleLine="true"
android:text="--:--"
android:textColor="@color/white"
android:textSize="9sp" />
<ImageView
android:id="@+id/bookClose"
style="@style/buttonWhiteClose"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginTop="10dip"
android:layout_marginRight="10dip"
android:layout_weight="0"
android:contentDescription="@string/close_book"
android:src="@drawable/glyphicons_599_menu_close" />
</RelativeLayout>
android:layout_height="match_parent"
android:layout_centerInParent="false" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="?android:attr/actionBarSize"
android:gravity="center"
android:id="@+id/musicButtonPanel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:orientation="horizontal"
android:padding="2dip">
<ImageView
android:id="@+id/moveCenter"
style="@style/buttonWhite"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:layout_weight="0"
android:contentDescription="align document"
android:src="@drawable/glyphicons_112_paragraph_center" />
<HorizontalScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1">
<LinearLayout
android:id="@+id/pageshelper"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"></LinearLayout>
</HorizontalScrollView>
<ImageView
android:id="@+id/onMove"
style="@style/buttonWhite"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:id="@+id/pagesBookmark"
android:layout_width="40dip"
android:layout_height="40dip"
android:layout_marginLeft="4dip"
android:layout_weight="0"
android:contentDescription="@string/move"
android:src="@drawable/glyphicons_809_drop_plus"
android:visibility="visible" />
<com.foobnix.pdf.info.view.UnderlineImageView
android:id="@+id/onBC"
style="@style/buttonWhite"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:layout_weight="0"
android:contentDescription="@string/contrast"
android:src="@drawable/glyphicons_92_contrast"
android:visibility="visible" />
<com.foobnix.pdf.info.view.UnderlineImageView
android:id="@+id/onCrop"
style="@style/buttonWhite"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:layout_weight="0"
android:contentDescription="@string/crop_white_borders"
android:src="@drawable/glyphicons_94_crop"
android:visibility="visible" />
<ImageView
android:id="@+id/bookNight"
style="@style/buttonWhite"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:layout_weight="0"
android:contentDescription="@string/brightness"
android:src="@drawable/glyphicons_232_sun" />
<ImageView
android:id="@+id/onFullScreen"
style="@style/buttonWhite"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:layout_weight="0"
android:contentDescription="@string/full_screen"
android:src="@drawable/glyphicons_216_fullscreen" />
<ImageView
android:id="@+id/onTextReplacement"
style="@style/buttonWhite"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:layout_weight="0"
android:contentDescription="@string/full_screen"
android:src="@drawable/my_glyphicons_pen" />
<ImageView
android:id="@+id/bookPref"
style="@style/buttonWhite"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:layout_weight="0"
android:contentDescription="@string/preferences"
android:src="@drawable/glyphicons_137_cogwheel" />
android:background="@drawable/bg_border_ltgray_dash2"
android:src="@drawable/glyphicons_73_bookmark"
android:tint="@color/lt_grey_dima" />
</LinearLayout>
<include
android:id="@+id/showHypenLangPanel"
layout="@layout/layout_hypen_panel"
<TextView
android:id="@+id/floatingBookmark"
android:layout_width="wrap_content"
android:layout_height="@dimen/wh_button"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginRight="4dip"
android:layout_marginBottom="20dip"
android:background="@drawable/bg_border_ltgray_dash2"
android:gravity="center"
android:paddingLeft="10dip"
android:paddingRight="10dip"
android:singleLine="true"
android:text="718"
android:textSize="16sp"
android:textStyle="bold" />
<FrameLayout
android:id="@+id/adFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_gravity="center_horizontal"
android:layout_marginTop="160dip"
android:layout_weight="0"></FrameLayout>
<TextView
android:id="@+id/pannelBookTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginLeft="10dip"
android:singleLine="true"
android:text="--:--"
android:textColor="@color/tint_gray"
android:textSize="9sp" />
<LinearLayout
android:id="@+id/bottomPanel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:orientation="vertical">
<LinearLayout
android:id="@+id/bottomIndicators"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="-1dip"
android:clickable="true"
android:orientation="horizontal">
<TextView
android:id="@+id/pagesTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dip"
android:layout_weight="1"
android:minWidth="50dip"
android:singleLine="true"
android:text="--:--"
android:textColor="@color/tint_gray"
android:textSize="9sp" />
<TextView
android:id="@+id/pagesCountIndicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@+id/progressDraw"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_weight="1"
android:ellipsize="start"
android:gravity="center"
android:singleLine="true"
android:text="-/-"
android:textColor="@color/tint_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/flippingIntervalView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginLeft="10dip"
android:layout_toRightOf="@+id/pagesCountIndicator"
android:minEms="3"
android:singleLine="true"
android:text="{10}"
android:textColor="@color/tint_gray"
android:textSize="12sp"
android:visibility="gone" />
<TextView
android:id="@+id/pagesPower"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="15dip"
android:layout_weight="1"
android:drawablePadding="0dip"
android:gravity="right"
android:minWidth="50dip"
android:singleLine="true"
android:text="--%"
android:textColor="@color/tint_gray"
android:textSize="9sp" />
</LinearLayout>
<com.foobnix.pdf.info.view.ProgressDraw
android:id="@+id/progressDraw"
android:layout_width="match_parent"
android:layout_height="@dimen/progress"
android:layout_marginLeft="15dip"
android:layout_marginRight="15dip" />
</LinearLayout>
<LinearLayout
android:id="@+id/actionBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#96aa39"
android:clickable="true"
android:gravity="center"
android:orientation="vertical"
android:visibility="visible">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:gravity="center"
android:orientation="horizontal">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="50dip"
android:layout_marginRight="50dip"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:singleLine="true"
android:text="@string/msg_loading"
android:textColor="#ffffff"
android:textSize="16sp"
android:textStyle="normal"></TextView>
<TextView
android:id="@+id/chapter"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:singleLine="true"
android:text="@string/msg_loading"
android:textColor="#ffffff"
android:textSize="12sp"
android:visibility="gone"></TextView>
</LinearLayout>
<TextView
android:id="@+id/pagesTime1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_marginLeft="20dip"
android:layout_marginTop="2dip"
android:layout_weight="1"
android:minWidth="50dip"
android:singleLine="true"
android:text="--:--"
android:textColor="@color/white"
android:textSize="9sp" />
<ImageView
android:id="@+id/bookClose"
style="@style/buttonWhiteClose"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginTop="10dip"
android:layout_marginRight="10dip"
android:layout_weight="0"
android:contentDescription="@string/close_book"
android:src="@drawable/glyphicons_599_menu_close" />
</RelativeLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="?android:attr/actionBarSize"
android:gravity="center"
android:orientation="horizontal"
android:padding="2dip">
<ImageView
android:id="@+id/moveCenter"
style="@style/buttonWhite"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:layout_weight="0"
android:contentDescription="align document"
android:src="@drawable/glyphicons_112_paragraph_center" />
<ImageView
android:id="@+id/onMove"
style="@style/buttonWhite"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:layout_weight="0"
android:contentDescription="@string/move"
android:src="@drawable/glyphicons_809_drop_plus"
android:visibility="visible" />
<com.foobnix.pdf.info.view.UnderlineImageView
android:id="@+id/onBC"
style="@style/buttonWhite"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:layout_weight="0"
android:contentDescription="@string/contrast"
android:src="@drawable/glyphicons_92_contrast"
android:visibility="visible" />
<com.foobnix.pdf.info.view.UnderlineImageView
android:id="@+id/onCrop"
style="@style/buttonWhite"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:layout_weight="0"
android:contentDescription="@string/crop_white_borders"
android:src="@drawable/glyphicons_94_crop"
android:visibility="visible" />
<ImageView
android:id="@+id/bookNight"
style="@style/buttonWhite"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:layout_weight="0"
android:contentDescription="@string/brightness"
android:src="@drawable/glyphicons_232_sun" />
<ImageView
android:id="@+id/onFullScreen"
style="@style/buttonWhite"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:layout_weight="0"
android:contentDescription="@string/full_screen"
android:src="@drawable/glyphicons_216_fullscreen" />
<ImageView
android:id="@+id/onTextReplacement"
style="@style/buttonWhite"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:layout_weight="0"
android:contentDescription="@string/full_screen"
android:src="@drawable/my_glyphicons_pen" />
<ImageView
android:id="@+id/bookPref"
style="@style/buttonWhite"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:layout_weight="0"
android:contentDescription="@string/preferences"
android:src="@drawable/glyphicons_137_cogwheel" />
</LinearLayout>
<include
android:id="@+id/showHypenLangPanel"
layout="@layout/layout_hypen_panel"
android:visibility="visible" />
</LinearLayout>
<ImageView
android:id="@+id/ttsActive1"
style="@style/buttonWhite"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:layout_alignParentLeft="true"
android:layout_margin="0dip"
android:background="@drawable/bg_search_second_clickable"
android:contentDescription="read aloudW"
android:padding="7dip"
android:src="@drawable/glyphicons_186_volume_up"
android:tint="@color/white"
android:visibility="gone" />
<com.foobnix.tts.TTSControlsView
android:id="@+id/ttsActive"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/bottomBar"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="15dip" />
<FrameLayout
android:id="@+id/bottomBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="#96aa39">
<include layout="@layout/document_footer" />
</FrameLayout>
<FrameLayout
android:id="@+id/overlay"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone" />
<TextView
android:id="@+id/toastBrightnessText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:background="@drawable/bg_my_toast"
android:drawableLeft="@drawable/glyphicons_232_sun"
android:drawablePadding="10dip"
android:drawableTint="@color/white"
android:padding="12dip"
android:text="@string/brightness"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold"
android:visibility="visible" />
</LinearLayout>
<ImageView
android:id="@+id/anchorX"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:layout_marginTop="100dip"
android:src="@drawable/glyphicons_299_circle_selected"
android:tint="@color/tint_blue" />
<ImageView
android:id="@+id/ttsActive1"
style="@style/buttonWhite"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:layout_alignParentLeft="true"
android:layout_margin="0dip"
android:background="@drawable/bg_search_second_clickable"
android:contentDescription="read aloudW"
android:padding="7dip"
android:src="@drawable/glyphicons_186_volume_up"
android:tint="@color/white"
android:visibility="gone" />
<ImageView
android:id="@+id/anchorY"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:layout_marginTop="150dip"
android:src="@drawable/glyphicons_298_circle_empty"
android:tint="@color/tint_blue" />
<com.foobnix.tts.TTSControlsView
android:id="@+id/ttsActive"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/bottomBar"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="15dip" />
<FrameLayout
android:id="@+id/anchor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="false"
android:minWidth="10dip"
android:minHeight="10dip"
android:visibility="gone" />
<FrameLayout
android:id="@+id/bottomBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="#96aa39">
<include layout="@layout/document_footer" />
</FrameLayout>
<FrameLayout
android:id="@+id/overlay"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone" />
<TextView
android:id="@+id/toastBrightnessText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:background="@drawable/bg_my_toast"
android:drawableLeft="@drawable/glyphicons_232_sun"
android:drawablePadding="10dip"
android:drawableTint="@color/white"
android:padding="12dip"
android:text="@string/brightness"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold"
android:visibility="visible" />
<ImageView
android:id="@+id/anchorX"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:layout_marginTop="100dip"
android:src="@drawable/glyphicons_299_circle_selected"
android:tint="@color/tint_blue" />
<ImageView
android:id="@+id/anchorY"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:layout_marginTop="150dip"
android:src="@drawable/glyphicons_298_circle_empty"
android:tint="@color/tint_blue" />
<FrameLayout
android:id="@+id/anchor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="false"
android:minWidth="10dip"
android:minHeight="10dip"
android:visibility="gone" />
</RelativeLayout>
</RelativeLayout>
</LinearLayout>

468
app/src/main/res/layout/activity_vertical_view.xml
View File

@@ -1,250 +1,262 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/parentParent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusableInTouchMode="true"
android:orientation="vertical">
<FrameLayout
android:id="@+id/documentView"
<View
android:id="@+id/systemBarHack"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="0dp" />
<LinearLayout
android:id="@+id/musicButtonPanel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginTop="30dip"
android:orientation="horizontal"
android:padding="2dip">
<HorizontalScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1">
<LinearLayout
android:id="@+id/pageshelper"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"></LinearLayout>
</HorizontalScrollView>
<ImageView
android:id="@+id/pagesBookmark"
android:layout_width="40dip"
android:layout_height="40dip"
android:layout_marginLeft="4dip"
android:layout_weight="0"
android:background="@drawable/bg_border_ltgray_dash2"
android:src="@drawable/glyphicons_73_bookmark"
android:tint="@color/lt_grey_dima" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginTop="94dip"
android:orientation="horizontal">
<TextView
android:id="@+id/line1"
android:layout_width="match_parent"
android:layout_height="220dip"
android:layout_weight="1"
android:background="@drawable/bg_border_ltgray_dash" />
<View
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dip"
android:layout_marginRight="5dip"
android:layout_weight="3"
android:orientation="vertical"
android:visibility="gone">
<com.foobnix.pdf.search.view.BgClickbaleView
android:id="@+id/lineClose"
android:layout_width="match_parent"
android:layout_height="105dip"
android:layout_weight="0"
app:text="x" />
<com.foobnix.pdf.search.view.BgClickbaleView
android:id="@+id/lineFirst"
android:layout_width="match_parent"
android:layout_height="105dip"
android:layout_marginTop="10dip"
android:layout_weight="0"
app:text="1" />
</LinearLayout>
<TextView
android:id="@+id/line2"
android:layout_width="match_parent"
android:layout_height="220dip"
android:layout_weight="1"
android:background="@drawable/bg_border_ltgray_dash" />
</LinearLayout>
<com.foobnix.pdf.info.view.DrawView
android:id="@+id/drawView"
<RelativeLayout
android:id="@+id/parentParent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone" />
android:focusableInTouchMode="true"
android:orientation="vertical">
<include
android:id="@+id/document_title_bar"
layout="@layout/document_title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:elevation="2dip" />
<ImageView
android:id="@+id/ttsActive1"
style="@style/buttonWhite"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:layout_below="@+id/document_title_bar"
android:layout_alignParentLeft="true"
android:layout_margin="0dip"
android:background="@drawable/bg_search_second_clickable"
android:contentDescription="@string/text_to_speech"
android:padding="7dip"
android:src="@drawable/glyphicons_186_volume_up"
android:tint="@color/white"
android:visibility="gone" />
<include
android:id="@+id/menuLayout"
layout="@layout/document_title_buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/document_title_bar"
android:layout_centerHorizontal="true" />
<TextView
android:id="@+id/floatingBookmark"
android:layout_width="wrap_content"
android:layout_height="@dimen/wh_button"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginRight="4dip"
android:layout_marginBottom="20dip"
android:background="@drawable/bg_border_ltgray_dash2"
android:gravity="center"
android:paddingLeft="10dip"
android:paddingRight="10dip"
android:singleLine="true"
android:text="718"
android:textSize="16sp"
android:textStyle="bold" />
<FrameLayout
android:id="@+id/adFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/menuLayout"
android:layout_centerHorizontal="true"
android:layout_marginTop="24dp" />
<include
android:id="@+id/includeEditPanel"
layout="@layout/edit_panel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/adFrame"
android:layout_margin="10dip"
android:visibility="gone" />
<include
android:id="@+id/seekSpeedLayot"
layout="@layout/document_speed_bar"
android:layout_width="match_parent"
android:layout_height="@dimen/speed_size"
android:layout_above="@+id/bottomBar1" />
<com.foobnix.tts.TTSControlsView
android:id="@+id/ttsActive"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/seekSpeedLayot"
android:layout_centerHorizontal="true"
android:layout_marginTop="15dip" />
<FrameLayout
android:id="@+id/bottomBar1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="#0000ff">
<FrameLayout
android:id="@+id/bottomBar"
android:id="@+id/documentView"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="match_parent" />
<include layout="@layout/document_footer" />
<LinearLayout
android:id="@+id/musicButtonPanel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginTop="30dip"
android:orientation="horizontal"
android:padding="2dip">
<HorizontalScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1">
<LinearLayout
android:id="@+id/pageshelper"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"></LinearLayout>
</HorizontalScrollView>
<ImageView
android:id="@+id/pagesBookmark"
android:layout_width="40dip"
android:layout_height="40dip"
android:layout_marginLeft="4dip"
android:layout_weight="0"
android:background="@drawable/bg_border_ltgray_dash2"
android:src="@drawable/glyphicons_73_bookmark"
android:tint="@color/lt_grey_dima" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginTop="94dip"
android:orientation="horizontal">
<TextView
android:id="@+id/line1"
android:layout_width="match_parent"
android:layout_height="220dip"
android:layout_weight="1"
android:background="@drawable/bg_border_ltgray_dash" />
<View
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dip"
android:layout_marginRight="5dip"
android:layout_weight="3"
android:orientation="vertical"
android:visibility="gone">
<com.foobnix.pdf.search.view.BgClickbaleView
android:id="@+id/lineClose"
android:layout_width="match_parent"
android:layout_height="105dip"
android:layout_weight="0"
app:text="x" />
<com.foobnix.pdf.search.view.BgClickbaleView
android:id="@+id/lineFirst"
android:layout_width="match_parent"
android:layout_height="105dip"
android:layout_marginTop="10dip"
android:layout_weight="0"
app:text="1" />
</LinearLayout>
<TextView
android:id="@+id/line2"
android:layout_width="match_parent"
android:layout_height="220dip"
android:layout_weight="1"
android:background="@drawable/bg_border_ltgray_dash" />
</LinearLayout>
<com.foobnix.pdf.info.view.DrawView
android:id="@+id/drawView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone" />
<include
android:id="@+id/document_title_bar"
layout="@layout/document_title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:elevation="2dip" />
<ImageView
android:id="@+id/ttsActive1"
style="@style/buttonWhite"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:layout_below="@+id/document_title_bar"
android:layout_alignParentLeft="true"
android:layout_margin="0dip"
android:background="@drawable/bg_search_second_clickable"
android:contentDescription="@string/text_to_speech"
android:padding="7dip"
android:src="@drawable/glyphicons_186_volume_up"
android:tint="@color/white"
android:visibility="gone" />
<include
android:id="@+id/menuLayout"
layout="@layout/document_title_buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/document_title_bar"
android:layout_centerHorizontal="true" />
<TextView
android:id="@+id/floatingBookmark"
android:layout_width="wrap_content"
android:layout_height="@dimen/wh_button"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginRight="4dip"
android:layout_marginBottom="20dip"
android:background="@drawable/bg_border_ltgray_dash2"
android:gravity="center"
android:paddingLeft="10dip"
android:paddingRight="10dip"
android:singleLine="true"
android:text="718"
android:textSize="16sp"
android:textStyle="bold" />
<FrameLayout
android:id="@+id/adFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/menuLayout"
android:layout_centerHorizontal="true"
android:layout_marginTop="24dp" />
<include
android:id="@+id/includeEditPanel"
layout="@layout/edit_panel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/adFrame"
android:layout_margin="10dip"
android:visibility="gone" />
<include
android:id="@+id/seekSpeedLayot"
layout="@layout/document_speed_bar"
android:layout_width="match_parent"
android:layout_height="@dimen/speed_size"
android:layout_above="@+id/bottomBar1" />
<com.foobnix.tts.TTSControlsView
android:id="@+id/ttsActive"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/seekSpeedLayot"
android:layout_centerHorizontal="true"
android:layout_marginTop="15dip" />
<FrameLayout
android:id="@+id/bottomBar1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="#0000ff">
<FrameLayout
android:id="@+id/bottomBar"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include layout="@layout/document_footer" />
</FrameLayout>
</FrameLayout>
</FrameLayout>
<FrameLayout
android:id="@+id/overlay"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone" />
<FrameLayout
android:id="@+id/overlay"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone" />
<TextView
android:id="@+id/toastBrightnessText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:background="@drawable/bg_my_toast"
android:drawableLeft="@drawable/glyphicons_232_sun"
android:drawablePadding="10dip"
android:drawableTint="@color/white"
android:padding="12dip"
android:text="@string/brightness"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold"
android:visibility="visible" />
<TextView
android:id="@+id/toastBrightnessText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:background="@drawable/bg_my_toast"
android:drawableLeft="@drawable/glyphicons_232_sun"
android:drawablePadding="10dip"
android:drawableTint="@color/white"
android:padding="12dip"
android:text="@string/brightness"
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold"
android:visibility="visible" />
<ImageView
android:id="@+id/anchorX"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:layout_marginTop="100dip"
android:src="@drawable/glyphicons_299_circle_selected"
android:tint="@color/tint_blue" />
<ImageView
android:id="@+id/anchorX"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:layout_marginTop="100dip"
android:src="@drawable/glyphicons_299_circle_selected"
android:tint="@color/tint_blue" />
<ImageView
android:id="@+id/anchorY"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:layout_marginTop="150dip"
android:src="@drawable/glyphicons_298_circle_empty"
android:tint="@color/tint_blue" />
<ImageView
android:id="@+id/anchorY"
android:layout_width="@dimen/wh_button"
android:layout_height="@dimen/wh_button"
android:layout_marginTop="150dip"
android:src="@drawable/glyphicons_298_circle_empty"
android:tint="@color/tint_blue" />
<FrameLayout
android:id="@+id/anchor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="false"
android:minWidth="10dip"
android:minHeight="10dip"
android:visibility="gone" />
<FrameLayout
android:id="@+id/anchor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="false"
android:minWidth="10dip"
android:minHeight="10dip"
android:visibility="gone" />
</RelativeLayout>
</RelativeLayout>
</LinearLayout>

14
app/src/main/res/layout/fragment_preferences.xml
View File

@@ -794,6 +794,7 @@
android:id="@+id/isRememberMode"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="1"
android:layout_weight="1"
android:text="@string/remember_reading_mode" />
@@ -829,6 +830,7 @@
<CheckBox
android:id="@+id/isAppPassword"
android:maxLines="1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
@@ -846,24 +848,28 @@
</LinearLayout>
<CheckBox
android:maxLines="1"
android:id="@+id/isOpenLastBook"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/opening_the_last_book_when_the_application_starts" />
<CheckBox
android:maxLines="1"
android:id="@+id/isAlwaysOpenOnPage1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/open_books_on_page_1" />
<CheckBox
android:maxLines="1"
android:id="@+id/isRestoreSearchQuery"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/restore_search_query_when_the_application_starts" />
<CheckBox
android:maxLines="1"
android:id="@+id/isShowCloseAppDialog"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -877,6 +883,7 @@
android:visibility="gone">
<CheckBox
android:maxLines="1"
android:id="@+id/isRememberDictionary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -893,6 +900,7 @@
</LinearLayout>
<CheckBox
android:maxLines="1"
android:id="@+id/isLoopAutoplay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -901,24 +909,25 @@
android:visibility="gone" />
<CheckBox
android:maxLines="1"
android:id="@+id/isDisplayAllFilesInFolder"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:maxLines="2"
android:text="@string/display_all_file_types_in_folders" />
<CheckBox
android:maxLines="1"
android:id="@+id/isShowWhatIsNewDialog"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:maxLines="2"
android:text="@string/show_the_dialog_what_is_new_for_updates" />
<CheckBox
android:maxLines="1"
android:id="@+id/isEnableAccessibility"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -927,6 +936,7 @@
android:text="@string/accessibility_mode" />
<CheckBox
android:maxLines="1"
android:id="@+id/isMenuIntegration"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

5
app/src/main/res/layout/main_tabs.xml
View File

@@ -6,6 +6,11 @@
android:layout_height="match_parent"
android:orientation="vertical">
<View
android:id="@+id/systemBarHack"
android:layout_width="match_parent"
android:layout_height="0dp"/>
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipeRefreshLayout"
android:layout_width="match_parent"

3
app/src/main/res/values-v29/styles.xml
View File

@@ -5,13 +5,14 @@
<item name="android:windowNoTitle">true</item>
<item name="android:windowDisablePreview">true</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowOptOutEdgeToEdgeEnforcement">false</item>
</style>
<style name="StyledIndicatorsBlack" parent="Theme.AppCompat.NoActionBar">
<item name="android:windowNoTitle">true</item>
<item name="android:windowDisablePreview">true</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowOptOutEdgeToEdgeEnforcement">false</item>
</style>
</resources>

6
build.gradle
View File

@@ -9,7 +9,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.7.1'
classpath 'com.android.tools.build:gradle:8.7.3'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20'
}
}
@@ -22,9 +22,9 @@ allprojects {
}
}
project.ext {
targetSdk = 34 //need to fix edge-to-edge in Android 15
targetSdk = 36 //need to fix edge-to-edge in Android 15
minSdk = 21
compileSdk = 35
compileSdk = 36
// compose_ui_version = '1.5.3'
}