From dd51c32d32116f472a2ec35ba95df1a059120cb0 Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Fri, 21 Oct 2022 12:17:32 +0600
Subject: [PATCH] 
 774-Hide_detail_page_after_login_for_murena_and_google_accounts

issue:https://gitlab.e.foundation/e/os/backlog/-/issues/774

We don't want to show the group setup window after the detection phase
of the login functionality for murena & google accounts. So, we show
detection ui for this step.
---
 .../ui/setup/AccountDetailsFragment.kt        |   4 +
 .../main/res/layout/login_account_details.xml | 193 ++++++++++--------
 2 files changed, 109 insertions(+), 88 deletions(-)

diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
index 26a940f49..849a56953 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt
@@ -139,6 +139,10 @@ class AccountDetailsFragment : Fragment() {
 
         if (requireActivity().intent.getStringExtra(LoginActivity.SETUP_ACCOUNT_PROVIDER_TYPE) == LoginActivity.ACCOUNT_PROVIDER_EELO ||
             requireActivity().intent.getStringExtra(LoginActivity.SETUP_ACCOUNT_PROVIDER_TYPE) == LoginActivity.ACCOUNT_PROVIDER_GOOGLE) {
+
+            v.mainDetailLayout.visibility = View.GONE
+            v.mainLoadingLayout.visibility = View.VISIBLE
+
             val name = model.name.value
             if (name.isNullOrBlank())
                 model.nameError.value = getString(R.string.login_account_name_required)
diff --git a/app/src/main/res/layout/login_account_details.xml b/app/src/main/res/layout/login_account_details.xml
index c564d0444..511675397 100644
--- a/app/src/main/res/layout/login_account_details.xml
+++ b/app/src/main/res/layout/login_account_details.xml
@@ -1,129 +1,146 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <data>
-        <import type="android.view.View"/>
+
+        <import type="android.view.View" />
+
         <variable
             name="details"
-            type="at.bitfire.davdroid.ui.setup.AccountDetailsFragment.AccountDetailsModel"/>
+            type="at.bitfire.davdroid.ui.setup.AccountDetailsFragment.AccountDetailsModel" />
     </data>
 
-    <LinearLayout
-        android:orientation="vertical"
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <ScrollView
+        <LinearLayout
+            android:id="@+id/main_detail_layout"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:layout_margin="@dimen/activity_margin">
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
-            <LinearLayout
+            <ScrollView
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:layout_height="0dp"
+                android:layout_margin="@dimen/activity_margin"
+                android:layout_weight="1">
 
-                <TextView
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/TextAppearance.MaterialComponents.Headline5"
-                    android:text="@string/login_create_account"
-                    android:layout_marginBottom="14dp"/>
+                    android:orientation="vertical">
 
-                <com.google.android.material.textfield.TextInputLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/login_account_name"
-                    style="@style/edittext_holder_style"
-                    android:theme="@style/edittext_holder_theme"
-                    app:errorEnabled="true"
-                    app:error="@{details.nameError}">
-                    <!--suppress AndroidUnknownAttribute -->
-                    <AutoCompleteTextView
-                        android:id="@+id/accountName"
+                    <TextView
+                        style="@style/TextAppearance.MaterialComponents.Headline5"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        unfilteredText="@={details.name}"
-                        android:afterTextChanged="@{details::validateAccountName}"
-                        android:inputType="textEmailAddress" />
-                </com.google.android.material.textfield.TextInputLayout>
+                        android:layout_marginBottom="14dp"
+                        android:text="@string/login_create_account" />
 
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/TextAppearance.AppCompat.Body2"
-                    app:drawableStartCompat="@drawable/ic_info"
-                    android:drawablePadding="8dp"
-                    android:layout_marginBottom="4dp"
-                    android:text="@string/login_account_avoid_apostrophe"
-                    android:visibility="@{details.showApostropheWarning ? View.VISIBLE : View.GONE}"/>
-
-                <TextView
-                    android:id="@+id/account_email_hint"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    style="@style/TextAppearance.AppCompat.Body2"
-                    android:text="@string/login_account_name_info" />
+                    <com.google.android.material.textfield.TextInputLayout
+                        style="@style/edittext_holder_style"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/login_account_name"
+                        android:theme="@style/edittext_holder_theme"
+                        app:error="@{details.nameError}"
+                        app:errorEnabled="true">
+                        <!--suppress AndroidUnknownAttribute -->
+                        <AutoCompleteTextView
+                            android:id="@+id/accountName"
+                            unfilteredText="@={details.name}"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:afterTextChanged="@{details::validateAccountName}"
+                            android:inputType="textEmailAddress" />
+                    </com.google.android.material.textfield.TextInputLayout>
 
-                <LinearLayout
-                    android:id="@+id/carddav"
-                    android:layout_height="wrap_content"
-                    android:layout_width="match_parent"
-                    android:orientation="vertical">
+                    <TextView
+                        style="@style/TextAppearance.AppCompat.Body2"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="4dp"
+                        android:drawablePadding="8dp"
+                        android:text="@string/login_account_avoid_apostrophe"
+                        android:visibility="@{details.showApostropheWarning ? View.VISIBLE : View.GONE}"
+                        app:drawableStartCompat="@drawable/ic_info" />
 
                     <TextView
+                        android:id="@+id/account_email_hint"
+                        style="@style/TextAppearance.AppCompat.Body2"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="16dp"
-                        android:text="@string/login_account_contact_group_method"/>
+                        android:layout_marginTop="8dp"
+                        android:text="@string/login_account_name_info" />
 
-                    <Spinner
-                        android:id="@+id/contact_group_method"
+                    <LinearLayout
+                        android:id="@+id/carddav"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:entries="@array/settings_contact_group_method_entries"/>
+                        android:orientation="vertical">
 
-                </LinearLayout>
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="16dp"
+                            android:text="@string/login_account_contact_group_method" />
 
-            </LinearLayout>
-        </ScrollView>
+                        <Spinner
+                            android:id="@+id/contact_group_method"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:entries="@array/settings_contact_group_method_entries" />
 
-        <androidx.cardview.widget.CardView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/stepper_nav_bar">
+                    </LinearLayout>
+
+                </LinearLayout>
+            </ScrollView>
 
-            <LinearLayout
+            <androidx.cardview.widget.CardView
+                style="@style/stepper_nav_bar"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="right|center_vertical"
-                android:orientation="horizontal">
+                android:layout_height="wrap_content">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="right|center_vertical"
+                    android:orientation="horizontal">
+
+                    <ProgressBar
+                        android:id="@+id/create_account_progress"
+                        style="?android:attr/progressBarStyleHorizontal"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:indeterminate="true"
+                        android:visibility="gone"
+                        tools:visibility="visible" />
+
+                    <Button
+                        android:id="@+id/create_account"
+                        style="@style/stepper_nav_button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/login_create_account" />
 
-            <ProgressBar
-                android:id="@+id/create_account_progress"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:visibility="gone"
-                tools:visibility="visible"
-                android:indeterminate="true"
-                style="?android:attr/progressBarStyleHorizontal"/>
+                </LinearLayout>
 
-            <Button
-                android:id="@+id/create_account"
-                style="@style/stepper_nav_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/login_create_account" />
+            </androidx.cardview.widget.CardView>
 
-            </LinearLayout>
+        </LinearLayout>
 
-        </androidx.cardview.widget.CardView>
+        <LinearLayout
+            android:id="@+id/main_loading_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone">
 
-    </LinearLayout>
+            <include layout="@layout/detect_configuration" />
+        </LinearLayout>
 
+    </RelativeLayout>
 </layout>
\ No newline at end of file
-- 
GitLab