mirror of https://github.com/tuskyapp/Tusky.git
Browse Source
* 3408: First draft of help message on empty home timeline * 3408: Move image spanning to utils; tweak gui a bit (looks like status) * 3408: Use proper R again; appease linter * 3408: Add doc; remove narrow comment * 3408: null is default * 3408: Add German text * 3408: Stack refresh animation on top of help message (reorder)pull/3485/head
9 changed files with 200 additions and 93 deletions
@ -0,0 +1,14 @@ |
|||||||
|
<?xml version="1.0" encoding="utf-8"?> |
||||||
|
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> |
||||||
|
<item |
||||||
|
android:bottom="1dp" |
||||||
|
android:left="-1dp" |
||||||
|
android:right="-1dp" |
||||||
|
android:top="1dp"> |
||||||
|
|
||||||
|
<shape android:shape="rectangle"> |
||||||
|
<solid android:color="?attr/colorBackgroundAccent"/> |
||||||
|
<stroke android:width="1dp" android:color="?attr/dividerColor"/> |
||||||
|
</shape> |
||||||
|
</item> |
||||||
|
</layer-list> |
||||||
@ -1,39 +1,60 @@ |
|||||||
<?xml version="1.0" encoding="utf-8"?> |
<?xml version="1.0" encoding="utf-8"?> |
||||||
<merge xmlns:android="http://schemas.android.com/apk/res/android" |
<merge xmlns:android="http://schemas.android.com/apk/res/android" |
||||||
xmlns:tools="http://schemas.android.com/tools" |
xmlns:tools="http://schemas.android.com/tools" |
||||||
tools:gravity="center_horizontal" |
android:layout_width="match_parent" |
||||||
tools:orientation="vertical" |
android:layout_height="match_parent" |
||||||
|
android:orientation="vertical" |
||||||
tools:parentTag="android.widget.LinearLayout"> |
tools:parentTag="android.widget.LinearLayout"> |
||||||
|
|
||||||
<ImageView |
<TextView |
||||||
android:id="@+id/imageView" |
android:id="@+id/helpText" |
||||||
|
android:visibility="gone" |
||||||
|
android:layout_width="match_parent" |
||||||
|
android:layout_height="wrap_content" |
||||||
|
android:lineSpacingMultiplier="1.1" |
||||||
|
android:textColor="@color/textColorPrimary" |
||||||
|
android:background="@drawable/help_message_background" |
||||||
|
android:layout_marginTop="16dp" |
||||||
|
android:padding="16dp" |
||||||
|
android:textAlignment="viewStart" |
||||||
|
android:textSize="?attr/status_text_medium" /> |
||||||
|
|
||||||
|
<LinearLayout |
||||||
android:layout_width="match_parent" |
android:layout_width="match_parent" |
||||||
android:layout_height="0dp" |
android:layout_height="0dp" |
||||||
android:layout_marginTop="4dp" |
|
||||||
android:layout_weight="1" |
android:layout_weight="1" |
||||||
android:contentDescription="@null" |
android:gravity="center" |
||||||
android:scaleType="centerInside" |
android:orientation="vertical"> |
||||||
tools:src="@drawable/elephant_offline" /> |
|
||||||
|
|
||||||
<TextView |
<ImageView |
||||||
android:id="@+id/messageTextView" |
android:id="@+id/imageView" |
||||||
android:layout_width="wrap_content" |
android:layout_width="match_parent" |
||||||
android:layout_height="wrap_content" |
android:layout_height="wrap_content" |
||||||
android:drawablePadding="16dp" |
android:layout_marginTop="4dp" |
||||||
android:lineSpacingMultiplier="1.1" |
android:contentDescription="@null" |
||||||
android:paddingLeft="16dp" |
android:scaleType="centerInside" |
||||||
android:paddingTop="16dp" |
android:src="@drawable/elephant_offline" /> |
||||||
android:paddingRight="16dp" |
|
||||||
android:textAlignment="center" |
|
||||||
android:textSize="?attr/status_text_medium" |
|
||||||
tools:text="@string/error_network" /> |
|
||||||
|
|
||||||
<Button |
<TextView |
||||||
android:id="@+id/button" |
android:id="@+id/messageTextView" |
||||||
style="@style/TuskyButton.Outlined" |
android:layout_width="match_parent" |
||||||
android:layout_width="wrap_content" |
android:layout_height="wrap_content" |
||||||
android:layout_height="wrap_content" |
android:drawablePadding="16dp" |
||||||
android:layout_marginTop="8dp" |
android:lineSpacingMultiplier="1.1" |
||||||
android:layout_marginBottom="4dp" |
android:paddingLeft="16dp" |
||||||
android:text="@string/action_retry" /> |
android:paddingRight="16dp" |
||||||
|
android:paddingTop="16dp" |
||||||
|
android:text="@string/error_network" |
||||||
|
android:textAlignment="center" |
||||||
|
android:textSize="?attr/status_text_medium" /> |
||||||
|
|
||||||
|
<Button |
||||||
|
android:id="@+id/button" |
||||||
|
style="@style/TuskyButton.Outlined" |
||||||
|
android:layout_width="wrap_content" |
||||||
|
android:layout_height="wrap_content" |
||||||
|
android:layout_marginBottom="4dp" |
||||||
|
android:layout_marginTop="8dp" |
||||||
|
android:text="@string/action_retry" /> |
||||||
|
</LinearLayout> |
||||||
</merge> |
</merge> |
||||||
|
|||||||
Loading…
Reference in new issue