feat: Update settings and profile fragment for non authenticated users (#1754)

liveHarshit · iamareebjamal · commit 397997361a8c · 2019-05-13T13:47:58.000+05:30
diff --git a/app/src/main/java/org/fossasia/openevent/general/auth/ProfileFragment.kt b/app/src/main/java/org/fossasia/openevent/general/auth/ProfileFragment.kt
@@ -23,6 +23,7 @@ import kotlinx.android.synthetic.main.fragment_profile.view.logoutLL
 import kotlinx.android.synthetic.main.fragment_profile.view.manageEventsLL
 import kotlinx.android.synthetic.main.fragment_profile.view.settingsLL
 import kotlinx.android.synthetic.main.fragment_profile.view.ticketIssuesLL
+import kotlinx.android.synthetic.main.fragment_profile.view.loginButton
 import org.fossasia.openevent.general.CircleTransform
 import org.fossasia.openevent.general.R
 import org.fossasia.openevent.general.utils.Utils
@@ -41,7 +42,7 @@ class ProfileFragment : Fragment() {
 
     private fun redirectToLogin() {
         findNavController(rootView).navigate(ProfileFragmentDirections
-            .actionProfileToLogin(getString(R.string.log_in_first))
+            .actionProfileToLogin()
         )
     }
 
@@ -51,9 +52,13 @@ class ProfileFragment : Fragment() {
 
     override fun onStart() {
         super.onStart()
-        if (!profileViewModel.isLoggedIn()) {
-            redirectToLogin()
-        }
+        handleLayoutVisibility(profileViewModel.isLoggedIn())
+    }
+
+    private fun handleLayoutVisibility(isLoggedIn: Boolean) {
+        rootView.editProfileRL.isVisible = isLoggedIn
+        rootView.logoutLL.isVisible = isLoggedIn
+        rootView.loginButton.isVisible = !isLoggedIn
     }
 
     override fun onCreateView(
@@ -93,7 +98,7 @@ class ProfileFragment : Fragment() {
                 }
             })
 
-        fetchProfile()
+        if (profileViewModel.isLoggedIn()) fetchProfile()
 
         rootView.manageEventsLL.setOnClickListener { startOrgaApp("com.eventyay.organizer") }
 
@@ -106,6 +111,7 @@ class ProfileFragment : Fragment() {
         }
 
         rootView.logoutLL.setOnClickListener { showLogoutDialog() }
+        rootView.loginButton.setOnClickListener { redirectToLogin() }
 
         return rootView
     }
diff --git a/app/src/main/java/org/fossasia/openevent/general/settings/SettingsFragment.kt b/app/src/main/java/org/fossasia/openevent/general/settings/SettingsFragment.kt
@@ -56,15 +56,21 @@ class SettingsFragment : PreferenceFragmentCompat(), PreferenceChangeListener {
         setHasOptionsMenu(true)
 
         // Set Email
-        preferenceScreen.findPreference(getString(R.string.key_profile))
-            .summary = safeArgs.email
+        preferenceScreen.findPreference(getString(R.string.key_account))
+            .summary = if (safeArgs.email.isNullOrEmpty()) getString(R.string.not_logged_in) else safeArgs.email
 
         // Set Build Version
         preferenceScreen.findPreference(getString(R.string.key_version))
             .title = "Version " + BuildConfig.VERSION_NAME
 
         preferenceScreen.findPreference(getString(R.string.key_timezone_switch))
             .setDefaultValue(timeZonePreference.getBoolean("useEventTimeZone", false))
+
+        preferenceScreen.findPreference(getString(R.string.key_profile)).isVisible = profileViewModel.isLoggedIn()
+        preferenceScreen.findPreference(getString(R.string.key_change_password)).isVisible =
+            profileViewModel.isLoggedIn()
+        preferenceScreen.findPreference(getString(R.string.key_timezone_switch)).isVisible =
+            profileViewModel.isLoggedIn()
     }
 
     override fun onPreferenceTreeClick(preference: Preference?): Boolean {
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
@@ -217,9 +217,20 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
+                android:visibility="gone"
                 android:elevation="@dimen/card_elevation" />
 
         </LinearLayout>
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/loginButton"
+            style="@style/AppTheme.MaterialButton.RoundedCorners"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:layout_margin="@dimen/layout_margin_large"
+            android:text="@string/login"
+            android:textAllCaps="false"/>
+
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </ScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -53,7 +53,7 @@
     <string name="user_name">Username</string>
     <string name="logout">Log out</string>
     <string name="settings">Settings</string>
-    <string name="login">Login</string>
+    <string name="login">Log In</string>
     <string name="forgot_password">I forgot my password</string>
     <string name="email_sent_message">We just sent you an email with a link to reset\nyour password </string>
     <string name="email_sent_alert">Check your email!</string>
@@ -162,6 +162,7 @@
     <string name="key_version">version</string>
     <string name="key_about">about</string>
     <string name="key_rating">rating</string>
+    <string name="key_account">account</string>
     <string name="rating_settings">Rate Us</string>
     <string name="app_name_capital" translatable="false">Open Event Android</string>
     <string name="suggestion_settings">Suggest Improvement</string>
@@ -188,6 +189,7 @@
     <string name="legal">Legal</string>
     <string name="visit_website">Visit Website</string>
     <string name="key_visit_website">Visit_Website</string>
+    <string name="not_logged_in">No account logged in</string>
 
     <!--settings profile dialog-->
     <string name="message">Are you sure you want to log out?</string>
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
@@ -2,34 +2,13 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory
-        android:key="@string/key_about"
-        android:title="@string/about"
-        app:iconSpaceReserved="false">
-
-        <Preference
-            android:key="@string/key_visit_website"
-            android:title="@string/visit_website"
-            app:iconSpaceReserved="false" />
-
-        <Preference
-            android:key="@string/key_rating"
-            android:title="@string/rating_settings"
-            app:iconSpaceReserved="false" />
-
-        <Preference
-            android:key="@string/key_suggestion"
-            android:title="@string/suggestion_settings"
-            app:iconSpaceReserved="false" />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:title="@string/profile"
+        android:title="@string/logged_in_account"
+        android:key="@string/key_account"
         app:iconSpaceReserved="false">
 
         <Preference
             android:key="@string/key_profile"
-            android:title="@string/logged_in_account"
+            android:title="@string/profile"
             app:iconSpaceReserved="false" />
 
         <Preference
@@ -45,13 +24,25 @@
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:title="@string/app_name_capital"
+        android:key="@string/key_about"
+        android:title="@string/about"
         app:iconSpaceReserved="false">
 
         <Preference
-            android:key="@string/key_version"
-            android:title="@string/version_settings"
+            android:key="@string/key_visit_website"
+            android:title="@string/visit_website"
             app:iconSpaceReserved="false" />
+
+        <Preference
+            android:key="@string/key_rating"
+            android:title="@string/rating_settings"
+            app:iconSpaceReserved="false" />
+
+        <Preference
+            android:key="@string/key_suggestion"
+            android:title="@string/suggestion_settings"
+            app:iconSpaceReserved="false" />
+
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -73,4 +64,14 @@
             android:title="@string/cookie_policy"
             app:iconSpaceReserved="false" />
     </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/app_name_capital"
+        app:iconSpaceReserved="false">
+
+        <Preference
+            android:key="@string/key_version"
+            android:title="@string/version_settings"
+            app:iconSpaceReserved="false" />
+    </PreferenceCategory>
 </PreferenceScreen>
