Glimpse: Reformat code
Change-Id: I6d2eea4a214cbbaf586d21ec92f3fb4c6c987a10
diff --git a/app/src/main/java/org/lineageos/glimpse/ViewActivity.kt b/app/src/main/java/org/lineageos/glimpse/ViewActivity.kt
index 707ba46..9ddb9f3 100644
--- a/app/src/main/java/org/lineageos/glimpse/ViewActivity.kt
+++ b/app/src/main/java/org/lineageos/glimpse/ViewActivity.kt
@@ -233,7 +233,7 @@
ioScope.launch {
val intentHandled = handleIntent(intent)
- lifecycleScope.launch lifecycleCoroutine@ {
+ lifecycleScope.launch lifecycleCoroutine@{
if (!intentHandled) {
finish()
return@lifecycleCoroutine
diff --git a/app/src/main/java/org/lineageos/glimpse/fragments/AlbumViewerFragment.kt b/app/src/main/java/org/lineageos/glimpse/fragments/AlbumViewerFragment.kt
index 331be7f..7b16907 100644
--- a/app/src/main/java/org/lineageos/glimpse/fragments/AlbumViewerFragment.kt
+++ b/app/src/main/java/org/lineageos/glimpse/fragments/AlbumViewerFragment.kt
@@ -123,26 +123,27 @@
// Selection
private var selectionTracker: SelectionTracker<MediaStoreMedia>? = null
- private val selectionTrackerObserver = object : SelectionTracker.SelectionObserver<MediaStoreMedia>() {
- override fun onSelectionChanged() {
- super.onSelectionChanged()
+ private val selectionTrackerObserver =
+ object : SelectionTracker.SelectionObserver<MediaStoreMedia>() {
+ override fun onSelectionChanged() {
+ super.onSelectionChanged()
- updateSelection()
+ updateSelection()
+ }
+
+ override fun onSelectionRefresh() {
+ super.onSelectionRefresh()
+
+ updateSelection()
+ }
+
+ override fun onSelectionRestored() {
+ super.onSelectionRestored()
+
+ updateSelection()
+ }
}
- override fun onSelectionRefresh() {
- super.onSelectionRefresh()
-
- updateSelection()
- }
-
- override fun onSelectionRestored() {
- super.onSelectionRestored()
-
- updateSelection()
- }
- }
-
private var actionMode: ActionMode? = null
private val actionModeCallback = object : ActionMode.Callback {
@@ -292,6 +293,7 @@
when (bucketId) {
MediaStoreBuckets.MEDIA_STORE_BUCKET_TRASH.id ->
R.menu.fragment_album_viewer_toolbar_trash
+
else -> null
}?.let {
toolbar.inflateMenu(it)
@@ -319,6 +321,7 @@
true
}
+
else -> false
}
}
diff --git a/app/src/main/java/org/lineageos/glimpse/fragments/SearchFragment.kt b/app/src/main/java/org/lineageos/glimpse/fragments/SearchFragment.kt
index 99373dd..416a502 100644
--- a/app/src/main/java/org/lineageos/glimpse/fragments/SearchFragment.kt
+++ b/app/src/main/java/org/lineageos/glimpse/fragments/SearchFragment.kt
@@ -7,7 +7,6 @@
import android.os.Bundle
import android.view.View
-import android.widget.LinearLayout
import androidx.core.os.bundleOf
import androidx.fragment.app.Fragment
import androidx.navigation.fragment.findNavController
diff --git a/app/src/main/java/org/lineageos/glimpse/recyclerview/MediaViewerAdapter.kt b/app/src/main/java/org/lineageos/glimpse/recyclerview/MediaViewerAdapter.kt
index 45109a2..31efeaf 100644
--- a/app/src/main/java/org/lineageos/glimpse/recyclerview/MediaViewerAdapter.kt
+++ b/app/src/main/java/org/lineageos/glimpse/recyclerview/MediaViewerAdapter.kt
@@ -64,6 +64,7 @@
) : RecyclerView.ViewHolder(view) {
// Views
private val imageView = view.findViewById<ImageView>(R.id.imageView)
+
@androidx.media3.common.util.UnstableApi
private val playerControlView = view.findViewById<PlayerControlView>(R.id.exo_controller)
private val playerView = view.findViewById<PlayerView>(R.id.playerView)
diff --git a/app/src/main/java/org/lineageos/glimpse/viewmodels/AlbumViewerViewModel.kt b/app/src/main/java/org/lineageos/glimpse/viewmodels/AlbumViewerViewModel.kt
index ee04fb9..e0c4a1b 100644
--- a/app/src/main/java/org/lineageos/glimpse/viewmodels/AlbumViewerViewModel.kt
+++ b/app/src/main/java/org/lineageos/glimpse/viewmodels/AlbumViewerViewModel.kt
@@ -87,12 +87,16 @@
val inSelectionMode = MutableLiveData(false)
sealed class DataType(val viewType: Int) {
- class Thumbnail(val media: MediaStoreMedia) : DataType(ThumbnailAdapter.ViewTypes.THUMBNAIL.ordinal) {
+ class Thumbnail(
+ val media: MediaStoreMedia,
+ ) : DataType(ThumbnailAdapter.ViewTypes.THUMBNAIL.ordinal) {
override fun equals(other: Any?) = media == other
override fun hashCode() = media.hashCode()
}
- class DateHeader(val date: Date) : DataType(ThumbnailAdapter.ViewTypes.DATE_HEADER.ordinal) {
+ class DateHeader(
+ val date: Date,
+ ) : DataType(ThumbnailAdapter.ViewTypes.DATE_HEADER.ordinal) {
override fun equals(other: Any?) = date == other
override fun hashCode() = date.hashCode()
}