Skip to content

Commit 9bc7c1f

Browse files
Merge pull request #17323 from nextcloud/fix/gallery-fragment-action
fix(gallery-fragment): action
2 parents ad695f5 + 1c99bc6 commit 9bc7c1f

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

app/src/main/java/com/owncloud/android/ui/fragment/GalleryFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ class GalleryFragment :
108108

109109
private fun setupBottomSheet() {
110110
if (bottomSheet == null) {
111-
bottomSheet = GalleryFragmentBottomSheetDialog(this)
111+
bottomSheet = GalleryFragmentBottomSheetDialog()
112112
}
113113
}
114114

app/src/main/java/com/owncloud/android/ui/fragment/GalleryFragmentBottomSheetDialog.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,15 @@ import com.owncloud.android.databinding.FragmentGalleryBottomSheetBinding
2323
import com.owncloud.android.utils.theme.ViewThemeUtils
2424
import javax.inject.Inject
2525

26-
class GalleryFragmentBottomSheetDialog(private val actions: GalleryFragmentBottomSheetActions) :
26+
class GalleryFragmentBottomSheetDialog :
2727
BottomSheetDialogFragment(R.layout.fragment_gallery_bottom_sheet),
2828
Injectable {
2929
@Inject
3030
lateinit var viewThemeUtils: ViewThemeUtils
3131

32+
private val actions: GalleryFragmentBottomSheetActions?
33+
get() = parentFragment as? GalleryFragmentBottomSheetActions
34+
3235
private lateinit var binding: FragmentGalleryBottomSheetBinding
3336
private var currentMediaState: MediaState = MediaState.MEDIA_STATE_DEFAULT
3437

@@ -104,14 +107,14 @@ class GalleryFragmentBottomSheetDialog(private val actions: GalleryFragmentBotto
104107
dismiss()
105108
}
106109
binding.btnSelectMediaFolder.setOnClickListener {
107-
actions.selectMediaFolder()
110+
actions?.selectMediaFolder()
108111
dismiss()
109112
}
110113
}
111114

112115
private fun notifyStateChange() {
113116
setupLayout()
114-
actions.updateMediaContent(currentMediaState)
117+
actions?.updateMediaContent(currentMediaState)
115118
}
116119

117120
val currMediaState: MediaState

0 commit comments

Comments
 (0)