sevenhill/Aletheia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Обновление приложения до 2.26
Android CI / verify (push) Canceled after 0s
Details

Browse Source
This commit is contained in:
Курнат Андрей
2026-07-16 18:46:28 +03:00
parent 9c8d67c18f
commit 2f40569031
500 changed files with 7499 additions and 3684 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/activity_reader.xml
+461 -69
View File
@@ -3,36 +3,38 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#1B130F">
android:background="#121715">
<WebView
android:id="@+id/reader_web_view"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
android:contentDescription="@string/a11y_reader_content" />
<FrameLayout
android:id="@+id/menu_overlay"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#73000000"
android:background="#66000000"
android:clickable="true"
android:focusable="true"
android:visibility="gone">
<LinearLayout
android:id="@+id/menu_overlay_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingLeft="16dp"
android:paddingTop="24dp"
android:paddingRight="16dp"
android:paddingBottom="20dp">
android:paddingLeft="12dp"
android:paddingTop="18dp"
android:paddingRight="12dp"
android:paddingBottom="14dp">
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardBackgroundColor="@color/surface_muted"
app:cardCornerRadius="24dp"
app:cardBackgroundColor="@color/surface_color"
app:cardCornerRadius="18dp"
app:strokeWidth="0dp">
<LinearLayout
@@ -40,20 +42,23 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="16dp">
android:padding="10dp">
<com.google.android.material.button.MaterialButton
<ImageButton
android:id="@+id/back_button"
style="@style/Widget.Aletheia.Button.Secondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/action_back" />
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@drawable/bg_card_muted"
android:contentDescription="@string/action_back"
android:padding="12dp"
android:scaleType="center"
android:src="@drawable/ic_reader_back" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_weight="1"
android:orientation="vertical">
@@ -84,12 +89,15 @@
android:textSize="12sp" />
</LinearLayout>
<com.google.android.material.button.MaterialButton
<ImageButton
android:id="@+id/hide_menu_button"
style="@style/Widget.Aletheia.Button.Tonal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/action_hide" />
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@drawable/bg_card_muted"
android:contentDescription="@string/action_hide"
android:padding="12dp"
android:scaleType="center"
android:src="@drawable/ic_reader_close" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
@@ -103,19 +111,30 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardBackgroundColor="@color/surface_color"
app:cardCornerRadius="28dp"
app:cardCornerRadius="26dp"
app:cardElevation="6dp"
app:strokeWidth="0dp">
<androidx.core.widget.NestedScrollView
android:id="@+id/menu_scroll"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxHeight="440dp">
android:clipToPadding="false"
android:fillViewport="false"
android:overScrollMode="never">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="18dp">
android:padding="16dp">
<View
android:layout_width="48dp"
android:layout_height="5dp"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="14dp"
android:background="@drawable/bg_sheet_handle" />
<TextView
android:layout_width="wrap_content"
@@ -125,12 +144,64 @@
android:textColor="@color/ink_color"
android:textSize="20sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="14dp"
android:text="@string/label_reader_quick_actions"
android:textColor="@color/ink_soft_color"
android:textSize="12sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginTop="8dp"
android:orientation="horizontal">
<com.google.android.material.button.MaterialButton
android:id="@+id/quick_chapters_button"
style="@style/Widget.Aletheia.Button.ReaderQuickAction"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="6dp"
android:layout_weight="1"
android:text="@string/action_quick_chapters" />
<com.google.android.material.button.MaterialButton
android:id="@+id/quick_bookmark_button"
style="@style/Widget.Aletheia.Button.ReaderQuickAction"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="6dp"
android:layout_weight="1"
android:text="@string/action_quick_bookmark" />
<com.google.android.material.button.MaterialButton
android:id="@+id/quick_note_button"
style="@style/Widget.Aletheia.Button.ReaderQuickAction"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="6dp"
android:layout_weight="1"
android:text="@string/action_quick_note" />
<com.google.android.material.button.MaterialButton
android:id="@+id/quick_search_button"
style="@style/Widget.Aletheia.Button.ReaderQuickAction"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/action_quick_search" />
</LinearLayout>
<com.google.android.material.button.MaterialButtonToggleGroup
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
app:checkedButton="@id/theme_warm_button"
app:selectionRequired="true"
app:singleSelection="true">
<com.google.android.material.button.MaterialButton
android:id="@+id/theme_warm_button"
style="@style/Widget.Aletheia.Button.Tonal"
@@ -139,10 +210,6 @@
android:layout_weight="1"
android:text="@string/reader_warm_theme" />
<Space
android:layout_width="10dp"
android:layout_height="1dp" />
<com.google.android.material.button.MaterialButton
android:id="@+id/theme_light_button"
style="@style/Widget.Aletheia.Button.Tonal"
@@ -151,10 +218,6 @@
android:layout_weight="1"
android:text="@string/reader_light_theme" />
<Space
android:layout_width="10dp"
android:layout_height="1dp" />
<com.google.android.material.button.MaterialButton
android:id="@+id/theme_dark_button"
style="@style/Widget.Aletheia.Button.Tonal"
@@ -162,12 +225,12 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/reader_dark_theme" />
</LinearLayout>
</com.google.android.material.button.MaterialButtonToggleGroup>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginTop="16dp"
android:text="@string/label_font_size"
android:textColor="@color/ink_soft_color"
android:textSize="12sp" />
@@ -181,9 +244,10 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/decrease_font_button"
style="@style/Widget.Aletheia.Button.Secondary"
android:layout_width="56dp"
style="@style/Widget.Aletheia.Button.ReaderFontStep"
android:layout_width="66dp"
android:layout_height="wrap_content"
android:contentDescription="@string/a11y_decrease_font"
android:text="A-" />
<TextView
@@ -194,14 +258,16 @@
android:layout_marginRight="12dp"
android:layout_weight="1"
android:gravity="center"
android:fontFamily="@font/open_sans_semibold"
android:textColor="@color/ink_color"
android:textSize="14sp" />
android:textSize="16sp" />
<com.google.android.material.button.MaterialButton
android:id="@+id/increase_font_button"
style="@style/Widget.Aletheia.Button.Secondary"
android:layout_width="56dp"
style="@style/Widget.Aletheia.Button.ReaderFontStep"
android:layout_width="66dp"
android:layout_height="wrap_content"
android:contentDescription="@string/a11y_increase_font"
android:text="A+" />
</LinearLayout>
@@ -209,7 +275,7 @@
android:id="@+id/brightness_value_menu_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginTop="16dp"
android:textColor="@color/ink_soft_color"
android:textSize="12sp" />
@@ -217,6 +283,7 @@
android:id="@+id/brightness_slider"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:contentDescription="@string/a11y_reader_brightness"
android:valueFrom="70"
android:valueTo="120"
app:haloColor="@android:color/transparent"
@@ -227,7 +294,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginTop="16dp"
android:text="@string/label_font_family"
android:textColor="@color/ink_soft_color"
android:textSize="12sp" />
@@ -255,11 +322,12 @@
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.card.MaterialCardView
android:id="@+id/chapters_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginTop="16dp"
app:cardBackgroundColor="@color/surface_muted"
app:cardCornerRadius="22dp"
app:cardCornerRadius="16dp"
app:strokeColor="@color/border_color"
app:strokeWidth="1dp">
@@ -273,12 +341,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
android:orientation="vertical">
<LinearLayout
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<TextView
@@ -301,8 +368,9 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/toggle_chapters_button"
style="@style/Widget.Aletheia.Button.Secondary"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/action_show_chapters" />
</LinearLayout>
@@ -325,12 +393,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:orientation="horizontal">
android:orientation="vertical">
<com.google.android.material.textfield.TextInputLayout
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/bg_card"
app:boxBackgroundMode="none">
@@ -347,15 +414,12 @@
android:textColorHint="@color/ink_soft_color" />
</com.google.android.material.textfield.TextInputLayout>
<Space
android:layout_width="10dp"
android:layout_height="1dp" />
<com.google.android.material.button.MaterialButton
android:id="@+id/clear_chapter_search_button"
style="@style/Widget.Aletheia.Button.Tonal"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/action_reset" />
</LinearLayout>
@@ -376,6 +440,267 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:contentDescription="@string/a11y_chapters_list"
android:nestedScrollingEnabled="false" />
</LinearLayout>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView
android:id="@+id/notes_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
app:cardBackgroundColor="@color/surface_muted"
app:cardCornerRadius="16dp"
app:strokeColor="@color/border_color"
app:strokeWidth="1dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="14dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/open_sans_semibold"
android:text="@string/label_notes"
android:textColor="@color/ink_color"
android:textSize="18sp" />
<TextView
android:id="@+id/note_summary_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:textColor="@color/ink_soft_color"
android:textSize="12sp" />
<com.google.android.material.button.MaterialButton
android:id="@+id/add_note_button"
style="@style/Widget.Aletheia.Button.Secondary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/action_add_note" />
<com.google.android.material.button.MaterialButton
android:id="@+id/export_notes_button"
style="@style/Widget.Aletheia.Button.Tonal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/action_export_notes" />
<com.google.android.material.button.MaterialButton
android:id="@+id/toggle_notes_button"
style="@style/Widget.Aletheia.Button.Tonal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/action_show_notes" />
<LinearLayout
android:id="@+id/notes_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:orientation="vertical"
android:visibility="gone">
<TextView
android:id="@+id/note_empty_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_card"
android:padding="12dp"
android:text="@string/reader_no_notes"
android:textColor="@color/ink_soft_color"
android:textSize="12sp"
android:visibility="gone" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/notes_recycler"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:contentDescription="@string/a11y_notes_list"
android:nestedScrollingEnabled="false" />
</LinearLayout>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView
android:id="@+id/book_search_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
app:cardBackgroundColor="@color/surface_muted"
app:cardCornerRadius="16dp"
app:strokeColor="@color/border_color"
app:strokeWidth="1dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="14dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/open_sans_semibold"
android:text="@string/label_book_search"
android:textColor="@color/ink_color"
android:textSize="18sp" />
<TextView
android:id="@+id/book_search_status_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:textColor="@color/ink_soft_color"
android:textSize="12sp" />
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:background="@drawable/bg_card"
app:boxBackgroundMode="none">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/book_search_input"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/reader_search_book_hint"
android:imeOptions="actionSearch"
android:inputType="text"
android:paddingLeft="18dp"
android:paddingTop="16dp"
android:paddingRight="18dp"
android:paddingBottom="16dp"
android:singleLine="true"
android:textColor="@color/ink_color"
android:textColorHint="@color/ink_soft_color" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.button.MaterialButton
android:id="@+id/run_book_search_button"
style="@style/Widget.Aletheia.Button.Secondary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/action_search" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:orientation="horizontal">
<com.google.android.material.button.MaterialButton
android:id="@+id/prev_search_result_button"
style="@style/Widget.Aletheia.Button.Tonal"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:layout_weight="1"
android:text="@string/action_previous_match" />
<com.google.android.material.button.MaterialButton
android:id="@+id/next_search_result_button"
style="@style/Widget.Aletheia.Button.Tonal"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_weight="1"
android:text="@string/action_next_match" />
</LinearLayout>
<com.google.android.material.button.MaterialButton
android:id="@+id/clear_book_search_button"
style="@style/Widget.Aletheia.Button.Tonal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/action_clear_search" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView
android:id="@+id/bookmarks_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
app:cardBackgroundColor="@color/surface_muted"
app:cardCornerRadius="16dp"
app:strokeColor="@color/border_color"
app:strokeWidth="1dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="14dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/open_sans_semibold"
android:text="@string/label_bookmarks"
android:textColor="@color/ink_color"
android:textSize="18sp" />
<TextView
android:id="@+id/bookmark_summary_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:textColor="@color/ink_soft_color"
android:textSize="12sp" />
<com.google.android.material.button.MaterialButton
android:id="@+id/add_bookmark_button"
style="@style/Widget.Aletheia.Button.Secondary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/action_add_bookmark" />
<com.google.android.material.button.MaterialButton
android:id="@+id/toggle_bookmarks_button"
style="@style/Widget.Aletheia.Button.Tonal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/action_show_bookmarks" />
<LinearLayout
android:id="@+id/bookmarks_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:orientation="vertical"
android:visibility="gone">
<TextView
android:id="@+id/bookmark_empty_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_card"
android:padding="12dp"
android:text="@string/reader_no_bookmarks"
android:textColor="@color/ink_soft_color"
android:textSize="12sp"
android:visibility="gone" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/bookmarks_recycler"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:contentDescription="@string/a11y_bookmarks_list"
android:nestedScrollingEnabled="false" />
</LinearLayout>
</LinearLayout>
@@ -386,18 +711,85 @@
</LinearLayout>
</FrameLayout>
<TextView
android:id="@+id/progress_badge_text"
android:layout_width="wrap_content"
<com.google.android.material.card.MaterialCardView
android:id="@+id/reader_hud_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom|center_horizontal"
android:layout_marginBottom="16dp"
android:background="@drawable/bg_chip_dark"
android:paddingLeft="12dp"
android:paddingTop="6dp"
android:paddingRight="12dp"
android:paddingBottom="6dp"
android:textColor="@color/white"
android:textSize="12sp" />
android:layout_gravity="bottom"
android:layout_marginLeft="22dp"
android:layout_marginRight="22dp"
android:layout_marginBottom="10dp"
android:clickable="true"
android:focusable="true"
app:cardBackgroundColor="#F21F2420"
app:cardCornerRadius="22dp"
app:cardElevation="5dp"
app:strokeColor="#334F7D68"
app:strokeWidth="1dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="12dp"
android:paddingTop="9dp"
android:paddingRight="12dp"
android:paddingBottom="9dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/reader_hud_chapter_text"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginRight="12dp"
android:layout_weight="1"
android:ellipsize="end"
android:fontFamily="@font/open_sans_semibold"
android:maxLines="1"
android:textColor="@color/white"
android:textSize="13sp" />
<TextView
android:id="@+id/progress_badge_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/bg_reader_hud_chip"
android:fontFamily="@font/open_sans_semibold"
android:paddingLeft="9dp"
android:paddingTop="4dp"
android:paddingRight="9dp"
android:paddingBottom="4dp"
android:textColor="@color/white"
android:textSize="11sp" />
</LinearLayout>
<TextView
android:id="@+id/reader_hud_chapter_progress_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/surface_strong"
android:textSize="11sp" />
<ProgressBar
android:id="@+id/reader_progress_indicator"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="4dp"
android:layout_marginTop="7dp"
android:indeterminate="false"
android:max="100"
android:progress="0"
android:progressBackgroundTint="#335B665F"
android:progressTint="@color/accent_soft_color" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
</FrameLayout>