Skip to content

fix(gallery-fragment): action #17323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alperozturk96 wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −4
Open

fix(gallery-fragment): action #17323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/com/owncloud/android/ui/fragment/GalleryFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class GalleryFragment :

private fun setupBottomSheet() {
if (bottomSheet == null) {
bottomSheet = GalleryFragmentBottomSheetDialog(this)
bottomSheet = GalleryFragmentBottomSheetDialog()
}
}

Expand Down
9 changes: 6 additions & 3 deletions app/src/main/java/com/owncloud/android/ui/fragment/GalleryFragmentBottomSheetDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,15 @@ import com.owncloud.android.databinding.FragmentGalleryBottomSheetBinding
import com.owncloud.android.utils.theme.ViewThemeUtils
import javax.inject.Inject

class GalleryFragmentBottomSheetDialog(private val actions: GalleryFragmentBottomSheetActions) :
class GalleryFragmentBottomSheetDialog :
BottomSheetDialogFragment(R.layout.fragment_gallery_bottom_sheet),
Injectable {
@Inject
lateinit var viewThemeUtils: ViewThemeUtils

private val actions: GalleryFragmentBottomSheetActions?
get() = parentFragment as? GalleryFragmentBottomSheetActions

private lateinit var binding: FragmentGalleryBottomSheetBinding
private var currentMediaState: MediaState = MediaState.MEDIA_STATE_DEFAULT

Expand Down Expand Up @@ -104,14 +107,14 @@ class GalleryFragmentBottomSheetDialog(private val actions: GalleryFragmentBotto
dismiss()
}
binding.btnSelectMediaFolder.setOnClickListener {
actions.selectMediaFolder()
actions?.selectMediaFolder()
dismiss()
}
}

private fun notifyStateChange() {
setupLayout()
actions.updateMediaContent(currentMediaState)
actions?.updateMediaContent(currentMediaState)
}

val currMediaState: MediaState
Expand Down
Loading