From df8eef12d25eca460de06541a318dc7c3fff5574 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Mon, 2 Sep 2024 09:34:31 +0200
Subject: [PATCH] - no need for linearlayout - correct license

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .../authentication/AuthenticatorActivity.java |  2 +-
 .../android/authentication/EnforcedServer.kt  |  2 +-
 .../main/res/layout-land/account_setup.xml    | 27 +++++++------------
 app/src/main/res/layout/account_setup.xml     | 27 +++++++------------
 app/src/main/res/values/setup.xml             |  2 +-
 5 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java b/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
index 4069b443747a..37b3eff37fad 100644
--- a/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -369,7 +369,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 accountSetupBinding.hostUrlFrame.setVisibility(View.GONE);
                 accountSetupBinding.hostUrlInputHelperText.setVisibility(View.GONE);
                 accountSetupBinding.scanQr.setVisibility(View.GONE);
-                accountSetupBinding.multipleServersLayout.setVisibility(View.VISIBLE);
+                accountSetupBinding.serversSpinner.setVisibility(View.VISIBLE);
 
                 ArrayAdapter<String> adapter = new ArrayAdapter<>(this, R.layout.enforced_servers_spinner);
                 adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
diff --git a/app/src/main/java/com/owncloud/android/authentication/EnforcedServer.kt b/app/src/main/java/com/owncloud/android/authentication/EnforcedServer.kt
index abe2358be6b4..b9483d2112c6 100644
--- a/app/src/main/java/com/owncloud/android/authentication/EnforcedServer.kt
+++ b/app/src/main/java/com/owncloud/android/authentication/EnforcedServer.kt
@@ -1,7 +1,7 @@
 /*
  * Nextcloud - Android Client
  *
- * SPDX-FileCopyrightText: 2024 Your Name <your@email.com>
+ * SPDX-FileCopyrightText: 2024 Tobias Kaminsky <tobias.kaminsky@nextcloud.com>
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
diff --git a/app/src/main/res/layout-land/account_setup.xml b/app/src/main/res/layout-land/account_setup.xml
index 6a44696f4417..88f50287e975 100644
--- a/app/src/main/res/layout-land/account_setup.xml
+++ b/app/src/main/res/layout-land/account_setup.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud - Android Client
   ~
   ~ SPDX-FileCopyrightText: 2019 Tobias Kaminsky <tobias@kaminsky.me>
@@ -80,21 +79,15 @@
                 </com.google.android.material.textfield.TextInputLayout>
             </FrameLayout>
 
-            <LinearLayout
-                android:id="@+id/multiple_servers_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="gone">
-
-                <Spinner
-                    android:id="@+id/servers_spinner"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:foregroundTint="#FFFFFF"
-                    android:spinnerMode="dialog"
-                    android:textColor="@color/white_helper_text" />
-            </LinearLayout>
+            <Spinner
+                android:id="@+id/servers_spinner"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:foregroundTint="#FFFFFF"
+                android:spinnerMode="dialog"
+                android:textColor="@color/white_helper_text"
+                android:visibility="gone" />
 
             <TextView
                 android:id="@+id/host_url_input_helper_text"
diff --git a/app/src/main/res/layout/account_setup.xml b/app/src/main/res/layout/account_setup.xml
index 883ffe233f00..42aa3d8adc90 100644
--- a/app/src/main/res/layout/account_setup.xml
+++ b/app/src/main/res/layout/account_setup.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud - Android Client
   ~
   ~ SPDX-FileCopyrightText: 2019 Tobias Kaminsky <tobias@kaminsky.me>
@@ -80,21 +79,15 @@
                 </com.google.android.material.textfield.TextInputLayout>
             </FrameLayout>
 
-            <LinearLayout
-                android:id="@+id/multiple_servers_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="gone">
-
-                <Spinner
-                    android:id="@+id/servers_spinner"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:foregroundTint="#FFFFFF"
-                    android:spinnerMode="dialog"
-                    android:textColor="@color/white_helper_text" />
-            </LinearLayout>
+            <Spinner
+                android:id="@+id/servers_spinner"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:foregroundTint="#FFFFFF"
+                android:spinnerMode="dialog"
+                android:textColor="@color/white_helper_text"
+                android:visibility="gone" />
 
             <TextView
                 android:id="@+id/host_url_input_helper_text"
diff --git a/app/src/main/res/values/setup.xml b/app/src/main/res/values/setup.xml
index 47c4ffd9da87..3b6c7532937e 100644
--- a/app/src/main/res/values/setup.xml
+++ b/app/src/main/res/values/setup.xml
@@ -123,7 +123,7 @@
     If set, will replace all other login methods available -->
     <string name="webview_login_url" translatable="false"></string>
 
-    <!--    [{\"name\":\"nameu","url":"url"},{"name":"name2","url":"url1"}]-->
+    <!--    [{\"name\":\"name1\",\"url\":\"url\"},{\"name\":\"name2\",\"url\":\"url1\"}]-->
     <string name="enforce_servers" translatable="false"></string>