Skip to content

Commit a27453e

Browse files
author
Radu Sabau
committed
[VSP-1602] Cleanup old ShareManagement Implementation
1 parent 781f58b commit a27453e

File tree

11 files changed

+15
-1307
lines changed

11 files changed

+15
-1307
lines changed

app/src/main/java/org/permanent/permanent/ui/fileView/FileActivity.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,12 @@ class FileActivity : PermanentBaseActivity() {
7070
this@FileActivity.finish()
7171
true
7272
}
73-
R.id.shareLinkFragment -> {
74-
navController.navigateUp(appBarConfig) || super.onSupportNavigateUp()
75-
setToolbarAndStatusBarColor(R.color.black)
76-
true
77-
}
73+
//TODO Replace with new Share Link Settings
74+
// R.id.shareLinkFragment -> {
75+
// navController.navigateUp(appBarConfig) || super.onSupportNavigateUp()
76+
// setToolbarAndStatusBarColor(R.color.black)
77+
// true
78+
// }
7879
else -> navController.navigateUp(appBarConfig) || super.onSupportNavigateUp()
7980
}
8081
}

app/src/main/java/org/permanent/permanent/ui/fileView/FileViewOptionsFragment.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,9 @@ class FileViewOptionsFragment : PermanentBottomSheetFragment() {
5252

5353
private val onShareViaPermanentObserver = Observer<Void?> {
5454
val bundle = bundleOf(PARCELABLE_RECORD_KEY to record)
55-
requireParentFragment().requireParentFragment().findNavController()
56-
.navigate(R.id.action_filesContainerFragment_to_shareLinkFragment, bundle)
55+
//TODO Replace with new Share Link Settings
56+
// requireParentFragment().requireParentFragment().findNavController()
57+
// .navigate(R.id.action_filesContainerFragment_to_shareLinkFragment, bundle)
5758
dismiss()
5859
}
5960

app/src/main/java/org/permanent/permanent/ui/myFiles/MyFilesFragment.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ import org.permanent.permanent.ui.public.PublicFragment
5353
import org.permanent.permanent.ui.recordMenu.RecordMenuFragment
5454
import org.permanent.permanent.ui.recordMenu.RecordUiModel
5555
import org.permanent.permanent.ui.recordMenu.SelectionMenuFragment
56-
import org.permanent.permanent.ui.shareManagement.ShareManagementFragment
5756
import org.permanent.permanent.ui.shareManagement.ShareLinkFragment
5857
import org.permanent.permanent.ui.shares.PreviewState
5958
import org.permanent.permanent.ui.shares.SHOW_SCREEN_SIMPLIFIED_KEY
@@ -83,7 +82,6 @@ class MyFilesFragment : PermanentBaseFragment() {
8382
private var addOptionsFragment: AddOptionsFragment? = null
8483
private var recordMenuFragment: RecordMenuFragment? = null
8584
private var saveToPermanentFragment: SaveToPermanentFragment? = null
86-
private var shareManagementFragment: ShareLinkFragment? = null
8785
private var sortOptionsFragment: SortOptionsFragment? = null
8886
private var selectionMenuFragment: SelectionMenuFragment? = null
8987
private var bottomSheetFragment: ChecklistBottomSheetFragment? = null

app/src/main/java/org/permanent/permanent/ui/myFiles/RecordOptionsFragment.kt

Lines changed: 0 additions & 306 deletions
This file was deleted.

app/src/main/java/org/permanent/permanent/ui/recordMenu/RecordMenuFragment.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import org.permanent.permanent.ui.myFiles.PARCELABLE_RECORD_KEY
3939
import org.permanent.permanent.ui.recordMenu.compose.RecordMenuScreen
4040
import org.permanent.permanent.ui.shareManagement.ShareLinkFragment
4141
import org.permanent.permanent.ui.shareManagement.shareLink.ShareLinkScreen
42-
import org.permanent.permanent.ui.shareManagement.ShareManagementFragment
4342
import org.permanent.permanent.viewmodels.RecordMenuItem
4443
import org.permanent.permanent.viewmodels.RecordMenuViewModel
4544

app/src/main/java/org/permanent/permanent/ui/shareManagement/ShareLinkFragment.kt

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@ import androidx.compose.foundation.shape.RoundedCornerShape
99
import androidx.compose.material3.MaterialTheme
1010
import androidx.compose.material3.Surface
1111
import androidx.compose.ui.platform.ComposeView
12-
import androidx.compose.ui.platform.ViewCompositionStrategy
1312
import androidx.compose.ui.unit.dp
1413
import androidx.core.os.bundleOf
1514
import androidx.lifecycle.ViewModelProvider
16-
import com.google.android.material.R
1715
import com.google.android.material.bottomsheet.BottomSheetBehavior
1816
import com.google.android.material.bottomsheet.BottomSheetDialog
1917
import org.permanent.permanent.models.Record
@@ -72,22 +70,9 @@ class ShareLinkFragment : PermanentBottomSheetFragment() {
7270
(requireView().parent as? View)?.setBackgroundColor(Color.TRANSPARENT)
7371
}
7472

75-
override fun connectViewModelEvents() {
76-
// viewModel.getShowSnackbar().observe(this, showSnackbar)
77-
// viewModel.getOnShareToAnotherAppRequest().observe(this, onShareToAnotherAppObserver)
78-
// viewModel.getOnFileDownloadedForSharing().observe(this, onFileDownloadedForSharing)
79-
// viewModel.getOnRequestWritePermission().observe(this, onRequestWritePermission)
80-
// viewModel.getOnFileDownloadRequest().observe(this, onFileDownloadRequestObserver)
81-
}
82-
83-
override fun disconnectViewModelEvents() {
84-
// viewModel.getShowSnackbar().observe(this, showSnackbar)
85-
// viewModel.getOnShareToAnotherAppRequest().removeObserver(onShareToAnotherAppObserver)
86-
// viewModel.getOnFileDownloadedForSharing().removeObserver(onFileDownloadedForSharing)
87-
// viewModel.getOnRequestWritePermission().removeObserver(onRequestWritePermission)
88-
// viewModel.getOnFileDownloadRequest().removeObserver(onFileDownloadRequestObserver)
89-
}
73+
override fun connectViewModelEvents() {}
9074

75+
override fun disconnectViewModelEvents() {}
9176

9277
companion object {
9378
const val PARCELABLE_SHARE_KEY = "parcelable_share_key"

0 commit comments

Comments
 (0)