From d22b1e53c77243f6f0004efb966a3420c753e269 Mon Sep 17 00:00:00 2001
From: Hafiz <hafizbhamidi@gmail.com>
Date: Tue, 28 Jun 2022 12:00:27 -0400
Subject: [PATCH] Logout dialog created

---
 .../ui/activities/SettingsActivity.kt         |  28 +++++++-----
 wearos/src/main/res/drawable/cancel.png       | Bin 0 -> 233 bytes
 wearos/src/main/res/drawable/logout.png       | Bin 0 -> 345 bytes
 wearos/src/main/res/layout/logout_layout.xml  |  42 ++++++++++++++++++
 wearos/src/main/res/values/strings.xml        |   1 +
 5 files changed, 61 insertions(+), 10 deletions(-)
 create mode 100644 wearos/src/main/res/drawable/cancel.png
 create mode 100644 wearos/src/main/res/drawable/logout.png
 create mode 100644 wearos/src/main/res/layout/logout_layout.xml

diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SettingsActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SettingsActivity.kt
index c4f5f7a9e..53a89c00c 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SettingsActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SettingsActivity.kt
@@ -1,8 +1,9 @@
 package com.habitrpg.wearos.habitica.ui.activities
 
-import android.app.AlertDialog
+import android.app.Dialog
 import android.content.Intent
 import android.os.Bundle
+import android.widget.Button
 import androidx.activity.viewModels
 import androidx.wear.widget.WearableLinearLayoutManager
 import com.habitrpg.android.habitica.R
@@ -13,6 +14,7 @@ import com.habitrpg.wearos.habitica.ui.viewmodels.SettingsViewModel
 import com.habitrpg.wearos.habitica.util.HabiticaScrollingLayoutCallback
 import dagger.hilt.android.AndroidEntryPoint
 
+
 @AndroidEntryPoint
 class SettingsActivity: BaseActivity<ActivitySettingsBinding, SettingsViewModel>() {
     override val viewModel: SettingsViewModel by viewModels()
@@ -85,14 +87,20 @@ class SettingsActivity: BaseActivity<ActivitySettingsBinding, SettingsViewModel>
     }
 
     private fun showLogoutConfirmation() {
-        AlertDialog.Builder(this)
-            .setTitle(R.string.are_you_sure)
-            .setPositiveButton(R.string.logout) { alert, _ ->
-                logout()
-                alert.dismiss()
-            }
-            .setPositiveButton(R.string.action_cancel) { alert, _ ->
-                alert.dismiss()
-            }.show()
+        val logoutDialog = Dialog(this)
+        val myLayout = layoutInflater.inflate(R.layout.logout_layout, null)
+        val positiveButton: Button = myLayout.findViewById(R.id.logout_button)
+        positiveButton.setOnClickListener {
+            logout()
+            logoutDialog.dismiss()
+        }
+        val negativeButton: Button = myLayout.findViewById(R.id.cancel_button)
+        negativeButton.setOnClickListener {
+            logoutDialog.dismiss()
+        }
+        logoutDialog.setContentView(myLayout)
+        logoutDialog.show()
     }
+
+
 }
\ No newline at end of file
diff --git a/wearos/src/main/res/drawable/cancel.png b/wearos/src/main/res/drawable/cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..101f14c55773c8919d7746662d44eb12039347e7
GIT binary patch
literal 233
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>``W
z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eBex0X_V@L(#+Q}Dr8x(k4q}3Ch?=}cZFq$V%
zi4qhtUAmV=ud%=AeFIyE%Ndyz7bewvCB|Qxxb06d)R^V3R5X(P6Uz2r-ClhceV4|^
z_YHUo6A#bWD%I$F>517*uE2-AVcD;^f_=C2<Z)~|ec|u{Z4;+Uf6}v#23&U78XW$E
ZDdgK7mLlbyAAv4m@O1TaS?83{1OSAfO>O`H

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/drawable/logout.png b/wearos/src/main/res/drawable/logout.png
new file mode 100644
index 0000000000000000000000000000000000000000..83725cd5132c1499b6023e0fce25d2a55282b84a
GIT binary patch
literal 345
zcmeAS@N?(olHy`uVBq!ia0vp^Vn8gy!3HEdYt9+~Db50q$YKTtZeb8+WSBKa0w~B>
z9OUlAu<o49OCX0O-O<;Pfnj4m_n$;oApf1Gi(^Oy<JPIYf=vcIt-<|_5(fouILtU8
zDszzch1$9YY*#r;SlknuXE|x_yfuHzqusB!I{b>Q;B;m1%D(%k<XB-tON#*W6pn-9
zX9G01T=tn-AT6W2v+ht5r~1N5`CG<E4}=J_-D_kIEwgQTV7+2;V_BKT^uJ;cv?JRe
zRxDQk8hAkDSYKSOyvV&2v)MU)ofE|S_D=u#rcx-US@px$#_LscLiLg_UpM;rhh?>>
zUR~yX`7ZU~qpO+H7Y1BBF6LmJT3fql&hdC7hTzf-^Gi6Sn6@92>Tu4Nv#H|v`}Rgj
n!B*1<fgc^g^Lg}snC@kqdN5}0-Uvfbz%h8b`njxgN@xNAdR2nN

literal 0
HcmV?d00001

diff --git a/wearos/src/main/res/layout/logout_layout.xml b/wearos/src/main/res/layout/logout_layout.xml
new file mode 100644
index 000000000..fbd0a7f17
--- /dev/null
+++ b/wearos/src/main/res/layout/logout_layout.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.habitrpg.wearos.habitica.ui.views.HabiticaScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/description_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:textSize="18sp"
+            android:text="@string/log_out_of_habitica"
+            android:fontFamily="sans-serif-medium"
+            android:textColor="@color/white"
+            android:layout_marginBottom="18dp"/>
+
+        <Button
+            android:id="@+id/logout_button"
+            style="@style/ChipButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/spacing_small"
+            android:drawableStart="@drawable/logout"
+            android:text="@string/logout" />
+
+        <Button
+            android:id="@+id/cancel_button"
+            style="@style/ChipButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:drawableStart="@drawable/cancel"
+            android:text="@string/action_cancel" />
+
+    </LinearLayout>
+
+</com.habitrpg.wearos.habitica.ui.views.HabiticaScrollView>
\ No newline at end of file
diff --git a/wearos/src/main/res/values/strings.xml b/wearos/src/main/res/values/strings.xml
index 79fea9643..ba9f9f86a 100644
--- a/wearos/src/main/res/values/strings.xml
+++ b/wearos/src/main/res/values/strings.xml
@@ -29,4 +29,5 @@
     <string name="save">Save</string>
     <string name="sync_data">Sync Data</string>
     <string name="hide_task_rewards">Hide task rewards</string>
+    <string name="log_out_of_habitica">Log out of Habitica?</string>
 </resources>
\ No newline at end of file