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() { override val viewModel: SettingsViewModel by viewModels() @@ -85,14 +87,20 @@ class SettingsActivity: BaseActivity } 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 000000000..101f14c55 Binary files /dev/null and b/wearos/src/main/res/drawable/cancel.png differ diff --git a/wearos/src/main/res/drawable/logout.png b/wearos/src/main/res/drawable/logout.png new file mode 100644 index 000000000..83725cd51 Binary files /dev/null and b/wearos/src/main/res/drawable/logout.png differ 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 @@ + + + + + + + +