Move more confirm types

app/src/main/java/org/futo/circles/model/ConfirmationType.kt

@@ -87,16 +87,4 @@ data class ResendInvite(
     override val titleRes: Int = R.string.resend_invite,
     override val messageRes: Int = R.string.resend_invite_message,
     override val positiveButtonRes: Int = android.R.string.ok
-) : ConfirmationType(titleRes, messageRes, positiveButtonRes)
-
-data class RemoveSession(
-    override val titleRes: Int = R.string.remove_session,
-    override val messageRes: Int = R.string.remove_session_message,
-    override val positiveButtonRes: Int = R.string.remove
-) : ConfirmationType(titleRes, messageRes, positiveButtonRes)
-
-data class ResetKeys(
-    override val titleRes: Int = R.string.reset_keys,
-    override val messageRes: Int = R.string.reset_keys_message,
-    override val positiveButtonRes: Int = R.string.confirm
 ) : ConfirmationType(titleRes, messageRes, positiveButtonRes)
\ No newline at end of file

app/src/main/res/values/strings.xml

@@ -139,8 +139,6 @@
     <string name="user_id">User ID</string>
     <string name="active_login_sessions">Active login sessions</string>
     <string name="verify">Verify</string>
-    <string name="remove_session">Remove session</string>
-    <string name="remove_session_message">In order to sign out from this session you should confirm your auth.</string>
     <string name="save_to_device">Save to device</string>
     <string name="save_to_gallery">Save to gallery</string>
     <string name="unignore">Unignore</string>
@@ -149,9 +147,6 @@
     <string name="system_notices">System notices</string>
     <string name="push_notifications">Push notifications</string>
     <string name="push_notifications_test">Push notifications test</string>
-    <string name="confirm">Confirm</string>
-    <string name="reset_keys">Reset keys</string>
-    <string name="reset_keys_message">Confirm auth to reset keys and enable cross signing</string>
     <string name="share_with_group">Share with a group</string>
     <string name="share_with_circle">Share with a circle</string>
     <string name="group">Group</string>
@@ -276,7 +271,6 @@
     <string name="configuring_workspace">Configuring workspace</string>
     <string name="shared_circles">Shared Circles</string>
     <string name="remove_user">Remove user</string>
-    <string name="remove">Remove</string>
     <string name="save">Save</string>
     <string name="share_room">Share room</string>
     <string name="share_url">Share url</string>

auth/src/main/java/org/futo/circles/auth/model/ConfirmationType.kt

@@ -6,7 +6,7 @@ import org.futo.circles.core.model.ConfirmationType
 data class RemoveUser(
     override val titleRes: Int = R.string.remove_user,
     override val messageRes: Int = R.string.remove_user_message,
-    override val positiveButtonRes: Int = R.string.remove
+    override val positiveButtonRes: Int = org.futo.circles.core.R.string.remove
 ) : ConfirmationType(titleRes, messageRes, positiveButtonRes)
 
 data class SwitchUser(

auth/src/main/res/values/strings.xml

@@ -87,7 +87,6 @@
     <string name="validate_your_email">Validate your email</string>
     <string name="remove_user">Remove user</string>
     <string name="remove_user_message">Are you sure you want to remove this user?</string>
-    <string name="remove">Remove</string>
     <string name="not_supported_navigation_event">Not supported navigation event</string>
     <string name="feature_not_supported">Feature is not supported</string>
     <string name="service_unavailable">Service unavailable</string>

core/src/main/res/values/strings.xml

@@ -52,5 +52,6 @@
     <string name="save">Save</string>
     <string name="select_items_from_list_below">Select items from list below</string>
     <string name="password_changed">Password changed</string>
+    <string name="remove">Remove</string>
 
 </resources>
\ No newline at end of file

gallery/src/main/java/org/futo/circles/gallery/model/ConfirmationType.kt

@@ -12,5 +12,5 @@ data class DeleteGallery(
 data class RemoveImage(
     override val titleRes: Int = R.string.remove_image,
     override val messageRes: Int = R.string.remove_image_message,
-    override val positiveButtonRes: Int = R.string.remove
+    override val positiveButtonRes: Int =  org.futo.circles.core.R.string.remove
 ) : ConfirmationType(titleRes, messageRes, positiveButtonRes)
\ No newline at end of file

gallery/src/main/res/values/strings.xml

@@ -9,7 +9,6 @@
     <string name="delete">Delete</string>
     <string name="remove_image">Remove image</string>
     <string name="remove_image_message">Are you sure you want to remove this image?</string>
-    <string name="remove">Remove</string>
     <string name="upload_to_gallery">Upload to gallery</string>
     <string name="save_to_gallery">Save to gallery</string>
     <string name="all_galleries">All Galleries</string>

settings/src/main/java/org/futo/circles/settings/feature/active_sessions/ActiveSessionsDialogFragment.kt

@@ -18,6 +18,8 @@ import org.futo.circles.settings.R
 import org.futo.circles.settings.databinding.DialogFragmentActiveSessionsBinding
 import org.futo.circles.settings.feature.active_sessions.list.ActiveSessionClickListener
 import org.futo.circles.settings.feature.active_sessions.list.ActiveSessionsAdapter
+import org.futo.circles.settings.model.RemoveSession
+import org.futo.circles.settings.model.ResetKeys
 
 @AndroidEntryPoint
 class ActiveSessionsDialogFragment :

settings/src/main/java/org/futo/circles/settings/model/ConfirmationType.kt

@@ -9,3 +9,15 @@ data class DeactivateAccount(
     override val positiveButtonRes: Int = R.string.deactivate
 ) : ConfirmationType(titleRes, messageRes, positiveButtonRes)
 
+data class RemoveSession(
+    override val titleRes: Int = R.string.remove_session,
+    override val messageRes: Int = R.string.remove_session_message,
+    override val positiveButtonRes: Int =  org.futo.circles.core.R.string.remove
+) : ConfirmationType(titleRes, messageRes, positiveButtonRes)
+
+data class ResetKeys(
+    override val titleRes: Int = R.string.reset_keys,
+    override val messageRes: Int = R.string.reset_keys_message,
+    override val positiveButtonRes: Int = R.string.confirm
+) : ConfirmationType(titleRes, messageRes, positiveButtonRes)
+

settings/src/main/res/values/strings.xml

@@ -15,4 +15,10 @@
     <string name="deactivate_my_account">Deactivate my account</string>
     <string name="deactivate_message">This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user lD. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.</string>
     <string name="deactivate">Deactivate</string>
+    <string name="remove_session">Remove session</string>
+    <string name="remove_session_message">In order to sign out from this session you should confirm your auth.</string>
+    <string name="reset_keys">Reset keys</string>
+    <string name="reset_keys_message">Confirm auth to reset keys and enable cross signing</string>
+    <string name="confirm">Confirm</string>
+
 </resources>
\ No newline at end of file