yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix fab color

Browse Source
This commit is contained in:
NekoInverter committed 2020-03-23 17:23:53 +08:00
1 parent 2e2af99326
commit 02a5a0e204
94 files changed
+1306 -1496
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/res/layout/activity_dir_picker.xml
+9 -11
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,28 +14,27 @@
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/keyline_margin"
android:orientation="vertical">
android:orientation="vertical"
android:padding="@dimen/keyline_margin">
<TextView
android:id="@+id/path"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:singleLine="true"
android:ellipsize="start"
android:singleLine="true"
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/text_little_small"/>
android:textSize="@dimen/text_little_small" />
<com.hippo.widget.DirExplorer
android:id="@+id/dir_explorer"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"/>
android:layout_weight="1" />
<FrameLayout
android:layout_width="match_parent"
@@ -49,7 +47,7 @@
android:layout_height="wrap_content"
android:layout_gravity="left"
android:text="@string/preset"
android:textColor="?attr/colorAccent"/>
android:textColor="?attr/colorAccent" />
<TextView
android:id="@+id/ok"
@@ -58,7 +56,7 @@
android:layout_height="wrap_content"
android:layout_gravity="right"
android:text="@android:string/ok"
android:textColor="?attr/colorPrimary"/>
android:textColor="?attr/colorPrimary" />
</FrameLayout>
</LinearLayout>
app/src/main/res/layout/activity_filter.xml
+6 -8
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -24,16 +22,16 @@
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/keyline_margin"/>
android:padding="@dimen/keyline_margin" />
<TextView
android:id="@+id/tip"
style="@style/TextAppearance.AppCompat.Medium"
android:layout_width="228dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_horizontal"
android:drawablePadding="16dp"
android:text="@string/no_filter"
style="@style/TextAppearance.AppCompat.Medium"/>
android:gravity="center_horizontal"
android:text="@string/no_filter" />
</FrameLayout>
app/src/main/res/layout/activity_gallery.xml
+14 -17
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -24,7 +22,7 @@
<com.hippo.glview.view.GLRootView
android:id="@+id/gl_root_view"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent" />
<com.hippo.ehviewer.widget.GalleryHeader
android:id="@+id/gallery_header"
@@ -39,7 +37,7 @@
android:layout_gravity="right"
android:layout_marginTop="@dimen/gallery_widget_margin_v"
android:layout_marginRight="@dimen/gallery_widget_margin_h"
android:textColor="?android:attr/textColorSecondary"/>
android:textColor="?android:attr/textColorSecondary" />
<TextView
android:id="@+id/progress"
@@ -47,19 +45,18 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/gallery_widget_margin_v"
android:textColor="?android:attr/textColorSecondary"/>
android:textColor="?android:attr/textColorSecondary" />
<com.hippo.widget.BatteryView
xmlns:app="http://schemas.android.com/apk/res-auto"
<com.hippo.widget.BatteryView xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/battery"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:layout_marginTop="@dimen/gallery_widget_margin_v"
android:layout_marginLeft="@dimen/gallery_widget_margin_h"
android:layout_marginTop="@dimen/gallery_widget_margin_v"
android:drawablePadding="4dp"
app:color="?android:attr/textColorSecondary"
app:warningColor="@color/red_500"/>
app:warningColor="@color/red_500" />
</com.hippo.ehviewer.widget.GalleryHeader>
@@ -68,11 +65,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:orientation="horizontal"
android:background="?attr/gallerySliderBackgroundColor"
android:fitsSystemWindows="true"
android:orientation="horizontal"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:visibility="invisible">
<TextView
@@ -80,7 +77,7 @@
android:layout_width="32dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="center_horizontal"/>
android:gravity="center_horizontal" />
<FrameLayout
android:layout_width="0dp"
@@ -91,7 +88,7 @@
android:id="@+id/seek_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"/>
android:layout_gravity="center_vertical" />
</FrameLayout>
@@ -100,7 +97,7 @@
android:layout_width="32dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="center_horizontal"/>
android:gravity="center_horizontal" />
</com.hippo.ehviewer.widget.SeekBarPanel>
app/src/main/res/layout/activity_hosts.xml
+32 -34
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2018 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,42 +14,41 @@
~ limitations under the License.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.hippo.easyrecyclerview.EasyRecyclerView
android:id="@+id/recycler_view"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"/>
android:orientation="vertical">
<TextView
android:id="@+id/tip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:textSize="@dimen/text_super_large"
android:text="@string/hosts_tip"/>
<com.hippo.easyrecyclerview.EasyRecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false" />
<com.hippo.widget.FabLayout
android:id="@+id/fab_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingRight="@dimen/corner_fab_margin"
android:paddingBottom="@dimen/corner_fab_margin">
<TextView
android:id="@+id/tip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:text="@string/hosts_tip"
android:textSize="@dimen/text_super_large" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/v_plus_dark_x24"
app:backgroundTint="?attr/widgetColorThemePrimary"
style="@style/Widget.Design.FloatingActionButton"/>
<com.hippo.widget.FabLayout
android:id="@+id/fab_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingRight="@dimen/corner_fab_margin"
android:paddingBottom="@dimen/corner_fab_margin">
</com.hippo.widget.FabLayout>
<com.google.android.material.floatingactionbutton.FloatingActionButton xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/fab"
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:backgroundTint="?attr/widgetColorThemePrimary"
app:srcCompat="@drawable/v_plus_dark_x24"
app:tint="#fff" />
</com.hippo.widget.FabLayout>
</FrameLayout>
app/src/main/res/layout/activity_my_tags.xml
+17 -19
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2018 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,24 +14,23 @@
~ limitations under the License.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:animateLayoutChanges="true">
<WebView
android:id="@+id/webview"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent"
android:animateLayoutChanges="true"
android:orientation="vertical">
<com.hippo.widget.ProgressView
android:id="@+id/progress"
style="@style/ProgressView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="gone"/>
<WebView
android:id="@+id/webview"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<com.hippo.widget.ProgressView
android:id="@+id/progress"
style="@style/ProgressView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="gone" />
</FrameLayout>
app/src/main/res/layout/activity_set_security.xml
+21 -24
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,38 +14,36 @@
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:text="@string/set_pattern_protection_tip"
android:gravity="center"
android:padding="@dimen/keyline_margin"
android:gravity="center"/>
android:text="@string/set_pattern_protection_tip"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<com.hippo.widget.MaxSizeContainer
xmlns:app="http://schemas.android.com/apk/res-auto"
<com.hippo.widget.MaxSizeContainer xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="32dp"
app:maxWidth="320dp"
app:maxHeight="320dp">
app:maxHeight="320dp"
app:maxWidth="320dp">
<com.hippo.widget.lockpattern.LockPatternView
android:id="@+id/pattern_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content" />
</com.hippo.widget.MaxSizeContainer>
</FrameLayout>
@@ -57,20 +54,20 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="20dp"
android:visibility="gone"
android:text="@string/enable_fingerprint" />
android:text="@string/enable_fingerprint"
android:visibility="gone" />
<LinearLayout
android:id="@+id/buttonPanel"
style="?attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="bottom"
android:orientation="horizontal"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:gravity="bottom"
style="?attr/buttonBarStyle">
android:paddingRight="12dp"
android:paddingBottom="4dp">
<Button
android:id="@+id/cancel"
@@ -78,8 +75,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="?attr/colorAccent"
android:text="@android:string/cancel"/>
android:text="@android:string/cancel"
android:textColor="?attr/colorAccent" />
<Button
android:id="@+id/set"
@@ -87,8 +84,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="?attr/colorPrimary"
android:text="@string/set"/>
android:text="@string/set"
android:textColor="?attr/colorPrimary" />
</LinearLayout>
</LinearLayout>
app/src/main/res/layout/activity_toolbar.xml
+3 -3
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,5 +15,6 @@
-->
<merge>
<include layout="@layout/scene_toolbar"/>
<include layout="@layout/scene_toolbar" />
</merge>
app/src/main/res/layout/activity_u_config.xml
+17 -19
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2018 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,24 +14,23 @@
~ limitations under the License.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:animateLayoutChanges="true">
<WebView
android:id="@+id/webview"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent"
android:animateLayoutChanges="true"
android:orientation="vertical">
<com.hippo.widget.ProgressView
android:id="@+id/progress"
style="@style/ProgressView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="gone"/>
<WebView
android:id="@+id/webview"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<com.hippo.widget.ProgressView
android:id="@+id/progress"
style="@style/ProgressView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="gone" />
</FrameLayout>
app/src/main/res/layout/alert_dialog_progress_material.xml
+8 -6
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,22 +21,25 @@
android:paddingTop="@dimen/dialog_padding_top_material"
android:paddingRight="?attr/dialogPreferredPadding"
android:paddingBottom="@dimen/dialog_padding_top_material">
<ProgressBar
android:id="@+id/progress"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true" />
<TextView
android:id="@+id/progress_percent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@id/progress" />
android:layout_below="@id/progress"
android:layout_alignParentLeft="true" />
<TextView
android:id="@+id/progress_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_below="@id/progress" />
android:layout_below="@id/progress"
android:layout_alignParentRight="true" />
</RelativeLayout>
app/src/main/res/layout/button_guide.xml
+6 -8
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,13 +14,12 @@
~ limitations under the License.
-->
<Button
xmlns:android="http://schemas.android.com/apk/res/android"
<Button xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/get_it"
android:textStyle="bold"
android:background="@null"
android:textSize="@dimen/text_little_small"
android:text="@string/get_it"
android:textAllCaps="true"
android:textColor="@android:color/white"/>
android:textColor="@android:color/white"
android:textSize="@dimen/text_little_small"
android:textStyle="bold" />
app/src/main/res/layout/dialog_add_filter.xml
+4 -6
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
@@ -28,7 +26,7 @@
android:id="@+id/spinner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:entries="@array/filter_entries"/>
android:entries="@array/filter_entries" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/text_input_layout"
@@ -45,7 +43,7 @@
android:imeOptions="actionDone"
android:inputType="text"
android:maxLines="1"
android:singleLine="true"/>
android:singleLine="true" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
app/src/main/res/layout/dialog_archive_list.xml
+5 -7
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="@dimen/abc_dialog_padding_top_material"
@@ -27,18 +25,18 @@
style="@style/ProgressView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"/>
android:layout_gravity="center" />
<TextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"/>
android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
<ListView
android:id="@+id/list_view"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent" />
</FrameLayout>
app/src/main/res/layout/dialog_checkbox_builder.xml
+4 -6
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
@@ -34,7 +32,7 @@
android:layout_height="wrap_content"
android:paddingLeft="?attr/dialogPreferredPadding"
android:paddingTop="@dimen/abc_dialog_padding_top_material"
android:paddingRight="?attr/dialogPreferredPadding"/>
android:paddingRight="?attr/dialogPreferredPadding" />
</com.hippo.widget.IndicatingScrollView>
@@ -44,6 +42,6 @@
android:layout_height="wrap_content"
android:layout_marginLeft="?attr/dialogPreferredPadding"
android:layout_marginTop="@dimen/abc_dialog_padding_top_material"
android:layout_marginRight="?attr/dialogPreferredPadding"/>
android:layout_marginRight="?attr/dialogPreferredPadding" />
</LinearLayout>
app/src/main/res/layout/dialog_donate.xml
+75 -77
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2018 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,87 +14,86 @@
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/keyline_margin">
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="@string/settings_about_donate_message"/>
<Space
android:layout_width="wrap_content"
android:layout_height="@dimen/keyline_margin"/>
<TextView
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/settings_about_donate_alipay"
android:textColor="?attr/textColorThemePrimary"
android:textStyle="bold"
android:textSize="@dimen/text_little_small"/>
android:orientation="vertical"
android:padding="@dimen/keyline_margin">
<TextView
android:id="@+id/alipay_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"/>
<Button
android:id="@+id/alipay_copy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/settings_about_donate_copy"
style="@style/Widget.AppCompat.Button.Borderless.Colored"/>
<Space
android:layout_width="wrap_content"
android:layout_height="@dimen/keyline_margin"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/settings_about_donate_paypal"
android:textColor="?attr/textColorThemePrimary"
android:textStyle="bold"
android:textSize="@dimen/text_little_small"/>
<TextView
android:id="@+id/paypal_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<Button
android:id="@+id/paypal_open"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settings_about_donate_open"
style="@style/Widget.AppCompat.Button.Borderless.Colored"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="@string/settings_about_donate_message" />
<Space
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"/>
android:layout_width="wrap_content"
android:layout_height="@dimen/keyline_margin" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/settings_about_donate_alipay"
android:textColor="?attr/textColorThemePrimary"
android:textSize="@dimen/text_little_small"
android:textStyle="bold" />
<TextView
android:id="@+id/alipay_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center" />
<Button
android:id="@+id/paypal_copy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settings_about_donate_copy"
style="@style/Widget.AppCompat.Button.Borderless.Colored"/>
android:id="@+id/alipay_copy"
style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/settings_about_donate_copy" />
</LinearLayout>
<Space
android:layout_width="wrap_content"
android:layout_height="@dimen/keyline_margin" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/settings_about_donate_paypal"
android:textColor="?attr/textColorThemePrimary"
android:textSize="@dimen/text_little_small"
android:textStyle="bold" />
<TextView
android:id="@+id/paypal_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<Button
android:id="@+id/paypal_open"
style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settings_about_donate_open" />
<Space
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
<Button
android:id="@+id/paypal_copy"
style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settings_about_donate_copy" />
</LinearLayout>
</LinearLayout>
app/src/main/res/layout/dialog_edittext_builder.xml
+3 -5
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<com.google.android.material.textfield.TextInputLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="?attr/dialogPreferredPadding"
@@ -30,6 +28,6 @@
android:imeOptions="actionDone"
android:inputType="text"
android:maxLines="1"
android:singleLine="true"/>
android:singleLine="true" />
</com.google.android.material.textfield.TextInputLayout>
app/src/main/res/layout/dialog_gallery_menu.xml
+34 -37
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,19 +14,17 @@
~ limitations under the License.
-->
<com.hippo.widget.IndicatingScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
<com.hippo.widget.IndicatingScrollView xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/Indicating"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/keyline_margin"
android:divider="@drawable/spacer_keyline"
android:orientation="vertical"
android:padding="@dimen/keyline_margin"
android:showDividers="middle">
<LinearLayout
@@ -38,18 +35,18 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:text="@string/settings_read_screen_rotation"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary" />
<com.hippo.widget.CuteSpinner
android:id="@+id/screen_rotation"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:layout_gravity="center_vertical"
android:entries="@array/screen_rotation_entries"/>
android:layout_weight="2"
android:entries="@array/screen_rotation_entries" />
</LinearLayout>
@@ -61,18 +58,18 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:text="@string/settings_read_reading_direction"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary" />
<com.hippo.widget.CuteSpinner
android:id="@+id/reading_direction"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:layout_gravity="center_vertical"
android:entries="@array/reading_direction_entries"/>
android:layout_weight="2"
android:entries="@array/reading_direction_entries" />
</LinearLayout>
@@ -84,18 +81,18 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:text="@string/settings_read_page_scaling"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary" />
<com.hippo.widget.CuteSpinner
android:id="@+id/page_scaling"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:layout_gravity="center_vertical"
android:entries="@array/page_scaling_entries"/>
android:layout_weight="2"
android:entries="@array/page_scaling_entries" />
</LinearLayout>
@@ -107,18 +104,18 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:text="@string/settings_read_start_position"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary" />
<com.hippo.widget.CuteSpinner
android:id="@+id/start_position"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:layout_gravity="center_vertical"
android:entries="@array/start_position_entries"/>
android:layout_weight="2"
android:entries="@array/start_position_entries" />
</LinearLayout>
@@ -127,62 +124,62 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings_read_keep_screen_on"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/show_clock"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings_read_show_clock"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/show_progress"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings_read_show_progress"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/show_battery"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings_read_show_battery"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/show_page_interval"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings_read_show_page_interval"
android:textColor="?android:attr/textColorPrimary"/>
android:id="@+id/show_page_interval"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings_read_show_page_interval"
android:textColor="?android:attr/textColorPrimary" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/volume_page"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings_read_volume_page"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/reading_fullscreen"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings_read_reading_fullscreen"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/custom_screen_lightness"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings_read_custom_screen_lightness"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary" />
<SeekBar
android:id="@+id/screen_lightness"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:max="200"/>
android:max="200" />
</LinearLayout>
</com.hippo.widget.IndicatingScrollView>
app/src/main/res/layout/dialog_go_to.xml
+9 -11
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2015 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,35 +14,34 @@
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="16dp"
android:orientation="horizontal"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:orientation="horizontal">
android:paddingTop="16dp"
android:paddingRight="16dp">
<TextView
android:id="@+id/start"
android:layout_width="32dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="center_horizontal"/>
android:gravity="center_horizontal" />
<com.hippo.widget.Slider
android:id="@+id/slider"
style="@style/Slider"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_weight="1"
android:layout_gravity="center_horizontal"/>
android:layout_gravity="center_horizontal"
android:layout_weight="1" />
<TextView
android:id="@+id/end"
android:layout_width="32dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="center_horizontal"/>
android:gravity="center_horizontal" />
</LinearLayout>
app/src/main/res/layout/dialog_hosts.xml
+30 -32
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2018 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,40 +14,39 @@
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="?attr/dialogPreferredPadding"
android:paddingTop="@dimen/abc_dialog_padding_top_material"
android:paddingRight="?attr/dialogPreferredPadding">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/host_input_layout"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/hosts_host">
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingLeft="?attr/dialogPreferredPadding"
android:paddingTop="@dimen/abc_dialog_padding_top_material"
android:paddingRight="?attr/dialogPreferredPadding">
<com.hippo.widget.HackyTextInputEditText
android:id="@+id/host"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="text"/>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/host_input_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/hosts_host">
</com.google.android.material.textfield.TextInputLayout>
<com.hippo.widget.HackyTextInputEditText
android:id="@+id/host"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="text" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/ip_input_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/hosts_ip">
</com.google.android.material.textfield.TextInputLayout>
<com.hippo.widget.HackyTextInputEditText
android:id="@+id/ip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="text"/>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/ip_input_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/hosts_ip">
</com.google.android.material.textfield.TextInputLayout>
<com.hippo.widget.HackyTextInputEditText
android:id="@+id/ip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="text" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
app/src/main/res/layout/dialog_item_select_with_icon.xml
+6 -7
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,11 +23,11 @@
android:id="@android:id/text1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:textColor="?android:attr/textColorAlertDialogListItem"
android:drawablePadding="@dimen/keyline_margin"
android:ellipsize="marquee"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:paddingLeft="?attr/listPreferredItemPaddingLeft"
android:paddingRight="?attr/listPreferredItemPaddingRight"
android:drawablePadding="@dimen/keyline_margin"
android:ellipsize="marquee"/>
android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:textColor="?android:attr/textColorAlertDialogListItem" />
app/src/main/res/layout/dialog_js_prompt.xml
+16 -18
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2018 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,24 +14,23 @@
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/keyline_margin">
<TextView
android:id="@+id/message"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"/>
android:orientation="vertical"
android:padding="@dimen/keyline_margin">
<EditText
android:id="@+id/value"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/keyline_margin"
android:inputType="text"/>
<TextView
android:id="@+id/message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
<EditText
android:id="@+id/value"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/keyline_margin"
android:inputType="text" />
</LinearLayout>
app/src/main/res/layout/dialog_list_checkbox_builder.xml
+10 -13
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,27 +14,25 @@
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:orientation="vertical">
<com.hippo.widget.IndicatingListView
xmlns:android="http://schemas.android.com/apk/res/android"
<com.hippo.widget.IndicatingListView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/list_view"
style="@style/Indicating"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:cacheColorHint="@null"
android:clipToPadding="false"
android:divider="?attr/listDividerAlertDialog"
android:scrollbars="vertical"
android:overScrollMode="ifContentScrolls"
android:fadingEdge="none"
android:overScrollMode="ifContentScrolls"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:clipToPadding="false"
style="@style/Indicating"/>
android:scrollbars="vertical" />
<androidx.appcompat.widget.AppCompatCheckBox
android:id="@+id/checkbox"
@@ -43,6 +40,6 @@
android:layout_height="wrap_content"
android:layout_marginLeft="?attr/dialogPreferredPadding"
android:layout_marginRight="?attr/dialogPreferredPadding"
android:layout_marginBottom="@dimen/abc_dialog_padding_top_material"/>
android:layout_marginBottom="@dimen/abc_dialog_padding_top_material" />
</LinearLayout>
app/src/main/res/layout/dialog_rate.xml
+7 -9
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2015 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,28 +13,27 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingLeft="16dp"
android:paddingRight="16dp">
<TextView
android:id="@+id/rating_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:gravity="center_horizontal"
android:textSize="@dimen/text_little_small"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/text_little_small" />
<com.hippo.ehviewer.widget.GalleryRatingBar
android:id="@+id/rating_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:theme="@style/RatingBarTheme"/>
android:theme="@style/RatingBarTheme" />
</LinearLayout>
app/src/main/res/layout/dialog_recycler_view.xml
+4 -6
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +14,9 @@
~ limitations under the License.
-->
<com.hippo.easyrecyclerview.EasyRecyclerView
xmlns:android="http://schemas.android.com/apk/res/android"
<com.hippo.easyrecyclerview.EasyRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/Indicating"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="@dimen/abc_dialog_padding_top_material"
android:paddingBottom="@dimen/abc_dialog_padding_top_material"
style="@style/Indicating"/>
android:paddingBottom="@dimen/abc_dialog_padding_top_material" />
app/src/main/res/layout/dialog_torrent_list.xml
+5 -7
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="@dimen/abc_dialog_padding_top_material"
@@ -27,18 +25,18 @@
style="@style/ProgressView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"/>
android:layout_gravity="center" />
<TextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"/>
android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
<ListView
android:id="@+id/list_view"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent" />
</FrameLayout>
app/src/main/res/layout/gallery_detail_actions.xml
+24 -26
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/actions"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -29,16 +27,16 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:clipToPadding="false"
android:paddingLeft="@dimen/keyline_margin"
android:paddingRight="@dimen/keyline_margin"
android:clipToPadding="false"
android:scrollbars="none">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:divider="@drawable/spacer_keyline"
android:orientation="horizontal"
android:showDividers="middle">
<FrameLayout
@@ -50,19 +48,19 @@
android:id="@+id/heart"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="8dp"
android:gravity="center_horizontal"
android:text="@string/favorited"
android:drawablePadding="8dp"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary" />
<TextView
android:id="@+id/heart_outline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="8dp"
android:gravity="center_horizontal"
android:text="@string/not_favorited"
android:drawablePadding="8dp"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary" />
</FrameLayout>
@@ -70,54 +68,54 @@
android:id="@+id/rate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="8dp"
android:gravity="center_horizontal"
android:text="@string/rate"
android:drawablePadding="8dp"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary" />
<TextView
android:id="@+id/share"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="8dp"
android:gravity="center_horizontal"
android:text="@string/share"
android:drawablePadding="8dp"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary" />
<TextView
android:id="@+id/torrent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:drawablePadding="8dp"
android:textColor="?android:attr/textColorPrimary"/>
android:gravity="center_horizontal"
android:textColor="?android:attr/textColorPrimary" />
<TextView
android:id="@+id/archive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/archive"
android:gravity="center_horizontal"
android:drawablePadding="8dp"
android:textColor="?android:attr/textColorPrimary"/>
android:gravity="center_horizontal"
android:text="@string/archive"
android:textColor="?android:attr/textColorPrimary" />
<TextView
android:id="@+id/similar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="8dp"
android:gravity="center_horizontal"
android:text="@string/similar_gallery"
android:drawablePadding="8dp"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary" />
<TextView
android:id="@+id/search_cover"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="8dp"
android:gravity="center_horizontal"
android:text="@string/search_cover"
android:drawablePadding="8dp"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary" />
</LinearLayout>
</HorizontalScrollView>
@@ -126,16 +124,16 @@
android:id="@+id/rating"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="8dp"
android:isIndicator="true"
android:theme="@style/RatingBarTheme"/>
android:theme="@style/RatingBarTheme" />
<TextView
android:id="@+id/rating_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary" />
</LinearLayout>
app/src/main/res/layout/gallery_detail_comments.xml
+4 -6
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2015 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,14 +13,13 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/comments"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:divider="@drawable/spacer_keyline"
android:orientation="vertical"
android:padding="@dimen/keyline_margin"
android:divider="@drawable/spacer_keyline"
android:showDividers="middle">
<TextView
@@ -29,6 +27,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:textColor="?attr/textColorThemeAccent"/>
android:textColor="?attr/textColorThemeAccent" />
</LinearLayout>
app/src/main/res/layout/gallery_detail_content.xml
+12 -21
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,14 +14,12 @@
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<include
layout="@layout/gallery_detail_header"/>
<include layout="@layout/gallery_detail_header" />
<FrameLayout
android:layout_width="match_parent"
@@ -32,30 +29,24 @@
android:id="@+id/below_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:divider="?attr/galleryDetailDivider"
android:showDividers="middle"
android:dividerPadding="@dimen/keyline_margin">
android:dividerPadding="@dimen/keyline_margin"
android:orientation="vertical"
android:showDividers="middle">
<include
layout="@layout/gallery_detail_info"/>
<include layout="@layout/gallery_detail_info" />
<include
layout="@layout/gallery_detail_actions"/>
<include layout="@layout/gallery_detail_actions" />
<include
layout="@layout/gallery_detail_tags"/>
<include layout="@layout/gallery_detail_tags" />
<include
layout="@layout/gallery_detail_comments"/>
<include layout="@layout/gallery_detail_comments" />
<include
layout="@layout/gallery_detail_previews"/>
<include layout="@layout/gallery_detail_previews" />
</LinearLayout>
<include
layout="@layout/gallery_detail_progress"/>
<include layout="@layout/gallery_detail_progress" />
</FrameLayout>
</LinearLayout>
app/src/main/res/layout/gallery_detail_header.xml
+32 -36
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2015 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/header"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -31,16 +29,16 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="?attr/galleryDetailHeaderBackgroundColor"/>
android:background="?attr/galleryDetailHeaderBackgroundColor" />
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="@drawable/shadow_bottom"/>
android:background="@drawable/shadow_bottom" />
<Space
android:layout_width="match_parent"
android:layout_height="24dp"/>
android:layout_height="24dp" />
</LinearLayout>
@@ -57,78 +55,76 @@
android:id="@+id/thumb"
android:layout_width="@dimen/gallery_detail_thumb_width"
android:layout_height="@dimen/gallery_detail_thumb_height"
android:layout_marginTop="@dimen/keyline_margin"
android:layout_marginLeft="@dimen/keyline_margin"
android:layout_marginBottom="@dimen/keyline_margin"/>
android:layout_marginTop="@dimen/keyline_margin"
android:layout_marginBottom="@dimen/keyline_margin" />
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/thumb"
android:layout_alignTop="@id/thumb"
android:layout_marginLeft="@dimen/keyline_margin"
android:layout_marginRight="@dimen/keyline_margin"
android:textColor="@android:color/white"
android:textSize="@dimen/text_little_large"
android:layout_toRightOf="@id/thumb"
android:ellipsize="end"
android:maxLines="5"
android:ellipsize="end"/>
android:textColor="@android:color/white"
android:textSize="@dimen/text_little_large" />
<TextView
android:id="@+id/uploader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@id/title"
android:layout_below="@id/title"
android:layout_alignLeft="@id/title"
android:layout_marginTop="8dp"
android:layout_marginRight="@dimen/keyline_margin"
android:textColor="?attr/galleryDetailHeaderTitleColor"
android:textSize="@dimen/text_little_small"
android:ellipsize="end"
android:singleLine="true"
android:ellipsize="end"/>
android:textColor="?attr/galleryDetailHeaderTitleColor"
android:textSize="@dimen/text_little_small" />
<TextView
android:id="@+id/category"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@id/title"
android:layout_below="@id/uploader"
android:layout_alignLeft="@id/title"
android:layout_marginTop="12dp"
android:layout_marginRight="@dimen/keyline_margin"
android:background="@android:color/white"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="2dp"
android:paddingBottom="2dp"
android:ellipsize="end"
android:paddingLeft="8dp"
android:paddingTop="2dp"
android:paddingRight="8dp"
android:paddingBottom="2dp"
android:singleLine="true"
android:textAllCaps="true"
android:textStyle="bold"/>
android:textStyle="bold" />
<ImageView
xmlns:app="http://schemas.android.com/apk/res-auto"
<ImageView xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/other_actions"
android:layout_width="48dp"
android:layout_height="56dp"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:paddingTop="16dp"
android:paddingRight="12dp"
android:paddingBottom="16dp"
app:srcCompat="@drawable/v_dots_vertical_secondary_dark_x24"/>
app:srcCompat="@drawable/v_dots_vertical_secondary_dark_x24" />
</RelativeLayout>
<com.google.android.material.card.MaterialCardView
xmlns:app="http://schemas.android.com/apk/res-auto"
<com.google.android.material.card.MaterialCardView xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/action_card"
style="@style/CardView.Normal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/keyline_margin"
android:layout_marginRight="@dimen/keyline_margin"
app:cardBackgroundColor="?attr/galleryDetailButtonBackgroundColor"
style="@style/CardView.Normal">
app:cardBackgroundColor="?attr/galleryDetailButtonBackgroundColor">
<LinearLayout
android:layout_width="match_parent"
@@ -141,14 +137,14 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="?attr/textColorThemePrimary"/>
android:textColor="?attr/textColorThemePrimary" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="?attr/dividerColor"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"/>
android:layout_marginBottom="8dp"
android:background="?attr/dividerColor" />
<TextView
android:id="@+id/read"
@@ -156,8 +152,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="?attr/textColorThemeAccent"
android:text="@string/read"/>
android:text="@string/read"
android:textColor="?attr/textColorThemeAccent" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
app/src/main/res/layout/gallery_detail_info.xml
+11 -13
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,12 +14,11 @@
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/info"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="@dimen/keyline_margin">
<TableLayout
@@ -30,6 +28,7 @@
android:paddingRight="@dimen/keyline_margin">
<TableRow>
<TextView
android:id="@+id/language"
android:layout_width="0dp"
@@ -37,7 +36,7 @@
android:layout_weight="1"
android:gravity="left"
android:singleLine="true"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary" />
<TextView
android:id="@+id/pages"
@@ -45,7 +44,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:singleLine="true"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary" />
<TextView
android:id="@+id/size"
@@ -54,12 +53,11 @@
android:layout_weight="1"
android:gravity="right"
android:singleLine="true"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary" />
</TableRow>
<TableRow
android:paddingTop="8dp">
<TableRow android:paddingTop="8dp">
<TextView
android:id="@+id/favoredTimes"
@@ -68,7 +66,7 @@
android:layout_weight="1"
android:gravity="left"
android:singleLine="true"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary" />
<TextView
android:id="@+id/posted"
@@ -77,7 +75,7 @@
android:layout_weight="1"
android:gravity="right"
android:singleLine="true"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary" />
</TableRow>
</TableLayout>
@@ -88,6 +86,6 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="16dp"
android:text="@string/more_information"
android:textColor="?attr/textColorThemeAccent"/>
android:textColor="?attr/textColorThemeAccent" />
</LinearLayout>
app/src/main/res/layout/gallery_detail_previews.xml
+6 -9
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2015 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,29 +14,27 @@
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/previews"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:divider="@drawable/spacer_keyline"
android:orientation="vertical"
android:padding="@dimen/keyline_margin"
android:divider="@drawable/spacer_keyline"
android:showDividers="middle">
<com.hippo.widget.SimpleGridAutoSpanLayout
xmlns:app="http://schemas.android.com/apk/res-auto"
<com.hippo.widget.SimpleGridAutoSpanLayout xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/grid_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:columnCount="3"
app:itemMargin="8dp"/>
app:itemMargin="8dp" />
<TextView
android:id="@+id/preview_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:textColor="?attr/textColorThemeAccent"/>
android:textColor="?attr/textColorThemeAccent" />
</LinearLayout>
app/src/main/res/layout/gallery_detail_progress.xml
+3 -5
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/progress"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -26,6 +24,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="@dimen/keyline_margin"/>
android:layout_margin="@dimen/keyline_margin" />
</FrameLayout>
app/src/main/res/layout/gallery_detail_tags.xml
+4 -6
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2015 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/tags"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -28,7 +26,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:textColor="?attr/textColorThemeAccent"
android:text="@string/no_tags"/>
android:text="@string/no_tags"
android:textColor="?attr/textColorThemeAccent" />
</LinearLayout>
app/src/main/res/layout/gallery_tag_group.xml
+3 -5
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +14,9 @@
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:paddingLeft="@dimen/keyline_margin"
android:paddingRight="@dimen/keyline_margin"/>
android:paddingRight="@dimen/keyline_margin" />
app/src/main/res/layout/item_cute_spinner_item.xml
+4 -6
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,11 +14,10 @@
~ limitations under the License.
-->
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
style="?attr/spinnerDropDownItemStyle"
android:singleLine="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="marquee"/>
android:ellipsize="marquee"
android:singleLine="true" />
app/src/main/res/layout/item_dir_explorer.xml
+3 -5
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +14,9 @@
~ limitations under the License.
-->
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:padding="8dp"/>
android:padding="8dp" />
app/src/main/res/layout/item_download.xml
+92 -94
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,129 +14,128 @@
~ limitations under the License.
-->
<androidx.cardview.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
style="@style/CardView.Reactive"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="2dp"
style="@style/CardView.Reactive">
android:layout_margin="2dp">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.hippo.ehviewer.widget.FixedThumb
android:id="@+id/thumb"
android:layout_width="@dimen/gallery_list_thumb_width"
android:layout_height="@dimen/gallery_list_thumb_height"
app:retryType="longClick"
app:minAspect="0.333"
app:maxAspect="1.333"/>
android:id="@+id/thumb"
android:layout_width="@dimen/gallery_list_thumb_width"
android:layout_height="@dimen/gallery_list_thumb_height"
app:maxAspect="1.333"
app:minAspect="0.333"
app:retryType="longClick" />
<TextView
android:id="@+id/title"
style="@style/CardTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginTop="4dp"
android:layout_toRightOf="@id/thumb"/>
android:id="@+id/title"
style="@style/CardTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginLeft="8dp"
android:layout_marginTop="4dp"
android:layout_marginRight="8dp"
android:layout_toRightOf="@id/thumb" />
<TextView
android:id="@+id/uploader"
style="@style/CardMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@id/title"
android:layout_below="@id/title"
android:layout_marginTop="2dp"/>
android:id="@+id/uploader"
style="@style/CardMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/title"
android:layout_alignLeft="@id/title"
android:layout_marginTop="2dp" />
<com.hippo.ehviewer.widget.SimpleRatingView
android:id="@+id/rating"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@id/title"
android:layout_below="@id/uploader"
android:layout_marginTop="2dp"/>
android:id="@+id/rating"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/uploader"
android:layout_alignLeft="@id/title"
android:layout_marginTop="2dp" />
<TextView
android:id="@+id/category"
style="@style/CardMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@id/title"
android:layout_alignBottom="@id/thumb"
android:layout_marginBottom="8dp"
android:paddingBottom="2dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="2dp"
android:textColor="@android:color/white"
android:textAllCaps="true"/>
android:id="@+id/category"
style="@style/CardMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@id/title"
android:layout_alignBottom="@id/thumb"
android:layout_marginBottom="8dp"
android:paddingLeft="8dp"
android:paddingTop="2dp"
android:paddingRight="8dp"
android:paddingBottom="2dp"
android:textAllCaps="true"
android:textColor="@android:color/white" />
<FrameLayout
android:id="@+id/actions"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/thumb"
android:layout_alignParentRight="true"
android:paddingRight="8dp">
android:id="@+id/actions"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/thumb"
android:layout_alignParentRight="true"
android:paddingRight="8dp">
<ImageView
android:id="@+id/start"
android:layout_width="40dp"
android:layout_height="40dp"
android:padding="8dp"
app:srcCompat="@drawable/v_play_x24"/>
android:id="@+id/start"
android:layout_width="40dp"
android:layout_height="40dp"
android:padding="8dp"
app:srcCompat="@drawable/v_play_x24" />
<ImageView
android:id="@+id/stop"
android:layout_width="40dp"
android:layout_height="40dp"
android:padding="8dp"
app:srcCompat="@drawable/v_pause_x24"/>
android:id="@+id/stop"
android:layout_width="40dp"
android:layout_height="40dp"
android:padding="8dp"
app:srcCompat="@drawable/v_pause_x24" />
</FrameLayout>
<TextView
android:id="@+id/state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/actions"
android:layout_marginBottom="4dp"
android:layout_alignParentRight="true"
android:paddingRight="16dp"
android:textColor="?attr/textColorThemeAccent"/>
android:id="@+id/state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/actions"
android:layout_alignParentRight="true"
android:layout_marginBottom="4dp"
android:paddingRight="16dp"
android:textColor="?attr/textColorThemeAccent" />
<ProgressBar
android:id="@+id/progress_bar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignLeft="@id/title"
android:layout_marginRight="8dp"
android:layout_above="@id/actions"
android:indeterminate="false"/>
android:id="@+id/progress_bar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@id/actions"
android:layout_alignLeft="@id/title"
android:layout_marginRight="8dp"
android:indeterminate="false" />
<TextView
android:id="@+id/percent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/progress_bar"
android:layout_alignLeft="@id/title"
android:textSize="@dimen/text_super_small"/>
android:id="@+id/percent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/progress_bar"
android:layout_alignLeft="@id/title"
android:textSize="@dimen/text_super_small" />
<TextView
android:id="@+id/speed"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/progress_bar"
android:layout_alignParentRight="true"
android:layout_marginRight="8dp"
android:textSize="@dimen/text_super_small"/>
android:id="@+id/speed"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/progress_bar"
android:layout_alignParentRight="true"
android:layout_marginRight="8dp"
android:textSize="@dimen/text_super_small" />
</RelativeLayout>
</androidx.cardview.widget.CardView>
app/src/main/res/layout/item_download_label.xml
+13 -17
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2018 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipChildren="false">
@@ -25,49 +23,47 @@
android:id="@+id/swipe_handler"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="?attr/contentColorPrimary">
android:background="?attr/contentColorPrimary"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
xmlns:app="http://schemas.android.com/apk/res-auto"
<ImageView xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/delete"
android:layout_width="48dp"
android:layout_height="48dp"
android:padding="12dp"
app:srcCompat="@drawable/v_delete_x24"/>
app:srcCompat="@drawable/v_delete_x24" />
<TextView
android:id="@+id/label"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_weight="1"
android:ellipsize="end"
android:gravity="center_vertical"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:gravity="center_vertical"
android:singleLine="true"
android:ellipsize="end"
android:textSize="@dimen/text_little_small"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/text_little_small" />
<ImageView
xmlns:app="http://schemas.android.com/apk/res-auto"
<ImageView xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/drag_handler"
android:layout_width="48dp"
android:layout_height="48dp"
android:padding="12dp"
app:srcCompat="@drawable/v_reorder_x24"/>
app:srcCompat="@drawable/v_reorder_x24" />
</LinearLayout>
<View
android:layout_width="wrap_content"
android:layout_height="1dp"
android:background="?attr/dividerColor"/>
android:background="?attr/dividerColor" />
</com.hippo.widget.ShadowLinearLayout>
</FrameLayout>
app/src/main/res/layout/item_drawer_favorites.xml
+10 -12
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2018 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,31 +14,30 @@
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="?android:attr/selectableItemBackground"
android:minHeight="?attr/listPreferredItemHeightSmall"
android:background="?android:attr/selectableItemBackground">
android:orientation="horizontal">
<TextView
android:id="@+id/key"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:textColor="?android:attr/textColorPrimary"
android:textAppearance="?attr/textAppearanceListItemSmall"
android:gravity="center_vertical"
android:paddingLeft="?attr/listPreferredItemPaddingLeft"/>
android:paddingLeft="?attr/listPreferredItemPaddingLeft"
android:textAppearance="?attr/textAppearanceListItemSmall"
android:textColor="?android:attr/textColorPrimary" />
<TextView
android:id="@+id/value"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:textColor="?android:attr/textColorPrimary"
android:textAppearance="?attr/textAppearanceListItemSmall"
android:gravity="center_vertical"
android:paddingRight="?attr/listPreferredItemPaddingRight"/>
android:paddingRight="?attr/listPreferredItemPaddingRight"
android:textAppearance="?attr/textAppearanceListItemSmall"
android:textColor="?android:attr/textColorPrimary" />
</LinearLayout>
app/src/main/res/layout/item_excluded_languages.xml
+6 -8
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
@@ -25,21 +23,21 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary" />
<com.hippo.widget.SensitiveCheckBox
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"/>
android:layout_weight="1" />
<com.hippo.widget.SensitiveCheckBox
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"/>
android:layout_weight="1" />
<com.hippo.widget.SensitiveCheckBox
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"/>
android:layout_weight="1" />
</LinearLayout>
app/src/main/res/layout/item_filter.xml
+11 -14
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipChildren="false">
@@ -24,41 +22,40 @@
<com.hippo.widget.ShadowLinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="?attr/contentColorPrimary">
android:background="?attr/contentColorPrimary"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
xmlns:app="http://schemas.android.com/apk/res-auto"
<ImageView xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:padding="12dp"
app:srcCompat="@drawable/v_copy_x24"/>
app:srcCompat="@drawable/v_copy_x24" />
<TextView
android:id="@+id/text"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_weight="1"
android:ellipsize="end"
android:gravity="center_vertical"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:gravity="center_vertical"
android:singleLine="true"
android:ellipsize="end"
android:textSize="@dimen/text_little_small"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/text_little_small" />
</LinearLayout>
<View
android:layout_width="wrap_content"
android:layout_height="1dp"
android:background="?attr/dividerColor"/>
android:background="?attr/dividerColor" />
</com.hippo.widget.ShadowLinearLayout>
</FrameLayout>
app/src/main/res/layout/item_filter_header.xml
+5 -7
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,12 +14,11 @@
~ limitations under the License.
-->
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/text"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="8dp"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?android:attr/textColorPrimary"
android:padding="8dp"/>
android:textColor="?android:attr/textColorPrimary" />
app/src/main/res/layout/item_gallery_comment.xml
+8 -10
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,34 +14,33 @@
~ limitations under the License.
-->
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/keyline_margin"
android:paddingRight="@dimen/keyline_margin"
android:paddingTop="8dp"
android:paddingBottom="8dp" >
android:paddingRight="@dimen/keyline_margin"
android:paddingBottom="8dp">
<TextView
android:id="@+id/user"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content" />
<TextView
android:id="@+id/time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"/>
android:layout_alignParentRight="true" />
<com.hippo.widget.LinkifyTextView
android:id="@+id/comment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@id/user"
android:layout_below="@id/user"
android:layout_alignLeft="@id/user"
android:layout_marginTop="8.0dp"
android:ellipsize="end"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary" />
</RelativeLayout>
app/src/main/res/layout/item_gallery_comment_more.xml
+3 -5
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2019 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/keyline_margin">
@@ -26,6 +24,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/click_more_comments"/>
android:text="@string/click_more_comments" />
</FrameLayout>
app/src/main/res/layout/item_gallery_comment_progress.xml
+3 -5
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2019 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/keyline_margin">
@@ -26,6 +24,6 @@
style="@style/ProgressView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"/>
android:layout_gravity="center" />
</FrameLayout>
app/src/main/res/layout/item_gallery_grid.xml
+11 -15
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,39 +14,36 @@
~ limitations under the License.
-->
<com.google.android.material.card.MaterialCardView
xmlns:android="http://schemas.android.com/apk/res/android"
<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
style="@style/CardView.Normal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="2dp"
style="@style/CardView.Normal">
android:layout_margin="2dp">
<com.hippo.ehviewer.widget.TileThumb
xmlns:app="http://schemas.android.com/apk/res-auto"
<com.hippo.ehviewer.widget.TileThumb xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/thumb"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="centerCrop"
android:foreground="@drawable/tile_background"
app:retryType="none"/>
android:scaleType="centerCrop"
app:retryType="none" />
<TextView
android:id="@+id/category"
android:layout_width="32dp"
android:layout_height="24dp"
android:layout_gravity="top|right"/>
android:layout_gravity="top|right" />
<TextView
xmlns:tools="http://schemas.android.com/tools"
<TextView xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/simple_language"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|right"
android:layout_marginRight="2dp"
android:textSize="10dp"
android:textColor="@android:color/white"
android:textSize="10dp"
android:textStyle="bold"
tools:ignore="SpUsage"/>
tools:ignore="SpUsage" />
</com.google.android.material.card.MaterialCardView>
app/src/main/res/layout/item_gallery_info_data.xml
+6 -8
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2015 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
@@ -27,14 +25,14 @@
android:id="@+id/key"
android:layout_width="90dp"
android:layout_height="wrap_content"
android:textColor="?android:attr/textColorPrimary"
android:padding="8dp"/>
android:padding="8dp"
android:textColor="?android:attr/textColorPrimary" />
<TextView
android:id="@+id/value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?android:attr/textColorPrimary"
android:padding="8dp"/>
android:padding="8dp"
android:textColor="?android:attr/textColorPrimary" />
</LinearLayout>
app/src/main/res/layout/item_gallery_info_header.xml
+6 -8
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2015 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
@@ -27,14 +25,14 @@
android:id="@+id/key"
android:layout_width="90dp"
android:layout_height="wrap_content"
android:textColor="?android:attr/textColorSecondary"
android:padding="8dp"/>
android:padding="8dp"
android:textColor="?android:attr/textColorSecondary" />
<TextView
android:id="@+id/value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?android:attr/textColorSecondary"
android:padding="8dp"/>
android:padding="8dp"
android:textColor="?android:attr/textColorSecondary" />
</LinearLayout>
app/src/main/res/layout/item_gallery_list.xml
+63 -66
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2015 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,116 +13,114 @@
~ limitations under the License.
-->
<com.google.android.material.card.MaterialCardView
xmlns:android="http://schemas.android.com/apk/res/android"
<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
style="@style/CardView.Reactive"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="2dp"
style="@style/CardView.Reactive">
android:layout_margin="2dp">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.hippo.ehviewer.widget.FixedThumb
android:id="@+id/thumb"
android:layout_width="@dimen/gallery_list_thumb_width"
android:layout_height="@dimen/gallery_list_thumb_height"
app:retryType="click"
app:minAspect="0.333"
app:maxAspect="1.333"/>
android:id="@+id/thumb"
android:layout_width="@dimen/gallery_list_thumb_width"
android:layout_height="@dimen/gallery_list_thumb_height"
app:maxAspect="1.333"
app:minAspect="0.333"
app:retryType="click" />
<TextView
android:id="@+id/title"
style="@style/CardTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginTop="4dp"
android:layout_toRightOf="@id/thumb"/>
android:id="@+id/title"
style="@style/CardTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginLeft="8dp"
android:layout_marginTop="4dp"
android:layout_marginRight="8dp"
android:layout_toRightOf="@id/thumb" />
<TextView
android:id="@+id/uploader"
style="@style/CardMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@id/title"
android:layout_below="@id/title"
android:layout_marginTop="2dp"/>
android:id="@+id/uploader"
style="@style/CardMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/title"
android:layout_alignLeft="@id/title"
android:layout_marginTop="2dp" />
<TextView
android:id="@+id/category"
style="@style/CardMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@id/title"
android:layout_alignBottom="@id/thumb"
android:layout_marginBottom="8dp"
android:paddingBottom="2dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="2dp"
android:textColor="@android:color/white"
android:textAllCaps="true"/>
android:id="@+id/category"
style="@style/CardMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@id/title"
android:layout_alignBottom="@id/thumb"
android:layout_marginBottom="8dp"
android:paddingLeft="8dp"
android:paddingTop="2dp"
android:paddingRight="8dp"
android:paddingBottom="2dp"
android:textAllCaps="true"
android:textColor="@android:color/white" />
<com.hippo.ehviewer.widget.SimpleRatingView
android:id="@+id/rating"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@id/title"
android:layout_above="@id/category"
android:layout_marginBottom="4dp"/>
android:id="@+id/rating"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/category"
android:layout_alignLeft="@id/title"
android:layout_marginBottom="4dp" />
<TextView
android:id="@+id/posted"
style="@style/CardMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/thumb"
android:layout_alignParentRight="true"
android:layout_marginRight="6dp"
android:layout_marginBottom="4dp"/>
android:id="@+id/posted"
style="@style/CardMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/thumb"
android:layout_alignParentRight="true"
android:layout_marginRight="6dp"
android:layout_marginBottom="4dp" />
<LinearLayout
xmlns:app="http://schemas.android.com/apk/res-auto"
<LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/posted"
android:layout_alignParentRight="true"
android:layout_marginRight="6dp"
android:orientation="horizontal"
android:divider="@drawable/spacer_x6"
android:showDividers="middle"
android:gravity="center_vertical">
android:gravity="center_vertical"
android:orientation="horizontal"
android:showDividers="middle">
<ImageView
android:id="@+id/downloaded"
android:layout_width="16dp"
android:layout_height="16dp"
android:visibility="gone"
app:srcCompat="@drawable/v_download_x16"/>
app:srcCompat="@drawable/v_download_x16" />
<ImageView
android:id="@+id/favourited"
android:layout_width="16dp"
android:layout_height="16dp"
android:visibility="gone"
app:srcCompat="@drawable/v_heart_x16"/>
app:srcCompat="@drawable/v_heart_x16" />
<TextView
android:id="@+id/simple_language"
style="@style/CardMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content" />
<TextView
android:id="@+id/pages"
style="@style/CardMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content" />
</LinearLayout>
</RelativeLayout>
app/src/main/res/layout/item_gallery_list_thumb_height.xml
+35 -37
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2018 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,44 +14,43 @@
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
style="@style/CardTitle"
android:layout_width="wrap_content"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:lines="2"/>
android:orientation="vertical">
<TextView
style="@style/CardMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:lines="1"/>
<TextView
style="@style/CardTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:lines="2" />
<com.hippo.ehviewer.widget.SimpleRatingView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"/>
<TextView
style="@style/CardMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:lines="1" />
<TextView
android:id="@+id/category"
style="@style/CardMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginBottom="8dp"
android:paddingBottom="2dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="2dp"
android:textColor="@android:color/white"
android:textAllCaps="true"
android:lines="1"/>
<com.hippo.ehviewer.widget.SimpleRatingView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp" />
<TextView
android:id="@+id/category"
style="@style/CardMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginBottom="8dp"
android:lines="1"
android:paddingLeft="8dp"
android:paddingTop="2dp"
android:paddingRight="8dp"
android:paddingBottom="2dp"
android:textAllCaps="true"
android:textColor="@android:color/white" />
</LinearLayout>
app/src/main/res/layout/item_gallery_preview.xml
+6 -9
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,26 +14,24 @@
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<com.hippo.ehviewer.widget.FixedThumb
xmlns:auto="http://schemas.android.com/apk/res-auto"
<com.hippo.ehviewer.widget.FixedThumb xmlns:auto="http://schemas.android.com/apk/res-auto"
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="wrap_content"
auto:aspect="0.667"
auto:retryType="longClick"
auto:maxAspect="0.8"
auto:minAspect="0.5"
auto:maxAspect="0.8"/>
auto:retryType="longClick" />
<TextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"/>
android:gravity="center" />
</LinearLayout>
app/src/main/res/layout/item_gallery_tag.xml
+4 -6
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,14 +14,13 @@
~ limitations under the License.
-->
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/CardMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:paddingTop="4dp"
android:paddingRight="12dp"
android:paddingBottom="4dp"
android:textColor="@android:color/white"/>
android:textColor="@android:color/white" />
app/src/main/res/layout/item_history.xml
+4 -6
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2018 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,13 +14,12 @@
~ limitations under the License.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include
layout="@layout/item_gallery_list"
android:id="@+id/card"/>
android:id="@+id/card"
layout="@layout/item_gallery_list" />
</FrameLayout>
app/src/main/res/layout/item_hosts.xml
+19 -21
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2018 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,26 +14,25 @@
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/keyline_margin"
android:paddingRight="@dimen/keyline_margin"
android:paddingTop="8dp"
android:paddingBottom="8dp">
<TextView
android:id="@+id/host"
android:layout_width="wrap_content"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?android:attr/textColorPrimary"/>
android:orientation="vertical"
android:paddingLeft="@dimen/keyline_margin"
android:paddingTop="8dp"
android:paddingRight="@dimen/keyline_margin"
android:paddingBottom="8dp">
<TextView
android:id="@+id/ip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"/>
<TextView
android:id="@+id/host"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?android:attr/textColorPrimary" />
<TextView
android:id="@+id/ip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp" />
</LinearLayout>
app/src/main/res/layout/item_preference_header.xml
+10 -12
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2015 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,23 +14,22 @@
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/preferenceHeaderBackground"
android:gravity="center_vertical"
android:minHeight="72dp"
android:orientation="horizontal"
android:background="?attr/preferenceHeaderBackground">
android:orientation="horizontal">
<ImageView
android:id="@android:id/icon"
android:layout_width="24dp"
android:layout_height="24dp"
android:scaleType="centerInside"
android:layout_marginLeft="16dp"
android:layout_marginRight="32dp"
android:contentDescription="@null"/>
android:contentDescription="@null"
android:scaleType="centerInside" />
<LinearLayout
android:layout_width="match_parent"
@@ -48,16 +46,16 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:textColor="?android:attr/textColorPrimary"/>
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="?android:attr/textColorPrimary" />
<TextView
android:id="@android:id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content" />
</FrameLayout>
app/src/main/res/layout/item_quick_search.xml
+13 -17
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2018 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipChildren="false">
@@ -25,49 +23,47 @@
android:id="@+id/swipe_handler"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="?attr/contentColorPrimary">
android:background="?attr/contentColorPrimary"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
xmlns:app="http://schemas.android.com/apk/res-auto"
<ImageView xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/delete"
android:layout_width="48dp"
android:layout_height="48dp"
android:padding="12dp"
app:srcCompat="@drawable/v_delete_x24"/>
app:srcCompat="@drawable/v_delete_x24" />
<TextView
android:id="@+id/label"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_weight="1"
android:ellipsize="end"
android:gravity="center_vertical"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:gravity="center_vertical"
android:singleLine="true"
android:ellipsize="end"
android:textSize="@dimen/text_little_small"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/text_little_small" />
<ImageView
xmlns:app="http://schemas.android.com/apk/res-auto"
<ImageView xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/drag_handler"
android:layout_width="48dp"
android:layout_height="48dp"
android:padding="12dp"
app:srcCompat="@drawable/v_reorder_x24"/>
app:srcCompat="@drawable/v_reorder_x24" />
</LinearLayout>
<View
android:layout_width="wrap_content"
android:layout_height="1dp"
android:background="?attr/dividerColor"/>
android:background="?attr/dividerColor" />
</com.hippo.widget.ShadowLinearLayout>
</FrameLayout>
app/src/main/res/layout/item_select_dialog.xml
+6 -8
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
~ limitations under the License.
-->
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?attr/listPreferredItemHeightSmall"
android:textAppearance="?attr/textAppearanceListItemSmall"
android:textColor="?attr/textColorAlertDialogListItem"
android:ellipsize="marquee"
android:gravity="center_vertical"
android:minHeight="?attr/listPreferredItemHeightSmall"
android:paddingLeft="?attr/listPreferredItemPaddingLeft"
android:paddingRight="?attr/listPreferredItemPaddingRight"
android:ellipsize="marquee"/>
android:textAppearance="?attr/textAppearanceListItemSmall"
android:textColor="?attr/textColorAlertDialogListItem" />
app/src/main/res/layout/item_simple_list.xml
+4 -6
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,13 +14,12 @@
~ limitations under the License.
-->
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?attr/textAppearanceListItemSmall"
android:gravity="center_vertical"
android:minHeight="?attr/listPreferredItemHeightSmall"
android:paddingLeft="?attr/listPreferredItemPaddingLeft"
android:paddingRight="?attr/listPreferredItemPaddingRight"
android:minHeight="?attr/listPreferredItemHeightSmall" />
android:textAppearance="?attr/textAppearanceListItemSmall" />
app/src/main/res/layout/item_simple_list_2.xml
+7 -9
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +14,14 @@
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="?attr/listPreferredItemPaddingLeft"
android:paddingRight="?attr/listPreferredItemPaddingRight"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:orientation="vertical">
android:paddingRight="?attr/listPreferredItemPaddingRight"
android:paddingBottom="8dp">
<TextView
android:id="@android:id/text1"
@@ -32,7 +30,7 @@
android:layout_marginBottom="4dp"
android:textAppearance="?attr/textAppearanceListItemSmall"
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/text_little_small"/>
android:textSize="@dimen/text_little_small" />
<TextView
android:id="@android:id/text2"
@@ -40,6 +38,6 @@
android:layout_height="wrap_content"
android:textAppearance="?attr/textAppearanceListItemSmall"
android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/text_small"/>
android:textSize="@dimen/text_small" />
</LinearLayout>
app/src/main/res/layout/nav_header_main.xml
+9 -11
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,18 +14,17 @@
~ limitations under the License.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="160dp">
android:layout_height="160dp"
android:orientation="vertical">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/sadpanda_low_poly"
android:contentDescription="@null"
android:scaleType="centerCrop"
android:contentDescription="@null"/>
android:src="@drawable/sadpanda_low_poly" />
<com.hippo.widget.LoadImageView
android:id="@+id/avatar"
@@ -34,7 +32,7 @@
android:layout_height="64dp"
android:layout_gravity="bottom"
android:layout_marginLeft="16dp"
android:layout_marginBottom="48dp"/>
android:layout_marginBottom="48dp" />
<TextView
android:id="@+id/display_name"
@@ -43,7 +41,7 @@
android:layout_gravity="bottom"
android:layout_marginLeft="16dp"
android:layout_marginBottom="16dp"
android:textSize="@dimen/text_small"
android:textColor="@android:color/white"/>
android:textColor="@android:color/white"
android:textSize="@dimen/text_small" />
</FrameLayout>
app/src/main/res/layout/preference_dialog_default_categories.xml
+3 -5
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,8 +15,7 @@
-->
<com.hippo.widget.IndicatingScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
<com.hippo.widget.IndicatingScrollView xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/Indicating"
android:layout_width="match_parent"
android:layout_height="0dp"
@@ -29,6 +27,6 @@
android:layout_height="wrap_content"
android:paddingLeft="?attr/dialogPreferredPadding"
android:paddingTop="@dimen/abc_dialog_padding_top_material"
android:paddingRight="?attr/dialogPreferredPadding"/>
android:paddingRight="?attr/dialogPreferredPadding" />
</com.hippo.widget.IndicatingScrollView>
app/src/main/res/layout/preference_dialog_excluded_tag_namespaces.xml
+14 -16
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<com.hippo.widget.IndicatingScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
<com.hippo.widget.IndicatingScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
style="@style/Indicating"
android:layout_width="match_parent"
@@ -33,7 +31,7 @@
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content" >
android:layout_height="wrap_content">
<CheckBox
android:id="@+id/tag_group_reclass"
@@ -41,7 +39,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="reclass"
tools:ignore="HardcodedText"/>
tools:ignore="HardcodedText" />
<CheckBox
android:id="@+id/tag_group_language"
@@ -49,13 +47,13 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="language"
tools:ignore="HardcodedText"/>
tools:ignore="HardcodedText" />
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content" >
android:layout_height="wrap_content">
<CheckBox
android:id="@+id/tag_group_parody"
@@ -63,7 +61,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="parody"
tools:ignore="HardcodedText"/>
tools:ignore="HardcodedText" />
<CheckBox
android:id="@+id/tag_group_character"
@@ -71,13 +69,13 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="character"
tools:ignore="HardcodedText"/>
tools:ignore="HardcodedText" />
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content" >
android:layout_height="wrap_content">
<CheckBox
android:id="@+id/tag_group_group"
@@ -85,7 +83,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="group"
tools:ignore="HardcodedText"/>
tools:ignore="HardcodedText" />
<CheckBox
android:id="@+id/tag_group_artist"
@@ -93,13 +91,13 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="artist"
tools:ignore="HardcodedText"/>
tools:ignore="HardcodedText" />
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content" >
android:layout_height="wrap_content">
<CheckBox
android:id="@+id/tag_group_male"
@@ -107,7 +105,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="male"
tools:ignore="HardcodedText"/>
tools:ignore="HardcodedText" />
<CheckBox
android:id="@+id/tag_group_female"
@@ -115,7 +113,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="female"
tools:ignore="HardcodedText"/>
tools:ignore="HardcodedText" />
</TableRow>
</TableLayout>
app/src/main/res/layout/preference_dialog_proxy.xml
+7 -9
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,11 +14,10 @@
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingLeft="?attr/dialogPreferredPadding"
android:paddingTop="18dp"
android:paddingRight="?attr/dialogPreferredPadding">
@@ -28,9 +26,9 @@
android:id="@+id/type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:entries="@array/proxy_types"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:entries="@array/proxy_types"/>
android:paddingBottom="8dp" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/ip_input_layout"
@@ -42,7 +40,7 @@
android:id="@+id/ip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="text"/>
android:inputType="text" />
</com.google.android.material.textfield.TextInputLayout>
@@ -56,7 +54,7 @@
android:id="@+id/port"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="numberDecimal"/>
android:inputType="numberDecimal" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
app/src/main/res/layout/preference_dialog_task.xml
+8 -10
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,26 +14,25 @@
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:paddingLeft="?attr/dialogPreferredPadding"
android:paddingTop="@dimen/abc_dialog_padding_top_material"
android:paddingBottom="@dimen/abc_dialog_padding_top_material"
android:paddingRight="?attr/dialogPreferredPadding">
android:paddingRight="?attr/dialogPreferredPadding"
android:paddingBottom="@dimen/abc_dialog_padding_top_material">
<com.hippo.widget.ProgressView
style="@style/ProgressView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
style="@style/ProgressView"/>
android:layout_gravity="center_vertical" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/please_wait"/>
android:text="@string/please_wait" />
</LinearLayout>
app/src/main/res/layout/preference_widget_fixed_switch.xml
+4 -6
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2015 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,11 +16,10 @@
<!-- Layout used by SwitchPreference for the switch widget style. This is inflated
inside android.R.layout.preference. -->
<androidx.appcompat.widget.SwitchCompat
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.appcompat.widget.SwitchCompat xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/switchWidget"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:padding="16dp"
android:focusable="false"/>
android:focusable="false"
android:padding="16dp" />
app/src/main/res/layout/progress_dialog_material.xml
+4 -5
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,10 +20,10 @@
<LinearLayout
android:id="@+id/body"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:baselineAligned="false"
android:orientation="horizontal"
android:paddingLeft="?attr/dialogPreferredPadding"
android:paddingTop="@dimen/dialog_padding_top_material"
android:paddingRight="?attr/dialogPreferredPadding"
@@ -35,8 +34,8 @@
style="?android:attr/progressBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:max="10000"
android:layout_marginRight="?attr/dialogPreferredPadding" />
android:layout_marginRight="?attr/dialogPreferredPadding"
android:max="10000" />
<TextView
android:id="@+id/message"
app/src/main/res/layout/scene_analytics.xml
+19 -22
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,43 +14,41 @@
~ limitations under the License.
-->
<LinearLayout
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:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/keyline_margin"
android:orientation="vertical">
android:orientation="vertical"
android:padding="@dimen/keyline_margin">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:padding="@dimen/keyline_margin"
app:srcCompat="@drawable/v_chart_accent_x48"/>
app:srcCompat="@drawable/v_chart_accent_x48" />
<com.hippo.widget.MaxSizeContainer
xmlns:app="http://schemas.android.com/apk/res-auto"
<com.hippo.widget.MaxSizeContainer xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_gravity="center_horizontal"
android:layout_weight="1"
app:maxWidth="@dimen/single_max_width">
<ScrollView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:paddingTop="@dimen/keyline_margin"
android:paddingBottom="@dimen/keyline_margin"
android:clipToPadding="false">
android:paddingBottom="@dimen/keyline_margin">
<TextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:lineSpacingExtra="8dp"
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/text_little_small"
android:lineSpacingExtra="8dp"/>
android:textSize="@dimen/text_little_small" />
</ScrollView>
@@ -59,15 +56,15 @@
<LinearLayout
android:id="@+id/buttonPanel"
style="?attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="bottom"
android:orientation="horizontal"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:gravity="bottom"
style="?attr/buttonBarStyle">
android:paddingRight="12dp"
android:paddingBottom="4dp">
<Button
android:id="@+id/reject"
@@ -75,9 +72,9 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/reject"
android:textColor="?attr/colorAccent"
android:textStyle="bold"
android:text="@string/reject"/>
android:textStyle="bold" />
<Button
android:id="@+id/accept"
@@ -85,9 +82,9 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/accept"
android:textColor="?attr/colorPrimary"
android:textStyle="bold"
android:text="@string/accept"/>
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>
app/src/main/res/layout/scene_cookie_sign_in.xml
+26 -30
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,37 +14,34 @@
~ limitations under the License.
-->
<LinearLayout
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"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/keyline_margin"
android:orientation="vertical">
android:orientation="vertical"
android:padding="@dimen/keyline_margin">
<ImageView
xmlns:app="http://schemas.android.com/apk/res-auto"
<ImageView xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:padding="@dimen/keyline_margin"
app:srcCompat="@drawable/v_cookie_brown_x48"/>
app:srcCompat="@drawable/v_cookie_brown_x48" />
<com.hippo.widget.MaxSizeContainer
xmlns:app="http://schemas.android.com/apk/res-auto"
<com.hippo.widget.MaxSizeContainer xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_gravity="center_horizontal"
android:layout_weight="1"
app:maxWidth="@dimen/single_max_width">
<ScrollView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:paddingTop="@dimen/keyline_margin"
android:paddingBottom="@dimen/keyline_margin"
android:clipToPadding="false">
android:paddingBottom="@dimen/keyline_margin">
<LinearLayout
android:layout_width="match_parent"
@@ -57,7 +53,7 @@
android:layout_height="wrap_content"
android:text="@string/cookie_explain"
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/text_little_small"/>
android:textSize="@dimen/text_little_small" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/ipb_member_id_layout"
@@ -65,8 +61,8 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/keyline_margin"
android:minWidth="@dimen/single_max_width"
android:hint="ipb_member_id">
android:hint="ipb_member_id"
android:minWidth="@dimen/single_max_width">
<com.hippo.widget.HackyTextInputEditText
android:id="@+id/ipb_member_id"
@@ -76,7 +72,7 @@
android:inputType="text"
android:maxLines="1"
android:singleLine="true"
tools:ignore="HardcodedText"/>
tools:ignore="HardcodedText" />
</com.google.android.material.textfield.TextInputLayout>
@@ -85,8 +81,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:minWidth="@dimen/single_max_width"
android:hint="ipb_pass_hash">
android:hint="ipb_pass_hash"
android:minWidth="@dimen/single_max_width">
<com.hippo.widget.HackyTextInputEditText
android:id="@+id/ipb_pass_hash"
@@ -96,7 +92,7 @@
android:inputType="text"
android:maxLines="1"
android:singleLine="true"
tools:ignore="HardcodedText"/>
tools:ignore="HardcodedText" />
</com.google.android.material.textfield.TextInputLayout>
@@ -105,8 +101,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:minWidth="@dimen/single_max_width"
android:hint="igneous">
android:hint="igneous"
android:minWidth="@dimen/single_max_width">
<com.hippo.widget.HackyTextInputEditText
android:id="@+id/igneous"
@@ -125,20 +121,20 @@
<LinearLayout
android:id="@+id/buttonPanel"
style="?attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="bottom"
android:orientation="horizontal"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:gravity="bottom"
style="?attr/buttonBarStyle">
android:paddingRight="12dp"
android:paddingBottom="4dp">
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1"/>
android:layout_weight="1" />
<Button
android:id="@+id/ok"
@@ -146,9 +142,9 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@android:string/ok"
android:textColor="?attr/colorPrimary"
android:textStyle="bold"
android:text="@android:string/ok"/>
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>
app/src/main/res/layout/scene_download.xml
+27 -24
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -28,7 +26,7 @@
<com.hippo.easyrecyclerview.EasyRecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent" />
<com.hippo.easyrecyclerview.FastScroller
android:id="@+id/fast_scroller"
@@ -36,24 +34,23 @@
android:layout_height="match_parent"
android:layout_gravity="right"
android:paddingLeft="20dp"
android:paddingRight="4dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"/>
android:paddingRight="4dp"
android:paddingBottom="8dp" />
</FrameLayout>
<TextView
android:id="@+id/tip"
style="@style/TextAppearance.AppCompat.Medium"
android:layout_width="228dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_horizontal"
android:drawablePadding="16dp"
android:text="@string/no_download_info"
style="@style/TextAppearance.AppCompat.Medium"/>
android:gravity="center_horizontal"
android:text="@string/no_download_info" />
<com.hippo.widget.FabLayout
xmlns:app="http://schemas.android.com/apk/res-auto"
<com.hippo.widget.FabLayout xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/fab_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -61,46 +58,52 @@
android:paddingBottom="@dimen/corner_fab_margin">
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/v_check_all_dark_x24"
app:backgroundTint="?attr/widgetColorThemeAccent"
style="@style/Widget.Design.FloatingActionButton.Mini"/>
app:fabSize="mini"
app:srcCompat="@drawable/v_check_all_dark_x24" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/v_play_dark_x24"
app:backgroundTint="?attr/widgetColorThemeAccent"
style="@style/Widget.Design.FloatingActionButton.Mini"/>
app:fabSize="mini"
app:srcCompat="@drawable/v_play_dark_x24" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/v_pause_dark_x24"
app:backgroundTint="?attr/widgetColorThemeAccent"
style="@style/Widget.Design.FloatingActionButton.Mini"/>
app:fabSize="mini"
app:srcCompat="@drawable/v_pause_dark_x24" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/v_delete_dark_x24"
app:backgroundTint="?attr/widgetColorThemeAccent"
style="@style/Widget.Design.FloatingActionButton.Mini"/>
app:fabSize="mini"
app:srcCompat="@drawable/v_delete_dark_x24" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/v_folder_move_dark_x24"
app:backgroundTint="?attr/widgetColorThemeAccent"
style="@style/Widget.Design.FloatingActionButton.Mini"/>
app:fabSize="mini"
app:srcCompat="@drawable/v_folder_move_dark_x24" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/v_close_dark_x24"
app:backgroundTint="?attr/widgetColorThemePrimary"
style="@style/Widget.Design.FloatingActionButton"/>
app:srcCompat="@drawable/v_close_dark_x24"
app:tint="#fff" />
</com.hippo.widget.FabLayout>
app/src/main/res/layout/scene_excluded_languages.xml
+22 -25
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
@@ -26,8 +24,8 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingLeft="@dimen/keyline_margin"
android:paddingRight="@dimen/keyline_margin"
android:paddingTop="8dp">
android:paddingTop="8dp"
android:paddingRight="@dimen/keyline_margin">
<TextView
android:id="@+id/cancel"
@@ -36,14 +34,14 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="@android:string/cancel"/>
android:text="@android:string/cancel" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:background="?attr/dividerColor"/>
android:background="?attr/dividerColor" />
<TextView
android:id="@+id/ok"
@@ -52,7 +50,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="@android:string/ok"/>
android:text="@android:string/ok" />
</LinearLayout>
@@ -61,8 +59,8 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingLeft="@dimen/keyline_margin"
android:paddingRight="@dimen/keyline_margin"
android:paddingTop="8dp">
android:paddingTop="8dp"
android:paddingRight="@dimen/keyline_margin">
<TextView
android:id="@+id/select_all"
@@ -71,14 +69,14 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="@string/select_all"/>
android:text="@string/select_all" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:background="?attr/dividerColor"/>
android:background="?attr/dividerColor" />
<TextView
android:id="@+id/deselect_all"
@@ -87,14 +85,14 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="@string/deselect_all"/>
android:text="@string/deselect_all" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:background="?attr/dividerColor"/>
android:background="?attr/dividerColor" />
<TextView
android:id="@+id/invert_selection"
@@ -103,43 +101,42 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="@string/invert_selection"/>
android:text="@string/invert_selection" />
</LinearLayout>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingLeft="@dimen/keyline_margin"
android:paddingRight="@dimen/keyline_margin"
android:paddingTop="8dp"
android:paddingRight="@dimen/keyline_margin"
android:paddingBottom="8dp">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/language"/>
android:text="@string/language" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/original"/>
android:text="@string/original" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/translated"/>
android:text="@string/translated" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/rewrite"/>
android:text="@string/rewrite" />
</LinearLayout>
@@ -148,7 +145,7 @@
android:layout_height="1dp"
android:layout_marginLeft="@dimen/keyline_margin"
android:layout_marginRight="@dimen/keyline_margin"
android:background="?attr/dividerColor"/>
android:background="?attr/dividerColor" />
<com.hippo.easyrecyclerview.EasyRecyclerView
android:id="@+id/recycler_view"
@@ -157,6 +154,6 @@
android:layout_weight="1"
android:paddingLeft="@dimen/keyline_margin"
android:paddingRight="@dimen/keyline_margin"
android:paddingBottom="8dp"/>
android:paddingBottom="8dp" />
</LinearLayout>
app/src/main/res/layout/scene_favorites.xml
+26 -23
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/main_layout"
android:layout_width="match_parent"
@@ -25,19 +23,18 @@
<com.hippo.widget.ContentLayout
android:id="@+id/content_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent" />
<com.hippo.ehviewer.widget.SearchBar
android:id="@+id/search_bar"
style="@style/CardView.Normal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/gallery_search_bar_margin_h"
android:layout_marginRight="@dimen/gallery_search_bar_margin_h"
android:layout_marginTop="@dimen/gallery_search_bar_margin_v"
style="@style/CardView.Normal"/>
android:layout_marginRight="@dimen/gallery_search_bar_margin_h" />
<com.hippo.widget.FabLayout
xmlns:app="http://schemas.android.com/apk/res-auto"
<com.hippo.widget.FabLayout xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/fab_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -45,48 +42,54 @@
android:paddingBottom="@dimen/corner_fab_margin">
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/v_go_to_dark_x24"
app:backgroundTint="?attr/widgetColorThemeAccent"
style="@style/Widget.Design.FloatingActionButton.Mini"/>
app:fabSize="mini"
app:srcCompat="@drawable/v_go_to_dark_x24" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/v_refresh_dark_x24"
app:backgroundTint="?attr/widgetColorThemeAccent"
style="@style/Widget.Design.FloatingActionButton.Mini"/>
app:fabSize="mini"
app:srcCompat="@drawable/v_refresh_dark_x24" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/v_download_dark_x24"
android:visibility="gone"
app:backgroundTint="?attr/widgetColorThemeAccent"
style="@style/Widget.Design.FloatingActionButton.Mini"
android:visibility="gone"/>
app:fabSize="mini"
app:srcCompat="@drawable/v_download_dark_x24" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/v_delete_dark_x24"
android:visibility="gone"
app:backgroundTint="?attr/widgetColorThemeAccent"
style="@style/Widget.Design.FloatingActionButton.Mini"
android:visibility="gone"/>
app:fabSize="mini"
app:srcCompat="@drawable/v_delete_dark_x24" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/v_folder_move_dark_x24"
android:visibility="gone"
app:backgroundTint="?attr/widgetColorThemeAccent"
style="@style/Widget.Design.FloatingActionButton.Mini"
android:visibility="gone"/>
app:fabSize="mini"
app:srcCompat="@drawable/v_folder_move_dark_x24" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:backgroundTint="?attr/widgetColorThemePrimary"
style="@style/Widget.Design.FloatingActionButton"/>
app:tint="#fff" />
</com.hippo.widget.FabLayout>
</FrameLayout>
app/src/main/res/layout/scene_gallery_comments.xml
+22 -24
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,67 +14,66 @@
~ limitations under the License.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">
<com.hippo.easyrecyclerview.EasyRecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"/>
android:clipToPadding="false" />
<TextView
android:id="@+id/tip"
style="@style/TextAppearance.AppCompat.Medium"
android:layout_width="228dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_horizontal"
android:drawablePadding="8dp"
android:text="@string/no_one_comments_gallery"
style="@style/TextAppearance.AppCompat.Medium"/>
android:gravity="center_horizontal"
android:text="@string/no_one_comments_gallery" />
<com.hippo.reveal.RevealLinearLayout
android:id="@+id/edit_panel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_gravity="bottom"
android:orientation="vertical"
android:visibility="invisible">
<View
android:layout_width="match_parent"
android:layout_height="4dp"
android:background="@drawable/shadow_top"/>
android:background="@drawable/shadow_top" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="?attr/contentColorThemePrimary">
android:background="?attr/contentColorThemePrimary"
android:orientation="horizontal">
<EditText
android:id="@+id/edit_text"
android:theme="@style/CommentEditText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:minHeight="56dp"
android:maxHeight="112dp"
android:gravity="left|center_vertical"
android:background="@null"
android:gravity="left|center_vertical"
android:inputType="textMultiLine"
android:maxHeight="112dp"
android:minHeight="56dp"
android:padding="@dimen/keyline_margin"
android:inputType="textMultiLine"/>
android:theme="@style/CommentEditText" />
<ImageView
android:id="@+id/send"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_gravity="bottom"
android:padding="16dp"/>
android:padding="16dp" />
</LinearLayout>
</com.hippo.reveal.RevealLinearLayout>
@@ -87,14 +85,14 @@
android:paddingRight="@dimen/corner_fab_margin"
android:paddingBottom="@dimen/corner_fab_margin">
<com.google.android.material.floatingactionbutton.FloatingActionButton
xmlns:app="http://schemas.android.com/apk/res-auto"
<com.google.android.material.floatingactionbutton.FloatingActionButton xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/fab"
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/v_reply_dark_x24"
app:backgroundTint="?attr/widgetColorThemePrimary"
style="@style/Widget.Design.FloatingActionButton"/>
app:srcCompat="@drawable/v_reply_dark_x24"
app:tint="#fff" />
</com.hippo.widget.FabLayout>
</FrameLayout>
app/src/main/res/layout/scene_gallery_detail.xml
+8 -11
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2015 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -25,11 +23,10 @@
android:id="@+id/scroll_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="none"
android:overScrollMode="never">
android:overScrollMode="never"
android:scrollbars="none">
<include
layout="@layout/gallery_detail_content"/>
<include layout="@layout/gallery_detail_content" />
</ScrollView>
@@ -38,15 +35,15 @@
style="@style/ProgressView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"/>
android:layout_gravity="center" />
<TextView
android:id="@+id/tip"
style="@style/TextAppearance.AppCompat.Medium"
android:layout_width="228dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_horizontal"
android:drawablePadding="8dp"
style="@style/TextAppearance.AppCompat.Medium"/>
android:gravity="center_horizontal" />
</FrameLayout>
app/src/main/res/layout/scene_gallery_info.xml
+3 -5
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2015 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +14,9 @@
~ limitations under the License.
-->
<com.hippo.easyrecyclerview.EasyRecyclerView
xmlns:android="http://schemas.android.com/apk/res/android"
<com.hippo.easyrecyclerview.EasyRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="@dimen/keyline_margin"
android:paddingBottom="@dimen/keyline_margin"/>
android:paddingBottom="@dimen/keyline_margin" />
app/src/main/res/layout/scene_gallery_list.xml
+21 -21
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/main_layout"
android:layout_width="match_parent"
@@ -25,24 +23,23 @@
<com.hippo.widget.ContentLayout
android:id="@+id/content_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent" />
<com.hippo.ehviewer.widget.SearchLayout
android:id="@+id/search_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent" />
<com.hippo.ehviewer.widget.SearchBar
android:id="@+id/search_bar"
style="@style/CardView.Normal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/gallery_search_bar_margin_h"
android:layout_marginRight="@dimen/gallery_search_bar_margin_h"
android:layout_marginTop="@dimen/gallery_search_bar_margin_v"
style="@style/CardView.Normal"/>
android:layout_marginRight="@dimen/gallery_search_bar_margin_h" />
<com.hippo.widget.FabLayout
xmlns:app="http://schemas.android.com/apk/res-auto"
<com.hippo.widget.FabLayout xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/fab_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -50,29 +47,31 @@
android:paddingBottom="@dimen/corner_fab_margin">
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/v_go_to_dark_x24"
app:backgroundTint="?attr/widgetColorThemeAccent"
style="@style/Widget.Design.FloatingActionButton.Mini"/>
app:fabSize="mini"
app:srcCompat="@drawable/v_go_to_dark_x24" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/v_refresh_dark_x24"
app:backgroundTint="?attr/widgetColorThemeAccent"
style="@style/Widget.Design.FloatingActionButton.Mini"/>
app:fabSize="mini"
app:srcCompat="@drawable/v_refresh_dark_x24" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:backgroundTint="?attr/widgetColorThemePrimary"
style="@style/Widget.Design.FloatingActionButton"/>
app:tint="#fff" />
</com.hippo.widget.FabLayout>
<com.hippo.widget.FabLayout
xmlns:app="http://schemas.android.com/apk/res-auto"
<com.hippo.widget.FabLayout xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingRight="@dimen/corner_fab_margin"
@@ -80,14 +79,15 @@
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/search_fab"
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/v_magnify_dark_x24"
app:backgroundTint="?attr/widgetColorThemeAccent"
android:visibility="invisible"
android:scaleX="0"
android:scaleY="0"
style="@style/Widget.Design.FloatingActionButton"/>
android:visibility="invisible"
app:backgroundTint="?attr/widgetColorThemeAccent"
app:srcCompat="@drawable/v_magnify_dark_x24"
app:tint="#fff" />
</com.hippo.widget.FabLayout>
</FrameLayout>
app/src/main/res/layout/scene_gallery_previews.xml
+3 -5
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<com.hippo.widget.ContentLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<com.hippo.widget.ContentLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/content_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent" />
app/src/main/res/layout/scene_history.xml
+8 -10
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -28,7 +26,7 @@
<com.hippo.easyrecyclerview.EasyRecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent" />
<com.hippo.easyrecyclerview.FastScroller
android:id="@+id/fast_scroller"
@@ -36,20 +34,20 @@
android:layout_height="match_parent"
android:layout_gravity="right"
android:paddingLeft="20dp"
android:paddingRight="4dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"/>
android:paddingRight="4dp"
android:paddingBottom="8dp" />
</FrameLayout>
<TextView
android:id="@+id/tip"
style="@style/TextAppearance.AppCompat.Medium"
android:layout_width="228dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_horizontal"
android:drawablePadding="16dp"
android:text="@string/no_history"
style="@style/TextAppearance.AppCompat.Medium"/>
android:gravity="center_horizontal"
android:text="@string/no_history" />
</FrameLayout>
app/src/main/res/layout/scene_label_list.xml
+6 -8
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -24,17 +22,17 @@
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/keyline_margin"
android:clipChildren="false"
android:clipToPadding="false"/>
android:clipToPadding="false"
android:padding="@dimen/keyline_margin" />
<TextView
android:id="@+id/tip"
style="@style/TextAppearance.AppCompat.Medium"
android:layout_width="228dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_horizontal"
android:drawablePadding="16dp"
style="@style/TextAppearance.AppCompat.Medium"/>
android:gravity="center_horizontal" />
</FrameLayout>
app/src/main/res/layout/scene_login.xml
+25 -27
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,12 +14,11 @@
~ limitations under the License.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">
<ScrollView
android:id="@+id/login_form"
@@ -39,16 +37,16 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:padding="@dimen/keyline_margin"
android:src="@mipmap/ic_launcher"/>
android:src="@mipmap/ic_launcher" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/username_layout"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:minWidth="@dimen/single_max_width"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:hint="@string/username">
android:hint="@string/username"
android:minWidth="@dimen/single_max_width">
<com.hippo.widget.HackyTextInputEditText
android:id="@+id/username"
@@ -57,18 +55,18 @@
android:imeOptions="actionNext"
android:inputType="text"
android:maxLines="1"
android:singleLine="true"/>
android:singleLine="true" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/password_layout"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:minWidth="@dimen/single_max_width"
android:hint="@string/password"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:minWidth="@dimen/single_max_width"
app:passwordToggleEnabled="true">
<com.hippo.widget.HackyTextInputEditText
@@ -78,26 +76,26 @@
android:imeOptions="actionDone"
android:inputType="textPassword"
android:maxLines="1"
android:singleLine="true"/>
android:singleLine="true" />
</com.google.android.material.textfield.TextInputLayout>
<Space
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"/>
android:layout_weight="1" />
<LinearLayout
android:id="@+id/buttonPanel"
style="?attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="bottom"
android:orientation="vertical"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:gravity="bottom"
style="?attr/buttonBarStyle">
android:paddingRight="12dp"
android:paddingBottom="4dp">
<Button
android:id="@+id/sign_in"
@@ -105,8 +103,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textStyle="bold"
android:text="@string/sign_in"/>
android:text="@string/sign_in"
android:textStyle="bold" />
<Button
android:id="@+id/register"
@@ -114,8 +112,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textStyle="bold"
android:text="@string/register"/>
android:text="@string/register"
android:textStyle="bold" />
</LinearLayout>
<TextView
@@ -125,7 +123,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginBottom="8dp"
android:text="@string/sign_in_via_webview"
android:textColor="?attr/textColorThemeAccent"/>
android:textColor="?attr/textColorThemeAccent" />
<TextView
android:id="@+id/sign_in_via_cookies"
@@ -134,7 +132,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginBottom="8dp"
android:text="@string/sign_in_via_cookies"
android:textColor="?attr/textColorThemeAccent"/>
android:textColor="?attr/textColorThemeAccent" />
<TextView
android:id="@+id/skip_signing_in"
@@ -142,7 +140,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/skip_signing_in"
android:textColor="?attr/textColorThemeAccent"/>
android:textColor="?attr/textColorThemeAccent" />
</LinearLayout>
</ScrollView>
@@ -159,7 +157,7 @@
style="@style/ProgressView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"/>
android:layout_gravity="center" />
</FrameLayout>
app/src/main/res/layout/scene_progress.xml
+6 -8
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -25,16 +23,16 @@
style="@style/ProgressView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"/>
android:layout_gravity="center" />
<TextView
android:id="@+id/tip"
style="@style/TextAppearance.AppCompat.Medium"
android:layout_width="228dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_horizontal"
android:drawablePadding="8dp"
android:text="@string/no_one_comments_gallery"
style="@style/TextAppearance.AppCompat.Medium"/>
android:gravity="center_horizontal"
android:text="@string/no_one_comments_gallery" />
</FrameLayout>
app/src/main/res/layout/scene_security.xml
+7 -10
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,19 +14,17 @@
~ limitations under the License.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.hippo.widget.MaxSizeContainer
xmlns:app="http://schemas.android.com/apk/res-auto"
<com.hippo.widget.MaxSizeContainer xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="32dp"
app:maxWidth="320dp"
app:maxHeight="360dp">
app:maxHeight="360dp"
app:maxWidth="320dp">
<LinearLayout
android:layout_width="wrap_content"
@@ -37,14 +34,14 @@
<com.hippo.widget.lockpattern.LockPatternView
android:id="@+id/pattern_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content" />
<ImageView
android:id="@+id/fingerprint_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_fp_40px"
android:layout_gravity="center_horizontal"
android:src="@drawable/ic_fp_40px"
android:visibility="gone" />
</LinearLayout>
app/src/main/res/layout/scene_select_site.xml
+22 -24
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,19 +14,17 @@
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/keyline_margin"
android:orientation="vertical">
android:orientation="vertical"
android:padding="@dimen/keyline_margin">
<com.hippo.widget.MaxSizeContainer
xmlns:app="http://schemas.android.com/apk/res-auto"
<com.hippo.widget.MaxSizeContainer xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_gravity="center_horizontal"
android:layout_weight="1"
app:maxWidth="@dimen/single_max_width">
<ScrollView
@@ -44,13 +41,13 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:text="@string/select_scene"/>
android:text="@string/select_scene"
android:textAppearance="@style/TextAppearance.AppCompat.Title" />
<Space
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1"/>
android:layout_weight="1" />
<RadioGroup
android:id="@+id/radio_group"
@@ -65,28 +62,28 @@
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/keyline_margin"
android:gravity="center_vertical"
android:textSize="@dimen/text_medium"
android:text="@string/site_e"/>
android:text="@string/site_e"
android:textSize="@dimen/text_medium" />
<RadioButton
android:id="@+id/site_ex"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:textSize="@dimen/text_medium"
android:text="@string/site_ex"/>
android:text="@string/site_ex"
android:textSize="@dimen/text_medium" />
</RadioGroup>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/select_scene_explain"/>
android:text="@string/select_scene_explain" />
<Space
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1"/>
android:layout_weight="1" />
</LinearLayout>
</ScrollView>
@@ -94,23 +91,24 @@
<LinearLayout
android:id="@+id/buttonPanel"
style="?attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="bottom"
android:orientation="horizontal"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:gravity="bottom"
style="?attr/buttonBarStyle">
android:paddingRight="12dp"
android:paddingBottom="4dp">
<Button
android:id="@+id/ok"
style="@style/Widget.MaterialComponents.Button"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textStyle="bold"
android:text="@android:string/ok"/>
android:text="@android:string/ok"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>
app/src/main/res/layout/scene_warning.xml
+18 -20
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,42 +14,41 @@
~ limitations under the License.
-->
<LinearLayout
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:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/keyline_margin"
android:orientation="vertical">
android:orientation="vertical"
android:padding="@dimen/keyline_margin">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:padding="@dimen/keyline_margin"
app:srcCompat="@drawable/v_alert_red_x48"/>
app:srcCompat="@drawable/v_alert_red_x48" />
<com.hippo.widget.MaxSizeContainer
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_gravity="center_horizontal"
android:layout_weight="1"
app:maxWidth="@dimen/single_max_width">
<ScrollView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:paddingTop="@dimen/keyline_margin"
android:paddingBottom="@dimen/keyline_margin"
android:clipToPadding="false">
android:paddingBottom="@dimen/keyline_margin">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:lineSpacingExtra="8dp"
android:text="@string/app_waring"
android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/text_little_small"
android:lineSpacingExtra="8dp"/>
android:textSize="@dimen/text_little_small" />
</ScrollView>
@@ -58,15 +56,15 @@
<LinearLayout
android:id="@+id/buttonPanel"
style="?attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="bottom"
android:orientation="vertical"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:gravity="bottom"
style="?attr/buttonBarStyle">
android:paddingRight="12dp"
android:paddingBottom="4dp">
<Button
android:id="@+id/accept"
@@ -74,8 +72,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textStyle="bold"
android:text="@string/accept"/>
android:text="@string/accept"
android:textStyle="bold" />
<Button
android:id="@+id/reject"
@@ -83,8 +81,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textStyle="bold"
android:text="@string/reject"/>
android:text="@string/reject"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>
app/src/main/res/layout/search_action.xml
+7 -9
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2015 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,25 +13,24 @@
~ limitations under the License.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="?attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
style="?attr/buttonBarStyle">
android:orientation="horizontal">
<Button
android:id="@+id/action"
style="@style/Widget.MaterialComponents.Button.TextButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="?attr/colorPrimary"
android:textStyle="bold"
style="@style/Widget.MaterialComponents.Button.TextButton"/>
android:textStyle="bold" />
<Space
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"/>
android:layout_weight="1" />
</LinearLayout>
app/src/main/res/layout/search_advance.xml
+3 -5
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2015 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +13,7 @@
~ limitations under the License.
-->
<com.hippo.ehviewer.widget.AdvanceSearchTable
xmlns:android="http://schemas.android.com/apk/res/android"
<com.hippo.ehviewer.widget.AdvanceSearchTable xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/search_advance_search_table"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content" />
app/src/main/res/layout/search_category.xml
+6 -8
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2015 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,12 +13,11 @@
~ limitations under the License.
-->
<com.google.android.material.card.MaterialCardView
xmlns:android="http://schemas.android.com/apk/res/android"
<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/CardView.Normal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="2dp"
style="@style/CardView.Normal">
android:layout_margin="2dp">
<LinearLayout
android:layout_width="match_parent"
@@ -34,12 +32,12 @@
style="@style/CategoryTitle"
android:layout_width="match_parent"
android:layout_height="@dimen/search_category_title_height"
android:saveEnabled="false"/>
android:saveEnabled="false" />
<FrameLayout
android:id="@+id/category_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
app/src/main/res/layout/search_image.xml
+3 -5
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
~ limitations under the License.
-->
<com.hippo.ehviewer.widget.ImageSearchLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<com.hippo.ehviewer.widget.ImageSearchLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/search_image"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content" />
app/src/main/res/layout/search_normal.xml
+12 -14
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2015 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +13,7 @@
~ limitations under the License.
-->
<LinearLayout
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:layout_width="match_parent"
android:layout_height="match_parent"
@@ -25,40 +23,40 @@
android:id="@+id/search_category_table"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/search_item_interval"/>
android:layout_marginBottom="@dimen/search_item_interval" />
<com.hippo.widget.RadioGridGroup
android:id="@+id/normal_search_mode"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checkedButton="@+id/search_normal_search"
android:orientation="vertical"
android:paddingTop="@dimen/search_item_interval"
android:checkedButton="@+id/search_normal_search"
app:columnCount="2">
<androidx.appcompat.widget.AppCompatRadioButton
android:id="@+id/search_normal_search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/search_normal_search"/>
android:text="@string/search_normal_search" />
<androidx.appcompat.widget.AppCompatRadioButton
android:id="@+id/search_subscription_search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/search_subscription_search"/>
android:text="@string/search_subscription_search" />
<androidx.appcompat.widget.AppCompatRadioButton
android:id="@+id/search_specify_uploader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/search_specify_uploader"/>
android:text="@string/search_specify_uploader" />
<androidx.appcompat.widget.AppCompatRadioButton
android:id="@+id/search_specify_tag"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/search_specify_tag"/>
android:text="@string/search_specify_tag" />
</com.hippo.widget.RadioGridGroup>
@@ -71,21 +69,21 @@
android:id="@+id/normal_search_mode_help"
android:layout_width="36dp"
android:layout_height="36dp"
android:padding="6dp"
android:background="?selectableItemBackgroundBorderless"
app:srcCompat="@drawable/v_help_circle_x24"/>
android:padding="6dp"
app:srcCompat="@drawable/v_help_circle_x24" />
<Space
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"/>
android:layout_weight="1" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/search_enable_advance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:text="@string/search_enable_advance"/>
android:text="@string/search_enable_advance" />
</LinearLayout>
</LinearLayout>
app/src/main/res/layout/widget_advance_search_table.xml
+54 -56
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2015 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,8 +12,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<merge
xmlns:android="http://schemas.android.com/apk/res/android">
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:layout_width="match_parent"
@@ -24,20 +22,20 @@
<CheckBox
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginRight="@dimen/advance_search_table_item_margin"
android:layout_gravity="center_vertical"
android:layout_marginRight="@dimen/advance_search_table_item_margin"
android:layout_weight="1"
android:checked="true"
android:text="@string/search_sname"/>
android:text="@string/search_sname" />
<CheckBox
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginLeft="@dimen/advance_search_table_item_margin"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/advance_search_table_item_margin"
android:layout_weight="1"
android:checked="true"
android:text="@string/search_stags"/>
android:text="@string/search_stags" />
</LinearLayout>
<LinearLayout
@@ -49,18 +47,18 @@
<CheckBox
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginRight="@dimen/advance_search_table_item_margin"
android:layout_gravity="center_vertical"
android:text="@string/search_sdesc"/>
android:layout_marginRight="@dimen/advance_search_table_item_margin"
android:layout_weight="1"
android:text="@string/search_sdesc" />
<CheckBox
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/advance_search_table_item_margin"
android:layout_gravity="center_vertical"
android:text="@string/search_storr"/>
android:layout_weight="1"
android:text="@string/search_storr" />
</LinearLayout>
<LinearLayout
@@ -72,18 +70,18 @@
<CheckBox
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginRight="@dimen/advance_search_table_item_margin"
android:layout_gravity="center_vertical"
android:text="@string/search_sto"/>
android:layout_marginRight="@dimen/advance_search_table_item_margin"
android:layout_weight="1"
android:text="@string/search_sto" />
<CheckBox
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/advance_search_table_item_margin"
android:layout_gravity="center_vertical"
android:text="@string/search_sdt1"/>
android:layout_weight="1"
android:text="@string/search_sdt1" />
</LinearLayout>
<LinearLayout
@@ -95,18 +93,18 @@
<CheckBox
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginRight="@dimen/advance_search_table_item_margin"
android:layout_gravity="center_vertical"
android:text="@string/search_sdt2"/>
android:layout_marginRight="@dimen/advance_search_table_item_margin"
android:layout_weight="1"
android:text="@string/search_sdt2" />
<CheckBox
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/advance_search_table_item_margin"
android:layout_gravity="center_vertical"
android:text="@string/search_sh"/>
android:layout_weight="1"
android:text="@string/search_sh" />
</LinearLayout>
<LinearLayout
@@ -118,18 +116,18 @@
<CheckBox
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginRight="@dimen/advance_search_table_item_margin"
android:layout_gravity="center_vertical"
android:text="@string/search_sr"/>
android:layout_marginRight="@dimen/advance_search_table_item_margin"
android:layout_weight="1"
android:text="@string/search_sr" />
<Spinner
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginLeft="@dimen/advance_search_table_item_margin"
android:layout_gravity="center_vertical"
android:entries="@array/search_min_rating"/>
android:layout_marginLeft="@dimen/advance_search_table_item_margin"
android:layout_weight="1"
android:entries="@array/search_min_rating" />
</LinearLayout>
<LinearLayout
@@ -141,48 +139,48 @@
<CheckBox
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/advance_search_table_item_margin"
android:layout_gravity="center_vertical"
android:text="@string/search_sp"/>
android:layout_marginRight="@dimen/advance_search_table_item_margin"
android:text="@string/search_sp" />
<EditText
android:id="@+id/spf"
android:layout_width="64dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/advance_search_table_item_margin"
android:layout_marginRight="@dimen/advance_search_table_item_margin"
android:layout_gravity="center_vertical"
android:imeOptions="actionNext"
android:inputType="number"
android:maxLines="1"
android:imeOptions="actionNext"/>
android:maxLines="1" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/advance_search_table_item_margin"
android:layout_marginRight="@dimen/advance_search_table_item_margin"
android:layout_gravity="center_vertical"
android:text="@string/search_sp_to"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary" />
<EditText
android:id="@+id/spt"
android:layout_width="64dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/advance_search_table_item_margin"
android:layout_marginRight="@dimen/advance_search_table_item_margin"
android:layout_gravity="center_vertical"
android:imeOptions="actionNone"
android:inputType="number"
android:maxLines="1"
android:imeOptions="actionNone"/>
android:maxLines="1" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/advance_search_table_item_margin"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/advance_search_table_item_margin"
android:text="@string/search_sp_suffix"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary" />
</LinearLayout>
<LinearLayout
@@ -196,7 +194,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/search_sf"
android:textColor="?android:attr/textColorPrimary"/>
android:textColor="?android:attr/textColorPrimary" />
</LinearLayout>
<LinearLayout
@@ -207,26 +205,26 @@
<CheckBox
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginRight="@dimen/advance_search_table_item_margin"
android:layout_gravity="center_vertical"
android:text="@string/search_sfl"/>
android:layout_marginRight="@dimen/advance_search_table_item_margin"
android:layout_weight="1"
android:text="@string/search_sfl" />
<CheckBox
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/advance_search_table_item_margin"
android:layout_marginRight="@dimen/advance_search_table_item_margin"
android:layout_gravity="center_vertical"
android:text="@string/search_sfu"/>
android:layout_weight="1"
android:text="@string/search_sfu" />
<CheckBox
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginLeft="@dimen/advance_search_table_item_margin"
android:layout_gravity="center_vertical"
android:text="@string/search_sft"/>
android:layout_marginLeft="@dimen/advance_search_table_item_margin"
android:layout_weight="1"
android:text="@string/search_sft" />
</LinearLayout>
</merge>
app/src/main/res/layout/widget_category_table.xml
+52 -49
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2015 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,133 +13,137 @@
~ limitations under the License.
-->
<merge
xmlns:android="http://schemas.android.com/apk/res/android" >
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<TableRow>
<com.hippo.widget.CheckTextView
style="@style/CategoryText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginBottom="@dimen/category_table_item_margin"
android:layout_marginRight="@dimen/category_table_item_margin"
android:layout_marginBottom="@dimen/category_table_item_margin"
android:layout_weight="1"
android:background="@color/doujinshi"
android:textColor="@android:color/white"
android:text="@string/doujinshi" />
android:text="@string/doujinshi"
android:textColor="@android:color/white" />
<com.hippo.widget.CheckTextView
style="@style/CategoryText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginBottom="@dimen/category_table_item_margin"
android:layout_marginLeft="@dimen/category_table_item_margin"
android:layout_marginBottom="@dimen/category_table_item_margin"
android:layout_weight="1"
android:background="@color/manga"
android:textColor="@android:color/white"
android:text="@string/manga" />
android:text="@string/manga"
android:textColor="@android:color/white" />
</TableRow>
<TableRow>
<com.hippo.widget.CheckTextView
style="@style/CategoryText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginTop="@dimen/category_table_item_margin"
android:layout_marginBottom="@dimen/category_table_item_margin"
android:layout_marginRight="@dimen/category_table_item_margin"
android:layout_marginBottom="@dimen/category_table_item_margin"
android:layout_weight="1"
android:background="@color/artist_cg"
android:textColor="@android:color/white"
android:text="@string/artist_cg" />
android:text="@string/artist_cg"
android:textColor="@android:color/white" />
<com.hippo.widget.CheckTextView
style="@style/CategoryText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginLeft="@dimen/category_table_item_margin"
android:layout_marginTop="@dimen/category_table_item_margin"
android:layout_marginBottom="@dimen/category_table_item_margin"
android:layout_marginLeft="@dimen/category_table_item_margin"
android:layout_weight="1"
android:background="@color/game_cg"
android:textColor="@android:color/white"
android:text="@string/game_cg" />
android:text="@string/game_cg"
android:textColor="@android:color/white" />
</TableRow>
<TableRow>
<com.hippo.widget.CheckTextView
style="@style/CategoryText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginTop="@dimen/category_table_item_margin"
android:layout_marginBottom="@dimen/category_table_item_margin"
android:layout_marginRight="@dimen/category_table_item_margin"
android:layout_marginBottom="@dimen/category_table_item_margin"
android:layout_weight="1"
android:background="@color/western"
android:textColor="@android:color/white"
android:text="@string/western" />
android:text="@string/western"
android:textColor="@android:color/white" />
<com.hippo.widget.CheckTextView
style="@style/CategoryText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginLeft="@dimen/category_table_item_margin"
android:layout_marginTop="@dimen/category_table_item_margin"
android:layout_marginBottom="@dimen/category_table_item_margin"
android:layout_marginLeft="@dimen/category_table_item_margin"
android:layout_weight="1"
android:background="@color/non_h"
android:textColor="@android:color/white"
android:text="@string/non_h" />
android:text="@string/non_h"
android:textColor="@android:color/white" />
</TableRow>
<TableRow>
<com.hippo.widget.CheckTextView
style="@style/CategoryText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginTop="@dimen/category_table_item_margin"
android:layout_marginBottom="@dimen/category_table_item_margin"
android:layout_marginRight="@dimen/category_table_item_margin"
android:layout_marginBottom="@dimen/category_table_item_margin"
android:layout_weight="1"
android:background="@color/image_set"
android:textColor="@android:color/white"
android:text="@string/image_set" />
android:text="@string/image_set"
android:textColor="@android:color/white" />
<com.hippo.widget.CheckTextView
style="@style/CategoryText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginLeft="@dimen/category_table_item_margin"
android:layout_marginTop="@dimen/category_table_item_margin"
android:layout_marginBottom="@dimen/category_table_item_margin"
android:layout_marginLeft="@dimen/category_table_item_margin"
android:layout_weight="1"
android:background="@color/cosplay"
android:textColor="@android:color/white"
android:text="@string/cosplay" />
android:text="@string/cosplay"
android:textColor="@android:color/white" />
</TableRow>
<TableRow>
<com.hippo.widget.CheckTextView
style="@style/CategoryText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginTop="@dimen/category_table_item_margin"
android:layout_marginRight="@dimen/category_table_item_margin"
android:background="@color/asian_porn"
android:textColor="@android:color/white"
android:text="@string/asian_porn" />
<com.hippo.widget.CheckTextView
style="@style/CategoryText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginTop="@dimen/category_table_item_margin"
android:layout_marginRight="@dimen/category_table_item_margin"
android:layout_weight="1"
android:background="@color/asian_porn"
android:text="@string/asian_porn"
android:textColor="@android:color/white" />
<com.hippo.widget.CheckTextView
style="@style/CategoryText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/category_table_item_margin"
android:layout_marginTop="@dimen/category_table_item_margin"
android:layout_weight="1"
android:background="@color/misc"
android:textColor="@android:color/white"
android:text="@string/misc" />
android:text="@string/misc"
android:textColor="@android:color/white" />
</TableRow>
</merge>
app/src/main/res/layout/widget_content_layout.xml
+8 -10
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2015 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,24 +14,23 @@
~ limitations under the License.
-->
<merge
xmlns:android="http://schemas.android.com/apk/res/android">
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<com.hippo.widget.ProgressView
android:id="@+id/progress"
style="@style/ProgressView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"/>
android:layout_gravity="center" />
<TextView
android:id="@+id/tip"
style="@style/TextAppearance.AppCompat.Medium"
android:layout_width="228dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_horizontal"
android:drawablePadding="8dp"
style="@style/TextAppearance.AppCompat.Medium"/>
android:gravity="center_horizontal" />
<FrameLayout
android:id="@+id/content_view"
@@ -48,7 +46,7 @@
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"/>
android:clipToPadding="false" />
</com.hippo.refreshlayout.RefreshLayout>
@@ -58,9 +56,9 @@
android:layout_height="match_parent"
android:layout_gravity="right"
android:paddingLeft="20dp"
android:paddingRight="4dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"/>
android:paddingRight="4dp"
android:paddingBottom="8dp" />
</FrameLayout>
app/src/main/res/layout/widget_gallery_guide_1.xml
+10 -12
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,35 +14,34 @@
~ limitations under the License.
-->
<merge
xmlns:android="http://schemas.android.com/apk/res/android">
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<TextView
style="@style/Guide.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/guide_gallery_left"
android:gravity="center"
style="@style/Guide.Title"/>
android:text="@string/guide_gallery_left" />
<TextView
style="@style/Guide.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/guide_gallery_right"
android:gravity="center"
style="@style/Guide.Title"/>
android:text="@string/guide_gallery_right" />
<TextView
style="@style/Guide.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/guide_gallery_menu"
android:gravity="center"
style="@style/Guide.Title"/>
android:text="@string/guide_gallery_menu" />
<TextView
style="@style/Guide.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/guide_gallery_progress"
android:gravity="center"
style="@style/Guide.Title"/>
android:text="@string/guide_gallery_progress" />
</merge>
app/src/main/res/layout/widget_gallery_guide_2.xml
+4 -6
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,14 +14,13 @@
~ limitations under the License.
-->
<merge
xmlns:android="http://schemas.android.com/apk/res/android">
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<TextView
style="@style/Guide.Title"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/guide_gallery_long_click"
style="@style/Guide.Title"/>
android:text="@string/guide_gallery_long_click" />
</merge>
app/src/main/res/layout/widget_image_search.xml
+19 -19
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2016 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,71 +14,72 @@
~ limitations under the License.
-->
<merge
xmlns:android="http://schemas.android.com/apk/res/android">
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<com.hippo.widget.FixedAspectImageView
android:id="@+id/preview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:adjustViewBounds="true"
android:maxWidth="@dimen/image_search_max_size"
android:maxHeight="@dimen/image_search_max_size"
android:adjustViewBounds="true"
android:visibility="gone"/>
android:visibility="gone" />
<Button
android:id="@+id/select_image"
style="@style/Widget.MaterialComponents.Button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/select_image"
style="@style/Widget.MaterialComponents.Button"/>
android:text="@string/select_image" />
<TableLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TableRow>
<CheckBox
android:id="@+id/search_uss"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginBottom="@dimen/advance_search_table_item_margin"
android:layout_marginRight="@dimen/advance_search_table_item_margin"
android:layout_marginBottom="@dimen/advance_search_table_item_margin"
android:layout_weight="1"
android:checked="true"
android:text="@string/search_uss"/>
android:text="@string/search_uss" />
<CheckBox
android:id="@+id/search_osc"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginBottom="@dimen/advance_search_table_item_margin"
android:layout_marginLeft="@dimen/advance_search_table_item_margin"
android:layout_marginBottom="@dimen/advance_search_table_item_margin"
android:layout_weight="1"
android:checked="false"
android:text="@string/search_osc"/>
android:text="@string/search_osc" />
</TableRow>
<TableRow>
<CheckBox
android:id="@+id/search_se"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginTop="@dimen/advance_search_table_item_margin"
android:layout_marginRight="@dimen/advance_search_table_item_margin"
android:layout_weight="1"
android:checked="false"
android:text="@string/search_se"/>
android:text="@string/search_se" />
<Space
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginTop="@dimen/advance_search_table_item_margin"
android:layout_marginLeft="@dimen/advance_search_table_item_margin"
android:checked="false"/>
android:layout_marginTop="@dimen/advance_search_table_item_margin"
android:layout_weight="1"
android:checked="false" />
</TableRow>
</TableLayout>
app/src/main/res/layout/widget_search_bar.xml
+14 -16
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2015 Hippo Seven
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,8 +13,7 @@
~ limitations under the License.
-->
<merge
xmlns:android="http://schemas.android.com/apk/res/android">
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:layout_width="match_parent"
@@ -31,7 +29,7 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_gravity="left|center_vertical"
android:padding="12dp"/>
android:padding="12dp" />
<TextView
android:id="@+id/search_title"
@@ -40,17 +38,17 @@
android:layout_gravity="center_vertical"
android:layout_marginLeft="48dp"
android:layout_marginRight="48dp"
android:textSize="@dimen/text_little_large"
android:textColor="?android:attr/textColorSecondary"
android:maxLines="1"
android:singleLine="true"
android:maxLines="1"/>
android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/text_little_large" />
<ImageView
android:id="@+id/search_action"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_gravity="right|center_vertical"
android:padding="12dp"/>
android:padding="12dp" />
<com.hippo.ehviewer.widget.SearchEditText
android:id="@+id/search_edit_text"
@@ -59,13 +57,13 @@
android:layout_gravity="center_vertical"
android:layout_marginLeft="48dp"
android:layout_marginRight="48dp"
android:textSize="@dimen/text_little_small"
android:background="@null"
android:singleLine="true"
android:maxLines="1"
android:visibility="gone"
android:imeOptions="actionSearch"
android:inputType="text"/>
android:inputType="text"
android:maxLines="1"
android:singleLine="true"
android:textSize="@dimen/text_little_small"
android:visibility="gone" />
</FrameLayout>
@@ -80,14 +78,14 @@
android:id="@+id/list_header"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?attr/dividerColor"/>
android:background="?attr/dividerColor" />
<ListView
android:id="@+id/search_bar_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:divider="?attr/dividerColor"
android:dividerHeight="1dp"/>
android:dividerHeight="1dp" />
</LinearLayout>
</LinearLayout>