From 332b6bd80ce337fec225f271e7ac435fa46c155c Mon Sep 17 00:00:00 2001
From: Ash <62345-ashlk@users.noreply.framagit.org>
Date: Sat, 4 Apr 2020 19:49:44 +0200
Subject: [PATCH] Layout fixes

---
 .../app/fedilab/nitterizeme/MainActivity.java |  1 +
 app/src/main/res/layout/content_main.xml      | 31 +++++++++++--------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/app/fedilab/nitterizeme/MainActivity.java b/app/src/main/java/app/fedilab/nitterizeme/MainActivity.java
index e4f7838..a2a080c 100644
--- a/app/src/main/java/app/fedilab/nitterizeme/MainActivity.java
+++ b/app/src/main/java/app/fedilab/nitterizeme/MainActivity.java
@@ -462,6 +462,7 @@ public class MainActivity extends AppCompatActivity {
             editor.apply();
             TextView osm_indications = findViewById(R.id.osm_indications);
             if (isChecked) {
+                expand_instance_osm.setRotation(0f);
                 osm_current_group.setVisibility(View.GONE);
                 osm_custom_group.setVisibility(View.GONE);
                 osm_indications.setText(R.string.redirect_gm_to_geo_uri);
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 7c67130..54a4bbf 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -258,17 +258,6 @@
                     app:layout_constraintStart_toEndOf="@id/label_instance_invidious"
                     app:layout_constraintTop_toTopOf="@id/guide_invidious" />
 
-
-                <CheckBox
-                    android:id="@+id/enable_embed_player"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="5dp"
-                    android:text="@string/use_built_in_player"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/barrier_invidious" />
-
                 <androidx.constraintlayout.widget.Barrier
                     android:id="@+id/barrier_invidious"
                     android:layout_width="wrap_content"
@@ -281,7 +270,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_margin="5dp"
-                    app:layout_constraintBottom_toTopOf="@id/enable_embed_player"
+                    app:layout_constraintBottom_toTopOf="@id/barrier_invidious_2"
                     app:layout_constraintEnd_toStartOf="@id/button_save_instance_invidious"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/barrier_invidious">
@@ -305,10 +294,26 @@
                     android:background="@null"
                     android:contentDescription="@string/save"
                     android:src="@drawable/ic_save"
-                    app:layout_constraintBottom_toTopOf="@+id/enable_embed_player"
+                    app:layout_constraintBottom_toTopOf="@+id/barrier_invidious_2"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="@id/barrier_invidious" />
 
+                <androidx.constraintlayout.widget.Barrier
+                    android:id="@+id/barrier_invidious_2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:barrierDirection="bottom"
+                    app:constraint_referenced_ids="invidious_instance_container,button_save_instance_invidious" />
+
+                <CheckBox
+                    android:id="@+id/enable_embed_player"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="5dp"
+                    android:text="@string/use_built_in_player"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/barrier_invidious_2" />
+
                 <androidx.constraintlayout.widget.Group
                     android:id="@+id/group_current_invidious"
                     android:layout_width="wrap_content"