Merge pull request #9 from mehdiyari/development

Version 0.9.1
mehdiyari · Aug 12, 2020 · f66650a · f66650a
2 parents d6fed93 + d4b336d
commit f66650a
Show file tree

Hide file tree

Showing 41 changed files with 209 additions and 235 deletions.
diff --git a/fallery/build.gradle b/fallery/build.gradle
@@ -34,9 +34,9 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.core:core-ktx:1.3.1'
-    implementation 'com.google.android.material:material:1.1.0'
+    implementation 'com.google.android.material:material:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'

diff --git a/fallery/src/main/AndroidManifest.xml b/fallery/src/main/AndroidManifest.xml
@@ -6,7 +6,8 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application
-        android:requestLegacyExternalStorage="true">
+        android:requestLegacyExternalStorage="true"
+        android:supportsRtl="true">
         <activity
             android:windowSoftInputMode="adjustResize"
             android:name=".main.ui.FalleryActivity"

diff --git a/...ery/src/main/java/ir/mehdiyari/fallery/buckets/bucketContent/BaseBucketContentFragment.kt b/...ery/src/main/java/ir/mehdiyari/fallery/buckets/bucketContent/BaseBucketContentFragment.kt
@@ -14,13 +14,12 @@ import ir.mehdiyari.fallery.main.di.FalleryActivityComponentHolder
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.InternalCoroutinesApi
 
+@OptIn(ExperimentalCoroutinesApi::class, InternalCoroutinesApi::class)
 class BaseBucketContentFragment : Fragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? =
         inflater.inflate(R.layout.fragment_base_bucket_content, container, false)
 
-    @ExperimentalCoroutinesApi
-    @InternalCoroutinesApi
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         initViewModel()

diff --git a/fallery/src/main/java/ir/mehdiyari/fallery/buckets/bucketContent/BucketContentViewModel.kt b/fallery/src/main/java/ir/mehdiyari/fallery/buckets/bucketContent/BucketContentViewModel.kt
@@ -16,28 +16,23 @@ import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import java.util.concurrent.atomic.AtomicBoolean
 
-
+@OptIn(ExperimentalCoroutinesApi::class)
 internal class BucketContentViewModel constructor(
     private val abstractBucketContentProvider: AbstractBucketContentProvider,
     private val bucketType: BucketType,
     private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO
 ) : BaseViewModel() {
 
-    @ExperimentalCoroutinesApi
     private val medias = MutableStateFlow<List<Media>>(listOf())
 
-    @ExperimentalCoroutinesApi
     val mediaList: StateFlow<List<Media>> = medias
 
     val showPreviewFragmentLiveData = SingleLiveEvent<String>()
 
-    @ExperimentalCoroutinesApi
     private val loadingMutableStateFlow = MutableStateFlow<LoadingViewState?>(null)
 
-    @ExperimentalCoroutinesApi
     val loadingViewStateFlow: StateFlow<LoadingViewState?> = loadingMutableStateFlow
 
-    @ExperimentalCoroutinesApi
     fun getMedias(bucketId: Long, refresh: Boolean = false) {
         if (!refresh && mediaList.value.isNotEmpty()) return
         val clearList = AtomicBoolean(refresh)
@@ -66,10 +61,8 @@ internal class BucketContentViewModel constructor(
         showPreviewFragmentLiveData.value = path
     }
 
-    @ExperimentalCoroutinesApi
     fun getIndexOfPath(path: String): Int = mediaList.value.indexOfFirst { it.getMediaPath() == path.trim() }
 
-    @ExperimentalCoroutinesApi
     fun getMediaPathByPosition(position: Int): String? = mediaList.value.getOrNull(position)?.getMediaPath()
 
     fun retry(bucketId: Long) {

diff --git a/.../src/main/java/ir/mehdiyari/fallery/buckets/bucketContent/adapter/BucketContentAdapter.kt b/.../src/main/java/ir/mehdiyari/fallery/buckets/bucketContent/adapter/BucketContentAdapter.kt
@@ -100,9 +100,9 @@ class BucketContentAdapter constructor(
 
         private fun initSelectingStateOfView(adapterPosition: Int) {
             if (selectedMediaTracker?.contains(getItemPath(adapterPosition)) == true)
-                itemView.imageViewSelectDeselectPhoto.background = selectedDrawable
+                itemView.imageViewSelectDeselectPhoto.setImageDrawable(selectedDrawable)
             else
-                itemView.imageViewSelectDeselectPhoto.background = deselectedDrawable
+                itemView.imageViewSelectDeselectPhoto.setImageDrawable(deselectedDrawable)
         }
 
     }
@@ -149,9 +149,9 @@ class BucketContentAdapter constructor(
 
         private fun initSelectingStateOfView(adapterPosition: Int) {
             if (selectedMediaTracker?.contains(getItemPath(adapterPosition)) == true)
-                itemView.imageViewSelectDeselectVideo.background = selectedDrawable
+                itemView.imageViewSelectDeselectVideo.setImageDrawable(selectedDrawable)
             else
-                itemView.imageViewSelectDeselectVideo.background = deselectedDrawable
+                itemView.imageViewSelectDeselectVideo.setImageDrawable(deselectedDrawable)
         }
     }
 }
diff --git a/...src/main/java/ir/mehdiyari/fallery/buckets/bucketContent/content/BucketContentFragment.kt b/...src/main/java/ir/mehdiyari/fallery/buckets/bucketContent/content/BucketContentFragment.kt
@@ -27,7 +27,7 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 
-@ExperimentalCoroutinesApi
+@OptIn(ExperimentalCoroutinesApi::class)
 class BucketContentFragment : Fragment() {
 
     private lateinit var bucketContentViewModel: BucketContentViewModel
@@ -77,7 +77,7 @@ class BucketContentFragment : Fragment() {
             requireParentFragment(),
             FalleryActivityComponentHolder.getOrNull()!!.provideBucketContentViewModelFactory()
         )[BucketContentViewModel::class.java].apply {
-            lifecycleScope.launch {
+            viewLifecycleOwner.lifecycleScope.launch {
                 loadingViewStateFlow.collect {
                     when (it) {
                         is LoadingViewState.ShowLoading -> showLoading()
@@ -107,7 +107,7 @@ class BucketContentFragment : Fragment() {
             })
         }
 
-        lifecycleScope.launch {
+        viewLifecycleOwner.lifecycleScope.launch {
             launch {
                 bucketContentViewModel.mediaList.collect {
                     bucketContentAdapter.submitList(it)
@@ -141,4 +141,9 @@ class BucketContentFragment : Fragment() {
         recyclerViewBucketContent.visibility = View.VISIBLE
         contentLoadingProgressBarBucketContent.hide()
     }
+
+    override fun onDestroyView() {
+        recyclerViewBucketContent.adapter = null
+        super.onDestroyView()
+    }
 }
diff --git a/fallery/src/main/java/ir/mehdiyari/fallery/buckets/bucketContent/preview/PreviewFragment.kt b/fallery/src/main/java/ir/mehdiyari/fallery/buckets/bucketContent/preview/PreviewFragment.kt
@@ -2,9 +2,7 @@ package ir.mehdiyari.fallery.buckets.bucketContent.preview
 
 import android.graphics.Color
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.view.WindowManager
 import android.view.animation.TranslateAnimation
 import androidx.fragment.app.Fragment
@@ -25,11 +23,11 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 
-internal class PreviewFragment : Fragment(), View.OnClickListener {
+@OptIn(ExperimentalCoroutinesApi::class)
+internal class PreviewFragment : Fragment(R.layout.fragment_preview), View.OnClickListener {
 
     private lateinit var bucketContentViewModel: BucketContentViewModel
 
-    @ExperimentalCoroutinesApi
     private lateinit var falleryViewModel: FalleryViewModel
 
     private val mediaPreviewAdapter by lazy {
@@ -46,12 +44,12 @@ internal class PreviewFragment : Fragment(), View.OnClickListener {
         FalleryActivityComponentHolder.createOrGetComponent(requireActivity()).provideDeselectedDrawable()
     }
 
-    @ExperimentalCoroutinesApi
     private val pageSelectedCallback by lazy {
         object : ViewPager2.OnPageChangeCallback() {
             override fun onPageSelected(position: Int) {
                 showToolbarWithAnimation()
                 checkForSelection(position)
+                saveCurrentPosition(position)
             }
         }
     }
@@ -60,32 +58,32 @@ internal class PreviewFragment : Fragment(), View.OnClickListener {
         requireActivity() as FalleryToolbarVisibilityController
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? =
-        inflater.inflate(R.layout.fragment_preview, container, false)
-
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         requireActivity().window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN)
         falleryToolbarVisibilityController.hideToolbar(false)
     }
 
+    private fun saveCurrentPosition(position: Int) {
+        arguments?.putString(
+            "from_media_path",
+            bucketContentViewModel.getMediaPathByPosition(position)
+        )
+    }
 
-    @ExperimentalCoroutinesApi
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         initViewModel()
         initView()
     }
 
-    @ExperimentalCoroutinesApi
     override fun onStart() {
         super.onStart()
         viewPagerMediaPreview.registerOnPageChangeCallback(pageSelectedCallback)
         if (viewPagerMediaPreview.adapter == null)
             viewPagerMediaPreview.adapter = mediaPreviewAdapter
     }
 
-    @ExperimentalCoroutinesApi
     private fun initView() {
         FalleryActivityComponentHolder.createOrGetComponent(requireActivity()).provideFalleryOptions().apply {
             viewPagerMediaPreview.orientation = mediaPreviewScrollOrientation
@@ -107,21 +105,19 @@ internal class PreviewFragment : Fragment(), View.OnClickListener {
         imageViewBackButton.setOnClickListener { requireActivity().onBackPressed() }
     }
 
-    @ExperimentalCoroutinesApi
     private fun checkForSelection(position: Int) {
-        appCompatImageButtonMediaSelect.background = bucketContentViewModel.getMediaPathByPosition(position).let {
+        appCompatImageButtonMediaSelect.setImageDrawable(bucketContentViewModel.getMediaPathByPosition(position).let {
             if (it != null && falleryViewModel.isPhotoSelected(it)) selectedDrawable else deselectDrawable
-        }
+        })
     }
 
-    @ExperimentalCoroutinesApi
     private fun initViewModel() {
         falleryViewModel = ViewModelProvider(
             requireActivity(),
             FalleryActivityComponentHolder.createOrGetComponent(requireActivity()).provideFalleryViewModelFactory()
         )[FalleryViewModel::class.java].apply {
             hideSendOrCaptionLayout()
-            lifecycleScope.launch {
+            viewLifecycleOwner.lifecycleScope.launch {
                 mediaCountStateFlow.collect { setupMediaCountView(it) }
             }
         }
@@ -131,15 +127,14 @@ internal class PreviewFragment : Fragment(), View.OnClickListener {
             FalleryActivityComponentHolder.createOrGetComponent(requireActivity()).provideBucketContentViewModelFactory()
         )[BucketContentViewModel::class.java]
 
-        lifecycleScope.launch {
+        viewLifecycleOwner.lifecycleScope.launch {
             bucketContentViewModel.mediaList.collect {
                 if (viewPagerMediaPreview == null)
                     viewPagerMediaPreview.adapter = mediaPreviewAdapter
 
                 mediaPreviewAdapter.medias = it
                 arguments?.getString("from_media_path", null).also { path ->
                     if (path != null) {
-                        arguments?.remove("from_media_path")
                         viewPagerMediaPreview.post {
                             viewPagerMediaPreview.setCurrentItem(bucketContentViewModel.getIndexOfPath(path).apply(this@PreviewFragment::checkForSelection), false)
                         }
@@ -189,18 +184,17 @@ internal class PreviewFragment : Fragment(), View.OnClickListener {
     }
 
 
-    @ExperimentalCoroutinesApi
     override fun onStop() {
         viewPagerMediaPreview.unregisterOnPageChangeCallback(pageSelectedCallback)
         viewPagerMediaPreview.adapter = null
         super.onStop()
     }
 
-    @ExperimentalCoroutinesApi
     override fun onDestroyView() {
         requireActivity().window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
         falleryViewModel.showSendOrCaptionLayout()
         falleryToolbarVisibilityController.showToolbar(false)
+        viewPagerMediaPreview.adapter = null
         super.onDestroyView()
     }
 

diff --git a/fallery/src/main/java/ir/mehdiyari/fallery/buckets/bucketList/BucketListFragment.kt b/fallery/src/main/java/ir/mehdiyari/fallery/buckets/bucketList/BucketListFragment.kt
@@ -4,7 +4,6 @@ import android.Manifest
 import android.os.Build
 import android.os.Bundle
 import android.transition.TransitionManager
-import android.util.DisplayMetrics
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
@@ -27,7 +26,7 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 
-@ExperimentalCoroutinesApi
+@OptIn(ExperimentalCoroutinesApi::class)
 internal class BucketListFragment : Fragment() {
 
     private lateinit var bucketListViewModel: BucketListViewModel
@@ -65,8 +64,7 @@ internal class BucketListFragment : Fragment() {
             getImageViewWidth = {
                 if (recyclerViewBuckets.layoutManager is GridLayoutManager) {
                     (recyclerViewBuckets.layoutManager as GridLayoutManager).let { gridLayoutManager ->
-                        val displayMetric = DisplayMetrics()
-                        requireActivity().windowManager.defaultDisplay.getRealMetrics(displayMetric)
+                        val displayMetric = requireActivity().resources.displayMetrics
                         (((displayMetric.widthPixels - dpToPx(3) * (gridLayoutManager.spanCount - 1)) / gridLayoutManager.spanCount) * 0.5).toInt()
                     }
                 } else {
@@ -91,7 +89,7 @@ internal class BucketListFragment : Fragment() {
             FalleryActivityComponentHolder.componentCreator(requireActivity()).provideBucketListViewModelFactory()
         )[BucketListViewModel::class.java]
 
-        lifecycleScope.launch {
+        viewLifecycleOwner.lifecycleScope.launch {
             launch {
                 falleryViewModel.storagePermissionGrantedStateFlow.collect {
                     if (it == true) {
@@ -117,7 +115,7 @@ internal class BucketListFragment : Fragment() {
         }
 
         bucketListViewModel.apply {
-            lifecycleScope.launch {
+            viewLifecycleOwner.lifecycleScope.launch {
                 loadingViewStateFlow.collect {
                     when (it) {
                         is LoadingViewState.Error -> showErrorLayout()
@@ -127,7 +125,7 @@ internal class BucketListFragment : Fragment() {
                 }
             }
 
-            lifecycleScope.launch {
+            viewLifecycleOwner.lifecycleScope.launch {
                 launch { allMediaCountChanged.collect { falleryViewModel.totalMediaCount = it } }
                 bucketsStateFlow.collect { bucketAdapter.submitList(it) }
             }
@@ -189,4 +187,9 @@ internal class BucketListFragment : Fragment() {
             minCount = 2
         )
     } else 1
+
+    override fun onDestroyView() {
+        recyclerViewBuckets.adapter = null
+        super.onDestroyView()
+    }
 }
diff --git a/fallery/src/main/java/ir/mehdiyari/fallery/buckets/bucketList/BucketListViewModel.kt b/fallery/src/main/java/ir/mehdiyari/fallery/buckets/bucketList/BucketListViewModel.kt
@@ -13,36 +13,30 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 
+@OptIn(ExperimentalCoroutinesApi::class)
 internal class BucketListViewModel constructor(
     private val abstractMediaBucketProvider: AbstractMediaBucketProvider,
     private val bucketType: BucketType = BucketType.VIDEO_PHOTO_BUCKETS,
     private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO
 ) : BaseViewModel() {
 
-    @ExperimentalCoroutinesApi
     private val bucketsMutableStateFlow = MutableStateFlow<List<MediaBucket>>(listOf())
 
-    @ExperimentalCoroutinesApi
     private val allMediaCountChangedStateFlow = MutableStateFlow(0)
 
-    @ExperimentalCoroutinesApi
     val allMediaCountChanged: StateFlow<Int> = allMediaCountChangedStateFlow
 
-    @ExperimentalCoroutinesApi
     val bucketsStateFlow: StateFlow<List<MediaBucket>> = this.bucketsMutableStateFlow
 
-    @ExperimentalCoroutinesApi
     private val loadingMutableStateFlow = MutableStateFlow<LoadingViewState?>(null)
 
-    @ExperimentalCoroutinesApi
     val loadingViewStateFlow: StateFlow<LoadingViewState?> = loadingMutableStateFlow
 
 
     fun getBucketNameById(id: Long): String = bucketsStateFlow.value.firstOrNull {
         id == it.id
     }?.displayName ?: "Unknown"
 
-    @ExperimentalCoroutinesApi
     fun getBuckets(refresh: Boolean = false) {
         if (!refresh && bucketsStateFlow.value.isNotEmpty() || loadingViewStateFlow.value == LoadingViewState.ShowLoading) return
         loadingMutableStateFlow.value = LoadingViewState.ShowLoading
@@ -66,7 +60,6 @@ internal class BucketListViewModel constructor(
         }
     }
 
-    @ExperimentalCoroutinesApi
     fun retry() {
         getBuckets(true)
     }