Skip to content

Commit ce980b5

Browse files
committed
feat: display dialog when trash bin button is clicked
1 parent e95ebb0 commit ce980b5

3 files changed

Lines changed: 14 additions & 4 deletions

File tree

owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/links/SpaceLinksAdapter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class SpaceLinksAdapter(
7575
contentDescription = holder.itemView.context.getString(R.string.content_description_delete_public_link, spaceLink.displayName)
7676
isVisible = canRemoveLinks
7777
setOnClickListener {
78-
listener.onRemovePublicLink(spaceLink.id)
78+
listener.onRemovePublicLink(spaceLink.id, spaceLink.displayName)
7979
}
8080
}
8181
}
@@ -97,6 +97,6 @@ class SpaceLinksAdapter(
9797

9898
interface SpaceLinksAdapterListener {
9999
fun onCopyOrSendPublicLink(publicLinkUrl: String)
100-
fun onRemovePublicLink(publicLinkId: String)
100+
fun onRemovePublicLink(publicLinkId: String, publicLinkDisplayName: String)
101101
}
102102
}

owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersFragment.kt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ package com.owncloud.android.presentation.spaces.members
2222

2323
import android.app.AlertDialog
2424
import android.content.Context
25+
import android.content.DialogInterface
2526
import android.os.Bundle
2627
import android.view.LayoutInflater
2728
import android.view.View
@@ -38,6 +39,7 @@ import com.owncloud.android.domain.spaces.model.OCSpace
3839
import com.owncloud.android.domain.spaces.model.SpaceMember
3940
import com.owncloud.android.extensions.avoidScreenshotsIfNeeded
4041
import com.owncloud.android.extensions.collectLatestLifecycleFlow
42+
import com.owncloud.android.extensions.showAlertDialog
4143
import com.owncloud.android.extensions.showErrorInSnackbar
4244
import com.owncloud.android.extensions.showMessageInSnackbar
4345
import com.owncloud.android.presentation.common.UIResult
@@ -185,8 +187,14 @@ class SpaceMembersFragment : Fragment(), SpaceMembersAdapter.SpaceMembersAdapter
185187
listener?.copyOrSendPublicLink(publicLinkUrl, currentSpace.name)
186188
}
187189

188-
override fun onRemovePublicLink(publicLinkId: String) {
189-
190+
override fun onRemovePublicLink(publicLinkId: String, publicLinkDisplayName: String) {
191+
showAlertDialog(
192+
title = getString(R.string.public_link_remove_dialog_title, publicLinkDisplayName),
193+
message = getString(R.string.public_link_remove_dialog_message),
194+
positiveButtonText = getString(R.string.common_yes),
195+
positiveButtonListener = { _: DialogInterface?, _: Int -> },
196+
negativeButtonText = getString(R.string.common_no)
197+
)
190198
}
191199

192200
private fun subscribeToViewModels() {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -932,6 +932,8 @@
932932
<string name="public_link_default_display_name">Unnamed Link</string>
933933
<string name="public_link_add_correctly">Public link created correctly</string>
934934
<string name="public_link_add_failed">Public link could not be created</string>
935+
<string name="public_link_remove_dialog_title">Do you really want to remove the link: %1$s?</string>
936+
<string name="public_link_remove_dialog_message">Recreating the same link again is not possible</string>
935937

936938
<string name="feedback_dialog_get_in_contact_description"><![CDATA[ Ask for help in our <a href=\"%1$s\"><b>forum</b></a> or contribute in our <a href=\"%2$s\"><b>GitHub repo</b></a>]]></string>
937939

0 commit comments

Comments
 (0)