mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-11-07 17:48:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add additional advanced options to login screen

Browse Source 
Add "more" button into global search results
Retry-all button is now more explicit on what was retried
Minor performance fix in hitomi search
This commit is contained in:
NerdNumber9
2018-07-08 17:53:03 -04:00
parent 30c12fc9de
commit 28d05b629f
11 changed files with 197 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/res/layout/catalogue_global_search_controller_card.xml
View File

@@ -18,6 +18,17 @@
app:layout_constraintTop_toTopOf="parent"
tools:text="Title" />
<Button
android:id="@+id/more"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="More"
style="@style/Widget.AppCompat.Button.Borderless"
app:layout_constraintBottom_toTopOf="@+id/source_card"
app:layout_constraintHeight_default="wrap"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<android.support.v7.widget.CardView
android:id="@+id/source_card"
style="@style/Theme.Widget.CardView.Item"

106
app/src/main/res/layout/eh_activity_login.xml
View File

@@ -21,42 +21,106 @@
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:animateLayoutChanges="true">
<android.support.v7.widget.CardView
android:id="@+id/advanced_options"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/linearLayout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/webview"
tools:visibility="visible">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_x="0dp"
android:layout_y="0dp"
android:background="?android:attr/colorBackground"
android:orientation="vertical">
<Button
android:id="@+id/btn_recheck"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Recheck login status" />
<Button
android:id="@+id/btn_alt_login"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Alternative login page" />
<Button
android:id="@+id/btn_skip_restyle"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Skip page restyling" />
<Button
android:id="@+id/btn_close"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Close" />
</LinearLayout>
</android.support.v7.widget.CardView>
<View
android:id="@+id/adv_shim"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="#b5000000"
android:clickable="true"
android:visibility="gone" />
<WebView
android:id="@+id/webview"
android:layout_width="0dp"
app:layout_constraintBottom_toTopOf="@+id/linearLayout"
android:layout_height="0dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0"
app:layout_constraintBottom_toTopOf="@+id/linearLayout"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" />
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0">
</WebView>
<LinearLayout
android:orientation="horizontal"
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:id="@+id/linearLayout"
android:layout_width="0dp"
android:id="@+id/linearLayout">
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent">
<Button
android:text="@android:string/cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/btn_cancel"
android:layout_weight="1"
style="@style/Widget.AppCompat.Button.Borderless" />
<Button
android:text="Recheck"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/btn_recheck"
android:layout_weight="1"
style="@style/Widget.AppCompat.Button.Borderless" />
android:text="@android:string/cancel" />
<Button
android:id="@+id/btn_advanced"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Advanced" />
</LinearLayout>
</android.support.constraint.ConstraintLayout>