mirror of
https://github.com/mihonapp/mihon.git
synced 2025-11-07 09:38:59 +01:00
Upstream merge
Internal permission change Fix url adder
This commit is contained in:
0
app/src/main/res/layout/activity_download_manager.xml
Normal file → Executable file
0
app/src/main/res/layout/activity_download_manager.xml
Normal file → Executable file
0
app/src/main/res/layout/activity_edit_categories.xml
Normal file → Executable file
0
app/src/main/res/layout/activity_edit_categories.xml
Normal file → Executable file
29
app/src/main/res/layout/activity_lock.xml
Executable file
29
app/src/main/res/layout/activity_lock.xml
Executable file
@@ -0,0 +1,29 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<android.support.constraint.ConstraintLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<com.andrognito.pinlockview.PinLockView
|
||||
android:id="@+id/pin_lock_view"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/indicator_dots"
|
||||
android:layout_marginTop="8dp"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintLeft_toLeftOf="parent" />
|
||||
|
||||
<com.andrognito.pinlockview.IndicatorDots
|
||||
android:id="@+id/indicator_dots"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintBottom_toTopOf="@+id/pin_lock_view"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintVertical_chainStyle="packed"
|
||||
android:layout_marginBottom="8dp"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintLeft_toLeftOf="parent" />
|
||||
</android.support.constraint.ConstraintLayout>
|
||||
0
app/src/main/res/layout/activity_main.xml
Normal file → Executable file
0
app/src/main/res/layout/activity_main.xml
Normal file → Executable file
0
app/src/main/res/layout/activity_manga.xml
Normal file → Executable file
0
app/src/main/res/layout/activity_manga.xml
Normal file → Executable file
0
app/src/main/res/layout/activity_preferences.xml
Normal file → Executable file
0
app/src/main/res/layout/activity_preferences.xml
Normal file → Executable file
0
app/src/main/res/layout/activity_reader.xml
Normal file → Executable file
0
app/src/main/res/layout/activity_reader.xml
Normal file → Executable file
0
app/src/main/res/layout/catalogue_drawer.xml
Normal file → Executable file
0
app/src/main/res/layout/catalogue_drawer.xml
Normal file → Executable file
0
app/src/main/res/layout/catalogue_drawer_content.xml
Normal file → Executable file
0
app/src/main/res/layout/catalogue_drawer_content.xml
Normal file → Executable file
0
app/src/main/res/layout/changelog_header_layout.xml
Normal file → Executable file
0
app/src/main/res/layout/changelog_header_layout.xml
Normal file → Executable file
0
app/src/main/res/layout/changelog_row_layout.xml
Normal file → Executable file
0
app/src/main/res/layout/changelog_row_layout.xml
Normal file → Executable file
0
app/src/main/res/layout/chapter_image.xml
Normal file → Executable file
0
app/src/main/res/layout/chapter_image.xml
Normal file → Executable file
0
app/src/main/res/layout/dialog_reader_custom_filter.xml
Normal file → Executable file
0
app/src/main/res/layout/dialog_reader_custom_filter.xml
Normal file → Executable file
0
app/src/main/res/layout/dialog_reader_settings.xml
Normal file → Executable file
0
app/src/main/res/layout/dialog_reader_settings.xml
Normal file → Executable file
0
app/src/main/res/layout/dialog_track_chapters.xml
Normal file → Executable file
0
app/src/main/res/layout/dialog_track_chapters.xml
Normal file → Executable file
0
app/src/main/res/layout/dialog_track_score.xml
Normal file → Executable file
0
app/src/main/res/layout/dialog_track_score.xml
Normal file → Executable file
0
app/src/main/res/layout/dialog_track_search.xml
Normal file → Executable file
0
app/src/main/res/layout/dialog_track_search.xml
Normal file → Executable file
0
app/src/main/res/layout/dialog_with_checkbox.xml
Normal file → Executable file
0
app/src/main/res/layout/dialog_with_checkbox.xml
Normal file → Executable file
48
app/src/main/res/layout/eh_activity_finish_migration.xml
Executable file
48
app/src/main/res/layout/eh_activity_finish_migration.xml
Executable file
@@ -0,0 +1,48 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<android.support.design.widget.CoordinatorLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:fitsSystemWindows="true">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<android.support.design.widget.AppBarLayout
|
||||
android:id="@+id/appbar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<include layout="@layout/toolbar"/>
|
||||
|
||||
</android.support.design.widget.AppBarLayout>
|
||||
|
||||
<FrameLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
<LinearLayout
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:layout_gravity="center">
|
||||
|
||||
<TextView
|
||||
android:text="Finalizing migration..."
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="@style/TextAppearance.Medium.Title" />
|
||||
|
||||
<ProgressBar
|
||||
style="?android:attr/progressBarStyleLarge"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center" />
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
</LinearLayout>
|
||||
|
||||
</android.support.design.widget.CoordinatorLayout>
|
||||
48
app/src/main/res/layout/eh_activity_intercept.xml
Executable file
48
app/src/main/res/layout/eh_activity_intercept.xml
Executable file
@@ -0,0 +1,48 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<android.support.design.widget.CoordinatorLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:fitsSystemWindows="true">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<android.support.design.widget.AppBarLayout
|
||||
android:id="@+id/appbar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<include layout="@layout/toolbar"/>
|
||||
|
||||
</android.support.design.widget.AppBarLayout>
|
||||
|
||||
<FrameLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
<LinearLayout
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:layout_gravity="center">
|
||||
|
||||
<TextView
|
||||
android:text="Loading gallery..."
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="@style/TextAppearance.Medium.Title" />
|
||||
|
||||
<ProgressBar
|
||||
style="?android:attr/progressBarStyleLarge"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center" />
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
</LinearLayout>
|
||||
|
||||
</android.support.design.widget.CoordinatorLayout>
|
||||
67
app/src/main/res/layout/eh_activity_login.xml
Executable file
67
app/src/main/res/layout/eh_activity_login.xml
Executable file
@@ -0,0 +1,67 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<android.support.design.widget.CoordinatorLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:fitsSystemWindows="true">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<android.support.design.widget.AppBarLayout
|
||||
android:id="@+id/appbar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<include layout="@layout/toolbar"/>
|
||||
|
||||
</android.support.design.widget.AppBarLayout>
|
||||
|
||||
<android.support.constraint.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<WebView
|
||||
android:id="@+id/webview"
|
||||
android:layout_width="0dp"
|
||||
app:layout_constraintBottom_toTopOf="@+id/linearLayout"
|
||||
android:layout_height="0dp"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintVertical_bias="0.0"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintRight_toRightOf="parent" />
|
||||
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_height="wrap_content"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
android:layout_width="0dp"
|
||||
android:id="@+id/linearLayout">
|
||||
|
||||
<Button
|
||||
android:text="@android:string/cancel"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/btn_cancel"
|
||||
android:layout_weight="1"
|
||||
style="@style/Widget.AppCompat.Button.Borderless" />
|
||||
|
||||
<Button
|
||||
android:text="Recheck"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/btn_recheck"
|
||||
android:layout_weight="1"
|
||||
style="@style/Widget.AppCompat.Button.Borderless" />
|
||||
</LinearLayout>
|
||||
</android.support.constraint.ConstraintLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</android.support.design.widget.CoordinatorLayout>
|
||||
54
app/src/main/res/layout/eh_fragment_batch_add.xml
Executable file
54
app/src/main/res/layout/eh_fragment_batch_add.xml
Executable file
@@ -0,0 +1,54 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<android.support.design.widget.CoordinatorLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:fitsSystemWindows="true">
|
||||
|
||||
<android.support.constraint.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<TextView
|
||||
android:text="Enter the galleries to add (separated by a new line):"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/textView"
|
||||
android:textAppearance="@style/TextAppearance.Medium.Title"
|
||||
android:layout_marginTop="16dp"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
android:layout_marginStart="16dp"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
android:layout_marginLeft="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
android:layout_marginRight="16dp" />
|
||||
|
||||
<EditText
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:inputType="textMultiLine"
|
||||
android:ems="10"
|
||||
android:id="@+id/galleries_box"
|
||||
android:layout_marginTop="8dp"
|
||||
app:layout_constraintTop_toBottomOf="@+id/textView"
|
||||
app:layout_constraintLeft_toLeftOf="@+id/textView"
|
||||
app:layout_constraintRight_toRightOf="@+id/textView"
|
||||
app:layout_constraintBottom_toTopOf="@+id/btn_add_galleries"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:hint="Example:\n\nhttp://e-hentai.org/g/12345/1a2b3c4e\nhttp://g.e-hentai.org/g/67890/6f7g8h9i\nhttp://exhentai.org/g/13579/1a3b5c7e\nhttps://exhentai.org/g/24680/2f4g6h8i\n" />
|
||||
|
||||
<Button
|
||||
android:text="Add Galleries"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/btn_add_galleries"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
android:layout_marginBottom="16dp"
|
||||
app:layout_constraintLeft_toLeftOf="@+id/galleries_box"
|
||||
app:layout_constraintRight_toRightOf="@+id/galleries_box" />
|
||||
</android.support.constraint.ConstraintLayout>
|
||||
|
||||
</android.support.design.widget.CoordinatorLayout>
|
||||
0
app/src/main/res/layout/fragment_backup.xml
Normal file → Executable file
0
app/src/main/res/layout/fragment_backup.xml
Normal file → Executable file
0
app/src/main/res/layout/fragment_catalogue.xml
Normal file → Executable file
0
app/src/main/res/layout/fragment_catalogue.xml
Normal file → Executable file
0
app/src/main/res/layout/fragment_download_queue.xml
Normal file → Executable file
0
app/src/main/res/layout/fragment_download_queue.xml
Normal file → Executable file
0
app/src/main/res/layout/fragment_library.xml
Normal file → Executable file
0
app/src/main/res/layout/fragment_library.xml
Normal file → Executable file
0
app/src/main/res/layout/fragment_library_category.xml
Normal file → Executable file
0
app/src/main/res/layout/fragment_library_category.xml
Normal file → Executable file
0
app/src/main/res/layout/fragment_manga_chapters.xml
Normal file → Executable file
0
app/src/main/res/layout/fragment_manga_chapters.xml
Normal file → Executable file
4
app/src/main/res/layout/fragment_manga_info.xml
Normal file → Executable file
4
app/src/main/res/layout/fragment_manga_info.xml
Normal file → Executable file
@@ -255,7 +255,9 @@
|
||||
style="@style/TextAppearance.Regular.Body1.Secondary"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textIsSelectable="false"/>
|
||||
android:textIsSelectable="true"
|
||||
android:focusable="true"
|
||||
android:longClickable="true"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
0
app/src/main/res/layout/fragment_recent_chapters.xml
Normal file → Executable file
0
app/src/main/res/layout/fragment_recent_chapters.xml
Normal file → Executable file
0
app/src/main/res/layout/fragment_recently_read.xml
Normal file → Executable file
0
app/src/main/res/layout/fragment_recently_read.xml
Normal file → Executable file
0
app/src/main/res/layout/fragment_track.xml
Normal file → Executable file
0
app/src/main/res/layout/fragment_track.xml
Normal file → Executable file
0
app/src/main/res/layout/item_catalogue_grid.xml
Normal file → Executable file
0
app/src/main/res/layout/item_catalogue_grid.xml
Normal file → Executable file
0
app/src/main/res/layout/item_catalogue_list.xml
Normal file → Executable file
0
app/src/main/res/layout/item_catalogue_list.xml
Normal file → Executable file
0
app/src/main/res/layout/item_chapter.xml
Normal file → Executable file
0
app/src/main/res/layout/item_chapter.xml
Normal file → Executable file
0
app/src/main/res/layout/item_download.xml
Normal file → Executable file
0
app/src/main/res/layout/item_download.xml
Normal file → Executable file
0
app/src/main/res/layout/item_edit_categories.xml
Normal file → Executable file
0
app/src/main/res/layout/item_edit_categories.xml
Normal file → Executable file
0
app/src/main/res/layout/item_library_category.xml
Normal file → Executable file
0
app/src/main/res/layout/item_library_category.xml
Normal file → Executable file
0
app/src/main/res/layout/item_pager_reader.xml
Normal file → Executable file
0
app/src/main/res/layout/item_pager_reader.xml
Normal file → Executable file
0
app/src/main/res/layout/item_recent_chapter_section.xml
Normal file → Executable file
0
app/src/main/res/layout/item_recent_chapter_section.xml
Normal file → Executable file
0
app/src/main/res/layout/item_recent_chapters.xml
Normal file → Executable file
0
app/src/main/res/layout/item_recent_chapters.xml
Normal file → Executable file
0
app/src/main/res/layout/item_recently_read.xml
Normal file → Executable file
0
app/src/main/res/layout/item_recently_read.xml
Normal file → Executable file
0
app/src/main/res/layout/item_track.xml
Normal file → Executable file
0
app/src/main/res/layout/item_track.xml
Normal file → Executable file
0
app/src/main/res/layout/item_track_search.xml
Normal file → Executable file
0
app/src/main/res/layout/item_track_search.xml
Normal file → Executable file
0
app/src/main/res/layout/item_webtoon_reader.xml
Normal file → Executable file
0
app/src/main/res/layout/item_webtoon_reader.xml
Normal file → Executable file
0
app/src/main/res/layout/library_drawer.xml
Normal file → Executable file
0
app/src/main/res/layout/library_drawer.xml
Normal file → Executable file
0
app/src/main/res/layout/library_grid_recycler.xml
Normal file → Executable file
0
app/src/main/res/layout/library_grid_recycler.xml
Normal file → Executable file
0
app/src/main/res/layout/library_list_recycler.xml
Normal file → Executable file
0
app/src/main/res/layout/library_list_recycler.xml
Normal file → Executable file
0
app/src/main/res/layout/listitem_dir.xml
Normal file → Executable file
0
app/src/main/res/layout/listitem_dir.xml
Normal file → Executable file
0
app/src/main/res/layout/navigation_header.xml
Normal file → Executable file
0
app/src/main/res/layout/navigation_header.xml
Normal file → Executable file
0
app/src/main/res/layout/navigation_view_checkbox.xml
Normal file → Executable file
0
app/src/main/res/layout/navigation_view_checkbox.xml
Normal file → Executable file
0
app/src/main/res/layout/navigation_view_checkedtext.xml
Normal file → Executable file
0
app/src/main/res/layout/navigation_view_checkedtext.xml
Normal file → Executable file
0
app/src/main/res/layout/navigation_view_group.xml
Normal file → Executable file
0
app/src/main/res/layout/navigation_view_group.xml
Normal file → Executable file
0
app/src/main/res/layout/navigation_view_radio.xml
Normal file → Executable file
0
app/src/main/res/layout/navigation_view_radio.xml
Normal file → Executable file
0
app/src/main/res/layout/navigation_view_spinner.xml
Normal file → Executable file
0
app/src/main/res/layout/navigation_view_spinner.xml
Normal file → Executable file
0
app/src/main/res/layout/navigation_view_text.xml
Normal file → Executable file
0
app/src/main/res/layout/navigation_view_text.xml
Normal file → Executable file
0
app/src/main/res/layout/page_decode_error.xml
Normal file → Executable file
0
app/src/main/res/layout/page_decode_error.xml
Normal file → Executable file
0
app/src/main/res/layout/pref_account_login.xml
Normal file → Executable file
0
app/src/main/res/layout/pref_account_login.xml
Normal file → Executable file
0
app/src/main/res/layout/pref_item_source.xml
Normal file → Executable file
0
app/src/main/res/layout/pref_item_source.xml
Normal file → Executable file
0
app/src/main/res/layout/pref_library_columns.xml
Normal file → Executable file
0
app/src/main/res/layout/pref_library_columns.xml
Normal file → Executable file
0
app/src/main/res/layout/preference_widget_imageview.xml
Normal file → Executable file
0
app/src/main/res/layout/preference_widget_imageview.xml
Normal file → Executable file
0
app/src/main/res/layout/progress_item.xml
Normal file → Executable file
0
app/src/main/res/layout/progress_item.xml
Normal file → Executable file
0
app/src/main/res/layout/recycler_autofit.xml
Normal file → Executable file
0
app/src/main/res/layout/recycler_autofit.xml
Normal file → Executable file
0
app/src/main/res/layout/spinner_item.xml
Normal file → Executable file
0
app/src/main/res/layout/spinner_item.xml
Normal file → Executable file
0
app/src/main/res/layout/toolbar.xml
Normal file → Executable file
0
app/src/main/res/layout/toolbar.xml
Normal file → Executable file
0
app/src/main/res/layout/view_empty.xml
Normal file → Executable file
0
app/src/main/res/layout/view_empty.xml
Normal file → Executable file
Reference in New Issue
Block a user