Sulkta-OSS/straw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7004 from litetex/fix-showTextError-and-rework-ErrorPanel

Browse source 
Reworked the ErrorPanel
This commit is contained in:
Stypox 2021-08-31 18:26:51 +02:00 • committed by GitHub
commit faa7a91764
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 88 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/src/main/res/layout/error_panel.xml
View file

@ -21,14 +21,16 @@
android:id="@+id/error_message_service_info_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginTop="6dp"
android:gravity="center"
android:text="@string/general_error"
android:textSize="16sp"
tools:text="YouTube provides this reason:" />
android:visibility="gone"
tools:text="YouTube provides this reason:"
tools:visibility="visible" />
<TextView
android:id="@+id/error_message_service_explenation_view"
android:id="@+id/error_message_service_explanation_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
@ -36,11 +38,13 @@
android:text="@string/general_error"
android:textSize="16sp"
android:textStyle="italic"
tools:text="This account has been terminated because we received multiple third-party claims of copyright infringement regarding material that the user posted." />
android:visibility="gone"
tools:text="This account has been terminated because we received multiple third-party claims of copyright infringement regarding material that the user posted."
tools:visibility="visible" />
<Button
android:id="@+id/error_button_action"
android:id="@+id/error_action_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
@ -49,10 +53,12 @@
android:textAllCaps="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textSize="16sp"
android:theme="@style/ServiceColoredButton" />
android:theme="@style/ServiceColoredButton"
android:visibility="gone"
tools:visibility="visible" />
<Button
android:id="@+id/error_button_retry"
android:id="@+id/error_retry_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
@ -62,6 +68,8 @@
android:textAllCaps="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textSize="16sp"
android:theme="@style/ServiceColoredButton" />
android:theme="@style/ServiceColoredButton"
android:visibility="gone"
tools:visibility="visible" />
</LinearLayout>