From bf55b5a802fb1bf1c7ba71111c4ca5cb6060d1ad Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Wed, 13 Mar 2024 17:13:25 +0300
Subject: [PATCH] Swap poll options around

---
 mastodon/build.gradle                       |  4 +-
 mastodon/src/main/res/layout/poll_style.xml | 74 ++++++++++-----------
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/mastodon/build.gradle b/mastodon/build.gradle
index a8263374..45d81ebc 100644
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -13,7 +13,7 @@ android {
 		applicationId "org.joinmastodon.android"
 		minSdk 23
 		targetSdk 33
-		versionCode 89
+		versionCode 90
 		versionName "2.4.1"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 	}
@@ -90,7 +90,7 @@ dependencies {
 	implementation 'me.grishka.litex:viewpager:1.0.0'
 	implementation 'me.grishka.litex:viewpager2:1.0.0'
 	implementation 'me.grishka.litex:palette:1.0.0'
-	implementation 'me.grishka.appkit:appkit:1.2.16'
+	implementation 'me.grishka.appkit:appkit:1.2.17'
 	implementation 'com.google.code.gson:gson:2.8.9'
 	implementation 'org.jsoup:jsoup:1.14.3'
 	implementation 'com.squareup:otto:1.3.8'
diff --git a/mastodon/src/main/res/layout/poll_style.xml b/mastodon/src/main/res/layout/poll_style.xml
index 5fc65dd1..eb668d47 100644
--- a/mastodon/src/main/res/layout/poll_style.xml
+++ b/mastodon/src/main/res/layout/poll_style.xml
@@ -7,43 +7,6 @@
 	android:paddingTop="8dp"
 	android:paddingHorizontal="8dp">
 
-	<org.joinmastodon.android.ui.views.CheckableLinearLayout
-		android:id="@+id/multiple_choice"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_weight="1"
-		android:layout_marginHorizontal="8dp"
-		android:orientation="vertical"
-		android:paddingTop="8dp"
-		android:background="@drawable/bg_rect_4dp_ripple"
-		android:gravity="center_horizontal">
-		<ImageView
-			android:layout_width="80dp"
-			android:layout_height="80dp"
-			android:src="@drawable/poll_multiple"
-			android:duplicateParentState="true"
-			android:importantForAccessibility="no"/>
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="16dp"
-			android:textAppearance="@style/m3_title_small"
-			android:textColor="?colorM3OnSurface"
-			android:text="@string/compose_poll_multiple_choice"/>
-		<FrameLayout
-			android:layout_width="48dp"
-			android:layout_height="48dp"
-			android:duplicateParentState="true">
-			<RadioButton
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_gravity="center"
-				android:clickable="false"
-				android:focusable="false"
-				android:duplicateParentState="true"/>
-		</FrameLayout>
-	</org.joinmastodon.android.ui.views.CheckableLinearLayout>
-
 	<org.joinmastodon.android.ui.views.CheckableLinearLayout
 		android:id="@+id/single_choice"
 		android:layout_width="0dp"
@@ -81,4 +44,41 @@
 		</FrameLayout>
 	</org.joinmastodon.android.ui.views.CheckableLinearLayout>
 
+	<org.joinmastodon.android.ui.views.CheckableLinearLayout
+		android:id="@+id/multiple_choice"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:layout_marginHorizontal="8dp"
+		android:orientation="vertical"
+		android:paddingTop="8dp"
+		android:background="@drawable/bg_rect_4dp_ripple"
+		android:gravity="center_horizontal">
+		<ImageView
+			android:layout_width="80dp"
+			android:layout_height="80dp"
+			android:src="@drawable/poll_multiple"
+			android:duplicateParentState="true"
+			android:importantForAccessibility="no"/>
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="16dp"
+			android:textAppearance="@style/m3_title_small"
+			android:textColor="?colorM3OnSurface"
+			android:text="@string/compose_poll_multiple_choice"/>
+		<FrameLayout
+			android:layout_width="48dp"
+			android:layout_height="48dp"
+			android:duplicateParentState="true">
+			<RadioButton
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"
+				android:clickable="false"
+				android:focusable="false"
+				android:duplicateParentState="true"/>
+		</FrameLayout>
+	</org.joinmastodon.android.ui.views.CheckableLinearLayout>
+
 </LinearLayout>
\ No newline at end of file