-
Notifications
You must be signed in to change notification settings - Fork 69
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #46 from Redth/bugfix/center-status
Ensure status text is centered
- Loading branch information
Showing
3 changed files
with
42 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,27 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:tools="http://schemas.android.com/tools" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:orientation="vertical" | ||
| android:background="@drawable/roundedbg" | ||
| android:clickable="true" | ||
| android:padding="16dp"> | ||
| <ProgressBar | ||
| android:id="@+id/loadingProgressBar" | ||
| android:layout_alignParentTop="true" | ||
| android:layout_centerHorizontal="true" | ||
| android:layout_width="48dp" | ||
| android:layout_height="48dp" | ||
| android:layout_gravity="center_horizontal|center_vertical" /> | ||
| android:layout_height="48dp" /> | ||
| <TextView | ||
| android:id="@+id/textViewStatus" | ||
| android:text="Loading..." | ||
| android:textAppearance="?android:attr/textAppearanceSmall" | ||
| android:layout_below="@id/loadingProgressBar" | ||
| android:layout_centerHorizontal="true" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:id="@+id/textViewStatus" | ||
| android:gravity="center_horizontal" | ||
| android:layout_gravity="center_horizontal" | ||
| android:textColor="@android:color/white" /> | ||
| </LinearLayout> | ||
| android:textAppearance="?android:attr/textAppearanceSmall" | ||
| android:gravity="center" | ||
| android:textAlignment="gravity" | ||
| android:textColor="@android:color/white" | ||
| tools:text="A quick brown fox\nbla bla bla" /> | ||
| </RelativeLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,30 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:tools="http://schemas.android.com/tools" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:orientation="vertical" | ||
| android:clickable="true" | ||
| android:background="@drawable/roundedbg" | ||
| android:clickable="true" | ||
| android:padding="16dp"> | ||
| <ImageView | ||
| android:id="@+id/loadingImage" | ||
| android:layout_width="100dp" | ||
| android:layout_height="100dp" | ||
| android:layout_gravity="center_horizontal|center_vertical" | ||
| android:layout_alignParentTop="true" | ||
| android:layout_centerHorizontal="true" | ||
| android:scaleType="centerInside" | ||
| android:adjustViewBounds="true" /> | ||
| android:adjustViewBounds="true" | ||
| tools:src="@drawable/ic_errorstatus" /> | ||
| <TextView | ||
| android:id="@+id/textViewStatus" | ||
| android:text="Loading..." | ||
| android:textAppearance="?android:attr/textAppearanceSmall" | ||
| android:layout_below="@id/loadingImage" | ||
| android:layout_centerHorizontal="true" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:id="@+id/textViewStatus" | ||
| android:gravity="center_horizontal" | ||
| android:textAppearance="?android:attr/textAppearanceSmall" | ||
| android:gravity="center" | ||
| android:textAlignment="gravity" | ||
| android:textColor="@android:color/white" | ||
| android:layout_gravity="center_horizontal" /> | ||
| </LinearLayout> | ||
| tools:text="A quick brown fox\nbla bla bla" /> | ||
| </RelativeLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,27 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:tools="http://schemas.android.com/tools" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:orientation="vertical" | ||
| android:clickable="true" | ||
| android:background="@drawable/roundedbg" | ||
| android:clickable="true" | ||
| android:padding="16dp"> | ||
| <androidhud.ProgressWheel | ||
| android:id="@+id/loadingProgressWheel" | ||
| android:layout_width="100dp" | ||
| android:layout_height="100dp" | ||
| android:layout_gravity="center_horizontal|center_vertical" /> | ||
| android:layout_alignParentTop="true" | ||
| android:layout_centerHorizontal="true" /> | ||
| <TextView | ||
| android:id="@+id/textViewStatus" | ||
| android:text="Loading..." | ||
| android:textAppearance="?android:attr/textAppearanceSmall" | ||
| android:layout_below="@id/loadingProgressWheel" | ||
| android:layout_centerHorizontal="true" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:id="@+id/textViewStatus" | ||
| android:gravity="center_horizontal" | ||
| android:textAppearance="?android:attr/textAppearanceSmall" | ||
| android:gravity="center" | ||
| android:textAlignment="gravity" | ||
| android:textColor="@android:color/white" | ||
| android:layout_gravity="center_horizontal" /> | ||
| </LinearLayout> | ||
| tools:text="A quick brown fox\nbla bla bla" /> | ||
| </RelativeLayout> |