diff options
Diffstat (limited to '')
| -rw-r--r-- | src/main/res/layout/activity_updater.xml | 26 | ||||
| -rw-r--r-- | src/main/res/layout/toolbar.xml | 10 |
2 files changed, 20 insertions, 16 deletions
diff --git a/src/main/res/layout/activity_updater.xml b/src/main/res/layout/activity_updater.xml index 4aa9deb8f..9fe33c0c9 100644 --- a/src/main/res/layout/activity_updater.xml +++ b/src/main/res/layout/activity_updater.xml @@ -3,27 +3,31 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="?attr/color_background_secondary" tools:context="${applicationId}.ui.UpdaterActivity"> + <include xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/toolbar" + layout="@layout/toolbar" /> + <TextView android:id="@+id/updater" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentTop="true" - android:layout_marginTop="6dp" + android:layout_alignParentTop="false" + android:layout_below="@id/toolbar" + android:layout_centerHorizontal="true" + android:padding="@dimen/card_padding_regular" android:text="Current" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textStyle="normal" - android:layout_marginLeft="4dp" - android:layout_marginRight="4dp" /> + android:textAppearance="@style/TextAppearance.Conversations.Body1" + android:textStyle="normal" /> <ProgressBar + android:id="@+id/UpdateProgressBar" style="?android:attr/progressBarStyleLarge" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:id="@+id/UpdateProgressBar" - android:layout_centerVertical="true" - android:layout_centerHorizontal="true" /> + android:layout_centerHorizontal="true" + android:layout_centerVertical="true" /> -</RelativeLayout> +</RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/layout/toolbar.xml b/src/main/res/layout/toolbar.xml index ca0ab0cd3..e9782393f 100644 --- a/src/main/res/layout/toolbar.xml +++ b/src/main/res/layout/toolbar.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.v7.widget.Toolbar android:id="@+id/toolbar" +<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/colorPrimary" - android:minHeight="?attr/actionBarSize" android:elevation="@dimen/toolbar_elevation" + android:minHeight="?attr/actionBarSize" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" - app:popupTheme="?popupOverlayStyle" - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" />
\ No newline at end of file + app:popupTheme="?popupOverlayStyle" />
\ No newline at end of file |