From ba930f72e8d015d87b67ce144e99647ea0b1d3a5 Mon Sep 17 00:00:00 2001
From: Kirill Rakhman <kirill.rakhman@gmail.com>
Date: Sun, 13 Nov 2022 12:58:33 +0100
Subject: [PATCH] fix button bar layout in onboarding activation for smaller
 widths

---
 .../layout-w600dp/button_bar_activation.xml   | 39 +++++++++++++++++++
 .../main/res/layout/button_bar_activation.xml | 39 +++++++++++++++++++
 .../layout/fragment_onboarding_activation.xml | 37 +-----------------
 3 files changed, 79 insertions(+), 36 deletions(-)
 create mode 100644 mastodon/src/main/res/layout-w600dp/button_bar_activation.xml
 create mode 100644 mastodon/src/main/res/layout/button_bar_activation.xml

diff --git a/mastodon/src/main/res/layout-w600dp/button_bar_activation.xml b/mastodon/src/main/res/layout-w600dp/button_bar_activation.xml
new file mode 100644
index 00000000..965f0299
--- /dev/null
+++ b/mastodon/src/main/res/layout-w600dp/button_bar_activation.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/button_bar"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?colorBackgroundLight"
+    android:outlineProvider="bounds"
+    android:orientation="horizontal"
+    android:clipToPadding="false"
+    android:elevation="3dp"
+    tools:showIn="@layout/fragment_onboarding_activation">
+
+    <Button
+        android:id="@+id/btn_back"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
+        style="?secondaryLargeButtonStyle"
+        android:text="@string/resend" />
+
+    <Space
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:layout_weight="1" />
+
+    <Button
+        android:id="@+id/btn_next"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
+        style="?primaryLargeButtonStyle"
+        android:text="@string/open_email_app" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/button_bar_activation.xml b/mastodon/src/main/res/layout/button_bar_activation.xml
new file mode 100644
index 00000000..eb9e8728
--- /dev/null
+++ b/mastodon/src/main/res/layout/button_bar_activation.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/button_bar"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?colorBackgroundLight"
+    android:clipToPadding="false"
+    android:elevation="3dp"
+    android:orientation="horizontal"
+    android:outlineProvider="bounds"
+    android:gravity="center_vertical"
+    tools:showIn="@layout/fragment_onboarding_activation">
+
+    <Button
+        android:id="@+id/btn_back"
+        style="?secondaryLargeButtonStyle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
+        android:layout_marginEnd="8dp"
+        android:layout_weight="1"
+        android:text="@string/resend" />
+
+    <Button
+        android:id="@+id/btn_next"
+        style="?primaryLargeButtonStyle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginBottom="16dp"
+        android:layout_weight="1"
+        android:text="@string/open_email_app" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/fragment_onboarding_activation.xml b/mastodon/src/main/res/layout/fragment_onboarding_activation.xml
index f68b0da5..8edcd0ff 100644
--- a/mastodon/src/main/res/layout/fragment_onboarding_activation.xml
+++ b/mastodon/src/main/res/layout/fragment_onboarding_activation.xml
@@ -51,41 +51,6 @@
 
 	</ScrollView>
 
-	<LinearLayout
-		android:id="@+id/button_bar"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:background="?colorBackgroundLight"
-		android:outlineProvider="bounds"
-		android:orientation="horizontal"
-		android:clipToPadding="false"
-		android:elevation="3dp">
-
-		<Button
-			android:id="@+id/btn_back"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginStart="16dp"
-			android:layout_marginTop="16dp"
-			android:layout_marginBottom="16dp"
-			style="?secondaryLargeButtonStyle"
-			android:text="@string/resend"/>
-
-		<Space
-			android:layout_width="0dp"
-			android:layout_height="1dp"
-			android:layout_weight="1"/>
-
-		<Button
-			android:id="@+id/btn_next"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginEnd="16dp"
-			android:layout_marginTop="16dp"
-			android:layout_marginBottom="16dp"
-			style="?primaryLargeButtonStyle"
-			android:text="@string/open_email_app" />
-
-	</LinearLayout>
+	<include layout="@layout/button_bar_activation" />
 
 </me.grishka.appkit.views.FragmentRootLinearLayout>
\ No newline at end of file