diff --git a/app/src/main/res/layout-sw600dp-land/activity_setup.xml b/app/src/main/res/layout-sw600dp-land/activity_setup.xml index c7fa866b40474e618a2ded4ae42e474bbe43a727..31d62bdced3be5447bcd61be2e634003fa3c0cef 100644 --- a/app/src/main/res/layout-sw600dp-land/activity_setup.xml +++ b/app/src/main/res/layout-sw600dp-land/activity_setup.xml @@ -14,8 +14,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right|bottom" - android:layout_marginBottom="16dp" - android:layout_marginRight="80dp" + android:layout_marginBottom="24dp" + android:layout_marginRight="24dp" android:tint="#ffffff" app:backgroundTint="#8A000000" app:elevation="0dip" diff --git a/app/src/main/res/layout-sw600dp-land/setup_slide.xml b/app/src/main/res/layout-sw600dp-land/setup_slide.xml index 5838900da004ac7a904db637f8cd065f766a72a7..f28e1976b4c3c897b50ad09bb221b23ada30938d 100644 --- a/app/src/main/res/layout-sw600dp-land/setup_slide.xml +++ b/app/src/main/res/layout-sw600dp-land/setup_slide.xml @@ -21,8 +21,8 @@ android:layout_height="wrap_content" android:layout_gravity="end" android:gravity="end" + android:textColor="?android:attr/textColorPrimaryInverse" android:textSize="28sp" - android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse" tools:text="Connection" /> <android.support.v4.widget.Space @@ -36,8 +36,8 @@ android:layout_height="wrap_content" android:layout_gravity="end" android:gravity="end" + android:textColor="?android:attr/textColorSecondaryInverse" android:textSize="16sp" - android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse" tools:text="First, please choose which server your core is hosted on." /> </LinearLayout> diff --git a/app/src/main/res/layout-sw600dp/activity_setup.xml b/app/src/main/res/layout-sw600dp/activity_setup.xml index b8b719a14867fe3484aee8700134417c75bb273d..31d62bdced3be5447bcd61be2e634003fa3c0cef 100644 --- a/app/src/main/res/layout-sw600dp/activity_setup.xml +++ b/app/src/main/res/layout-sw600dp/activity_setup.xml @@ -9,25 +9,18 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - <FrameLayout - android:layout_width="400dp" + <android.support.design.widget.FloatingActionButton + android:id="@+id/next_button" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom|center"> - - <android.support.design.widget.FloatingActionButton - android:id="@+id/next_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right|bottom" - android:layout_marginBottom="16dp" - android:layout_marginRight="16dp" - android:tint="#ffffff" - app:backgroundTint="#8A000000" - app:elevation="0dip" - app:fabSize="normal" - app:pressedTranslationZ="0dip" - tools:ignore="RtlHardcoded" /> - - </FrameLayout> + android:layout_gravity="right|bottom" + android:layout_marginBottom="24dp" + android:layout_marginRight="24dp" + android:tint="#ffffff" + app:backgroundTint="#8A000000" + app:elevation="0dip" + app:fabSize="normal" + app:pressedTranslationZ="0dip" + tools:ignore="RtlHardcoded" /> </merge> diff --git a/app/src/main/res/layout-sw600dp/setup_slide.xml b/app/src/main/res/layout-sw600dp/setup_slide.xml index d04c64bc7c0a2d4da1430498da6fb28088d08244..391f91a05f027f52f1152c214b48d532c95afe01 100644 --- a/app/src/main/res/layout-sw600dp/setup_slide.xml +++ b/app/src/main/res/layout-sw600dp/setup_slide.xml @@ -24,16 +24,16 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" + android:textColor="?android:attr/textColorPrimaryInverse" android:textSize="28sp" - android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse" tools:text="Connection" /> <TextView android:id="@+id/description" android:layout_width="match_parent" android:layout_height="wrap_content" + android:textColor="?android:attr/textColorSecondaryInverse" android:textSize="16sp" - android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse" tools:text="First, please choose which server your core is hosted on." /> </LinearLayout> diff --git a/app/src/main/res/layout/setup_slide.xml b/app/src/main/res/layout/setup_slide.xml index c31e16eb498f638f03124036a0f42cf916462e1a..54045a751331f258934787416c9624d046f47ba1 100644 --- a/app/src/main/res/layout/setup_slide.xml +++ b/app/src/main/res/layout/setup_slide.xml @@ -44,8 +44,8 @@ android:layout_marginRight="48dp" android:layout_marginStart="32dp" android:layout_marginTop="8dp" + android:textColor="?android:attr/textColorSecondaryInverse" android:textSize="16sp" - android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse" tools:text="First, please choose which server your core is hosted on." /> </LinearLayout> diff --git a/app/src/main/res/layout/widget_core_account.xml b/app/src/main/res/layout/widget_core_account.xml index e92dfe929909f948f33584c43831e7b96ae110f7..0a8e02ba005d22125458cdbd53f529e53797e47a 100644 --- a/app/src/main/res/layout/widget_core_account.xml +++ b/app/src/main/res/layout/widget_core_account.xml @@ -20,6 +20,7 @@ android:layout_width="48dp" android:layout_height="48dp" android:layout_gravity="center_vertical" + android:background="@null" android:clickable="false" /> </LinearLayout>