Skip to content

Commit 5747aed

Browse files
zhombiezhombie
committed
Upgraded garage = 1.1.9; Add kotlin-parcelize plugin
1 parent a02001c commit 5747aed

File tree

13 files changed

+82
-56
lines changed

13 files changed

+82
-56
lines changed

‎bazaar/build.gradle

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
apply plugin: "kotlin-parcelize"
2+
13
android {
24
defaultConfig {
35
consumerProguardFiles 'consumer-rules.pro'
@@ -9,9 +11,9 @@ android {
911
ext {
1012
arbat_version = '1.4.0'
1113
coroutines_version = '1.6.0'
12-
exoplayer_version = '2.16.1'
13-
garage_version = '1.1.3'
14-
lifecycle_version = '2.4.0'
14+
exoplayer_version = '2.17.1'
15+
garage_version = '1.1.9'
16+
lifecycle_version = '2.4.1'
1517
}
1618

1719
dependencies {
@@ -25,7 +27,7 @@ dependencies {
2527
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
2628

2729
// Fragment
28-
implementation 'androidx.fragment:fragment-ktx:1.4.0'
30+
implementation 'androidx.fragment:fragment-ktx:1.4.1'
2931

3032
// Lifecycle
3133
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"

‎bazaar/src/main/java/kz/zhombie/bazaar/api/core/settings/CameraSettings.kt

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package kz.zhombie.bazaar.api.core.settings
22

3-
import java.io.Serializable
3+
import android.os.Parcelable
4+
import kotlinx.parcelize.Parcelize
45

6+
@Parcelize
57
data class CameraSettings constructor(
68
val isPhotoShootEnabled: Boolean,
79
val isVideoCaptureEnabled: Boolean
8-
) : Serializable
10+
) : Parcelable

‎bazaar/src/main/java/kz/zhombie/bazaar/core/media/MediaScanManager.kt

+6-5
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,7 @@ internal class MediaScanManager constructor(private val context: Context) {
811811

812812
val inputStream = context.contentResolver?.openInputStream(uri) ?: return null
813813

814-
val resolution = inputStream.getImageResolution()
814+
val resolution = inputStream.getImageResolution() ?: return null
815815
val size = ImageBitmap.Size(resolution.width, resolution.height)
816816
val sourceBitmap = BitmapFactory.decodeStream(inputStream, null, BitmapFactory.Options())
817817
val source = ImageBitmap.Source(sourceBitmap, size)
@@ -820,10 +820,11 @@ internal class MediaScanManager constructor(private val context: Context) {
820820
val sourceWidth = size.width
821821
val sampleSize = calculateSampleSize(sourceWidth, requiredWidth)
822822

823-
val options = BitmapFactory.Options()
824-
options.inSampleSize = sampleSize
825-
options.inDensity = sourceWidth
826-
options.inTargetDensity = requiredWidth * sampleSize
823+
val options = BitmapFactory.Options().apply {
824+
inSampleSize = sampleSize
825+
inDensity = sourceWidth
826+
inTargetDensity = requiredWidth * sampleSize
827+
}
827828

828829
val bitmap = BitmapFactory.decodeStream(inputStream, null, options)
829830
// reset density to display bitmap correctly

‎bazaar/src/main/java/kz/zhombie/bazaar/ui/model/FunctionalButton.kt

+10-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,19 @@ internal class FunctionalButton private constructor(
1616

1717
companion object {
1818
fun camera(): FunctionalButton {
19-
return FunctionalButton(Type.CAMERA, R.drawable.bazaar_ic_camera, R.string.bazaar_camera)
19+
return FunctionalButton(
20+
type = Type.CAMERA,
21+
icon = R.drawable.bazaar_ic_camera,
22+
title = R.string.bazaar_camera
23+
)
2024
}
2125

2226
fun chooseFromLibrary(): FunctionalButton {
23-
return FunctionalButton(Type.CHOOSE_FROM_LIBRARY, R.drawable.bazaar_ic_folder_yellow, R.string.bazaar_choose_from_library)
27+
return FunctionalButton(
28+
type = Type.CHOOSE_FROM_LIBRARY,
29+
icon = R.drawable.bazaar_ic_folder_yellow,
30+
title = R.string.bazaar_choose_from_library
31+
)
2432
}
2533
}
2634

‎bazaar/src/main/java/kz/zhombie/bazaar/ui/model/Controllable.kt ‎bazaar/src/main/java/kz/zhombie/bazaar/ui/model/Selectable.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package kz.zhombie.bazaar.ui.model
22

3-
internal interface Controllable {
3+
interface Selectable {
44
val isSelectable: Boolean
55
val isSelected: Boolean
6-
val isVisible: Boolean
76
}

‎bazaar/src/main/java/kz/zhombie/bazaar/ui/model/UIContent.kt

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
package kz.zhombie.bazaar.ui.model
22

3+
import android.os.Parcelable
4+
import kotlinx.parcelize.Parcelize
35
import kz.garage.multimedia.store.model.Audio
46
import kz.garage.multimedia.store.model.Content
57
import kz.garage.multimedia.store.model.Document
68
import kz.garage.multimedia.store.model.Media
7-
import java.io.Serializable
89
import java.util.concurrent.TimeUnit
910

11+
@Parcelize
1012
internal open class UIContent constructor(
1113
val content: Content,
1214
override val isSelectable: Boolean,
1315
override val isSelected: Boolean,
1416
override val isVisible: Boolean
15-
) : Controllable, Serializable {
17+
) : Selectable, Visibility, Parcelable {
1618

1719
fun getDisplayTitle(): String {
1820
var title = content.label
@@ -86,7 +88,11 @@ internal open class UIContent constructor(
8688
}
8789

8890
override fun toString(): String {
89-
return "${UIContent::class.java.simpleName}(content=$content, isSelectable=$isSelectable, isSelected=$isSelected, isVisible=$isVisible)"
91+
return "${UIContent::class.java.simpleName}(" +
92+
"content=$content, " +
93+
"isSelectable=$isSelectable, " +
94+
"isSelected=$isSelected, " +
95+
"isVisible=$isVisible)"
9096
}
9197

9298
}

‎bazaar/src/main/java/kz/zhombie/bazaar/ui/model/UIFolderExt.kt

+29-30
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,40 @@ package kz.zhombie.bazaar.ui.model
22

33
import kz.garage.multimedia.store.model.*
44

5-
internal fun List<UIContent>.convert(contents: List<Content>): List<UIFolder> {
6-
return contents.mapNotNull { media ->
5+
internal fun List<UIContent>.convert(contents: List<Content>): List<UIFolder> =
6+
contents.mapNotNull { media ->
77
val folderId = media.folder?.id ?: return@mapNotNull null
8-
val folderDisplayName = media.folder?.displayName ?: return@mapNotNull null
98
val items = mapNotNull { if (it.content.folder?.id == folderId) it.content else null }
10-
UIFolder(Folder(id = folderId, displayName = folderDisplayName, items = items))
9+
UIFolder(
10+
folder = Folder(
11+
id = folderId,
12+
displayName = media.folder?.displayName ?: return@mapNotNull null,
13+
items = items
14+
)
15+
)
1116
}
12-
}
1317

14-
internal fun List<UIContent>.onlyImages(): UIFolder {
15-
return UIFolder(
16-
Folder(
18+
internal fun List<UIContent>.onlyImages(): UIFolder =
19+
UIFolder(
20+
folder = Folder(
1721
id = UIFolder.ALL_MEDIA_ID,
1822
items = mapNotNull { if (it is UIMedia && it.media is Image) it.media else null }
1923
),
20-
UIFolder.DisplayType.IMAGES
24+
displayType = UIFolder.DisplayType.IMAGES
2125
)
22-
}
2326

24-
internal fun List<UIContent>.onlyVideos(): UIFolder {
25-
return UIFolder(
26-
Folder(
27+
internal fun List<UIContent>.onlyVideos(): UIFolder =
28+
UIFolder(
29+
folder = Folder(
2730
id = UIFolder.ALL_MEDIA_ID,
2831
items = mapNotNull { if (it is UIMedia && it.media is Video) it.media else null }
2932
),
30-
UIFolder.DisplayType.VIDEOS
33+
displayType = UIFolder.DisplayType.VIDEOS
3134
)
32-
}
3335

34-
internal fun List<UIContent>.onlyImagesAndVideos(): UIFolder {
35-
return UIFolder(
36-
Folder(
36+
internal fun List<UIContent>.onlyImagesAndVideos(): UIFolder =
37+
UIFolder(
38+
folder = Folder(
3739
id = UIFolder.ALL_MEDIA_ID,
3840
items = mapNotNull {
3941
if (it is UIMedia && (it.media is Image || it.media is Video)) {
@@ -43,26 +45,23 @@ internal fun List<UIContent>.onlyImagesAndVideos(): UIFolder {
4345
}
4446
}
4547
),
46-
UIFolder.DisplayType.MEDIA
48+
displayType = UIFolder.DisplayType.MEDIA
4749
)
48-
}
4950

50-
internal fun List<UIContent>.onlyAudios(): UIFolder {
51-
return UIFolder(
52-
Folder(
51+
internal fun List<UIContent>.onlyAudios(): UIFolder =
52+
UIFolder(
53+
folder = Folder(
5354
id = UIFolder.ALL_MEDIA_ID,
5455
items = mapNotNull { if (it.content is Audio) it.content else null }
5556
),
56-
UIFolder.DisplayType.AUDIOS
57+
displayType = UIFolder.DisplayType.AUDIOS
5758
)
58-
}
5959

60-
internal fun List<UIContent>.onlyDocuments(): UIFolder {
61-
return UIFolder(
62-
Folder(
60+
internal fun List<UIContent>.onlyDocuments(): UIFolder =
61+
UIFolder(
62+
folder = Folder(
6363
id = UIFolder.ALL_MEDIA_ID,
6464
items = mapNotNull { if (it.content is Document) it.content else null }
6565
),
66-
UIFolder.DisplayType.DOCUMENTS
66+
displayType = UIFolder.DisplayType.DOCUMENTS
6767
)
68-
}

‎bazaar/src/main/java/kz/zhombie/bazaar/ui/model/UIMedia.kt

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package kz.zhombie.bazaar.ui.model
22

3+
import android.os.Parcelable
4+
import kotlinx.parcelize.Parcelize
35
import kz.garage.multimedia.store.model.Media
4-
import java.io.Serializable
56

7+
@Parcelize
68
internal data class UIMedia constructor(
79
val media: Media,
810
override val isSelectable: Boolean,
@@ -13,7 +15,7 @@ internal data class UIMedia constructor(
1315
isSelectable = isSelectable,
1416
isSelected = isSelected,
1517
isVisible = isVisible
16-
), Serializable {
18+
), Parcelable {
1719

1820
override fun equals(other: Any?): Boolean {
1921
if (other is UIMedia) {

‎bazaar/src/main/java/kz/zhombie/bazaar/ui/model/Visibility.kt

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package kz.zhombie.bazaar.ui.model
2+
3+
interface Visibility {
4+
val isVisible: Boolean
5+
}

‎bazaar/src/main/java/kz/zhombie/bazaar/ui/presentation/MediaStoreFragment.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ internal class MediaStoreFragment : BottomSheetDialogFragment(),
6767
fun newInstance(settings: MediaStoreScreen.Settings): MediaStoreFragment {
6868
val fragment = MediaStoreFragment()
6969
val bundle = Bundle()
70-
bundle.putSerializable(BundleKey.SETTINGS, settings)
70+
bundle.putParcelable(BundleKey.SETTINGS, settings)
7171
fragment.arguments = bundle
7272
return fragment
7373
}
@@ -147,7 +147,7 @@ internal class MediaStoreFragment : BottomSheetDialogFragment(),
147147
MediaStoreViewModelFactory()
148148
)[MediaStoreViewModel::class.java]
149149

150-
val settings = arguments?.getSerializable(BundleKey.SETTINGS) as MediaStoreScreen.Settings
150+
val settings = requireNotNull(arguments?.getParcelable<MediaStoreScreen.Settings>(BundleKey.SETTINGS))
151151
val mediaScanManager = MediaScanManager(requireContext())
152152

153153
viewModel?.setSettings(settings)

‎bazaar/src/main/java/kz/zhombie/bazaar/ui/presentation/MediaStoreScreen.kt

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
package kz.zhombie.bazaar.ui.presentation
22

33
import android.net.Uri
4+
import android.os.Parcelable
5+
import kotlinx.parcelize.Parcelize
46
import kz.garage.multimedia.store.model.*
57
import kz.zhombie.bazaar.api.core.settings.CameraSettings
68
import kz.zhombie.bazaar.api.core.settings.Mode
7-
import java.io.Serializable
89

910
internal object MediaStoreScreen {
1011

12+
@Parcelize
1113
data class Settings constructor(
1214
val mode: Mode,
1315
val maxSelectionCount: Int,
1416
val cameraSettings: CameraSettings,
1517
val isLocalMediaSearchAndSelectEnabled: Boolean,
1618
val isFolderBasedInterfaceEnabled: Boolean
17-
) : Serializable {
19+
) : Parcelable {
1820

1921
fun isCameraShouldBeAvailable(): Boolean {
2022
return when (mode) {

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
dependencies {
1010
classpath 'com.android.tools.build:gradle:7.0.4'
1111

12-
classpath 'com.google.firebase:firebase-appdistribution-gradle:2.2.0'
12+
classpath 'com.google.firebase:firebase-appdistribution-gradle:3.0.1'
1313

1414
classpath 'com.google.gms:google-services:4.3.10'
1515

‎sample/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ dependencies {
8787
implementation 'com.google.android.material:material:1.4.0'
8888

8989
// Firebase
90-
implementation 'com.google.firebase:firebase-analytics-ktx:20.0.2'
90+
implementation 'com.google.firebase:firebase-analytics-ktx:20.1.1'
9191

9292
// Coil
9393
implementation "io.coil-kt:coil:$coil_version"

0 commit comments

Comments
 (0)