Run clean up

tunjid · Apr 18, 2021 · 0f6638d · 0f6638d
1 parent 67bf60c
commit 0f6638d
Show file tree

Hide file tree

Showing 69 changed files with 834 additions and 821 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -101,7 +101,7 @@ dependencies {
     implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
     implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
-    implementation'com.jakewharton.rx2:replaying-share-kotlin:2.0.0'
+    implementation 'com.jakewharton.rx2:replaying-share-kotlin:2.0.0'
 
     implementation 'me.everything:overscroll-decor-android:1.1.0'
     implementation 'com.andkulikov:transitionseverywhere:2.1.0'

diff --git a/app/src/main/java/com/tunjid/androidx/MutedColors.kt b/app/src/main/java/com/tunjid/androidx/MutedColors.kt
@@ -4,19 +4,19 @@ import android.graphics.Color
 
 object MutedColors {
     private val mutedColors = intArrayOf(
-            Color.parseColor("#2980b9"), // Belize Hole
-            Color.parseColor("#2c3e50"), // Midnight Blue
-            Color.parseColor("#c0392b"), // Pomegranate
-            Color.parseColor("#16a085"), // Green Sea
-            Color.parseColor("#7f8c8d") // Concrete
+        Color.parseColor("#2980b9"), // Belize Hole
+        Color.parseColor("#2c3e50"), // Midnight Blue
+        Color.parseColor("#c0392b"), // Pomegranate
+        Color.parseColor("#16a085"), // Green Sea
+        Color.parseColor("#7f8c8d") // Concrete
     )
 
     private val darkerMutedColors = intArrayOf(
-            Color.parseColor("#304233"),
-            Color.parseColor("#353b45"),
-            Color.parseColor("#392e3a"),
-            Color.parseColor("#3e2a2a"),
-            Color.parseColor("#474747")
+        Color.parseColor("#304233"),
+        Color.parseColor("#353b45"),
+        Color.parseColor("#392e3a"),
+        Color.parseColor("#3e2a2a"),
+        Color.parseColor("#474747")
     )
 
     fun colorAt(isDark: Boolean, index: Int) = palette(isDark).circular(index)

diff --git a/app/src/main/java/com/tunjid/androidx/tabcomms/ble/BleScanFragment.kt b/app/src/main/java/com/tunjid/androidx/tabcomms/ble/BleScanFragment.kt
@@ -15,20 +15,19 @@ import android.view.View
 import androidx.core.app.ActivityCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.DividerItemDecoration
-import androidx.recyclerview.widget.RecyclerView
 import com.tunjid.androidx.PlaceHolder
 import com.tunjid.androidx.R
 import com.tunjid.androidx.communications.bluetooth.ScanResultCompat
+import com.tunjid.androidx.core.components.doOnEveryEvent
 import com.tunjid.androidx.core.content.themeColorAt
 import com.tunjid.androidx.core.delegates.fragmentArgs
 import com.tunjid.androidx.databinding.FragmentBleScanBinding
 import com.tunjid.androidx.databinding.ViewholderScanBinding
 import com.tunjid.androidx.isDarkTheme
 import com.tunjid.androidx.map
 import com.tunjid.androidx.mapDistinct
-import com.tunjid.androidx.navigation.MultiStackNavigator
-import com.tunjid.androidx.navigation.activityNavigatorController
 import com.tunjid.androidx.recyclerview.listAdapterOf
 import com.tunjid.androidx.recyclerview.verticalLayoutManager
 import com.tunjid.androidx.recyclerview.viewbinding.BindingViewHolder
@@ -39,6 +38,7 @@ import com.tunjid.androidx.tabnav.routing.routeName
 import com.tunjid.androidx.uidrivers.InsetFlags
 import com.tunjid.androidx.uidrivers.callback
 import com.tunjid.androidx.uidrivers.uiState
+import com.tunjid.androidx.uidrivers.updatePartial
 
 class BleScanFragment : Fragment(R.layout.fragment_ble_scan) {
 
@@ -60,6 +60,9 @@ class BleScanFragment : Fragment(R.layout.fragment_ble_scan) {
             lightStatusBar = !requireContext().isDarkTheme,
             navBarColor = requireContext().themeColorAt(R.attr.nav_bar_color)
         )
+        else viewLifecycleOwner.lifecycle.doOnEveryEvent(Lifecycle.Event.ON_RESUME) {
+            ::uiState.updatePartial { copy(fabShows = false) }
+        }
 
         val placeHolder = PlaceHolder(view.findViewById(R.id.placeholder_container))
         placeHolder.bind(PlaceHolder.State(R.string.no_ble_devices, R.drawable.ic_bluetooth_24dp))

diff --git a/app/src/main/java/com/tunjid/androidx/tabcomms/ble/BleViewModel.kt b/app/src/main/java/com/tunjid/androidx/tabcomms/ble/BleViewModel.kt
@@ -36,7 +36,7 @@ private sealed class BleUpdate {
 }
 
 private data class AggregatedInput(
-    val hasPermission: Boolean= false,
+    val hasPermission: Boolean = false,
     val scan: Boolean = false
 )
 
@@ -62,7 +62,7 @@ class BleViewModel(application: Application) : AndroidViewModel(application) {
             }
         }
         .distinctUntilChanged()
-        .switchMap { aggregated->
+        .switchMap { aggregated ->
             when {
                 aggregated.scan && aggregated.hasPermission -> context.bluetoothUpdates()
                 !aggregated.scan -> Flowable.just(BleUpdate.Scanning(isScanning = false))

diff --git a/app/src/main/java/com/tunjid/androidx/tablists/doggo/AdoptDoggoFragment.kt b/app/src/main/java/com/tunjid/androidx/tablists/doggo/AdoptDoggoFragment.kt
@@ -14,8 +14,8 @@ import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.transition.Fade
 import com.tunjid.androidx.R
-import com.tunjid.androidx.core.delegates.fragmentArgs
 import com.tunjid.androidx.core.content.themeColorAt
+import com.tunjid.androidx.core.delegates.fragmentArgs
 import com.tunjid.androidx.databinding.FragmentSimpleListBinding
 import com.tunjid.androidx.databinding.ViewholderDoggoAdoptBinding
 import com.tunjid.androidx.databinding.ViewholderSimpleInputBinding
@@ -67,24 +67,24 @@ class AdoptDoggoFragment : Fragment(R.layout.fragment_simple_list) {
         FragmentSimpleListBinding.bind(view).recyclerView.apply {
             layoutManager = verticalLayoutManager()
             adapter = adapterOf(
-                    itemsSource = {
-                        listOf(AdoptItem.Header) + listOf(*resources.getStringArray(R.array.adoption_items)).map(AdoptItem::Input)
-                    },
-                    viewHolderCreator = { parent, viewType ->
-                        when (viewType) {
-                            AdoptItem.Input::class.java.hashCode() -> parent.inputViewHolder()
-                            AdoptItem.Header::class.java.hashCode() -> parent.headerHolder()
-                            else -> throw IllegalArgumentException("Unknown view type")
-                        }
-                    },
-                    viewHolderBinder = { viewHolder, item, _ ->
-                        when (item) {
-                            is AdoptItem.Input -> viewHolder.typed<ViewholderSimpleInputBinding>().bind(item.hint)
-                            is AdoptItem.Header -> viewHolder.typed<ViewholderDoggoAdoptBinding>().doggoBinder.bind(doggo)
-                        }
-                    },
-                    viewTypeFunction = { it.javaClass.hashCode() },
-                    itemIdFunction = { it.hashCode().toLong() }
+                itemsSource = {
+                    listOf(AdoptItem.Header) + listOf(*resources.getStringArray(R.array.adoption_items)).map(AdoptItem::Input)
+                },
+                viewHolderCreator = { parent, viewType ->
+                    when (viewType) {
+                        AdoptItem.Input::class.java.hashCode() -> parent.inputViewHolder()
+                        AdoptItem.Header::class.java.hashCode() -> parent.headerHolder()
+                        else -> throw IllegalArgumentException("Unknown view type")
+                    }
+                },
+                viewHolderBinder = { viewHolder, item, _ ->
+                    when (item) {
+                        is AdoptItem.Input -> viewHolder.typed<ViewholderSimpleInputBinding>().bind(item.hint)
+                        is AdoptItem.Header -> viewHolder.typed<ViewholderDoggoAdoptBinding>().doggoBinder.bind(doggo)
+                    }
+                },
+                viewTypeFunction = { it.javaClass.hashCode() },
+                itemIdFunction = { it.hashCode().toLong() }
             )
             addItemDecoration(context.divider(DividerItemDecoration.HORIZONTAL))
         }

diff --git a/app/src/main/java/com/tunjid/androidx/tablists/doggo/DoggoFragment.kt b/app/src/main/java/com/tunjid/androidx/tablists/doggo/DoggoFragment.kt
@@ -30,7 +30,7 @@ class DoggoFragment : Fragment(R.layout.fragment_image_detail) {
             override val thumbnail: ImageView get() = binding.doggoImage
             override val fullResolution: ImageView get() = binding.fullSize
             override fun onDoggoThumbnailLoaded(doggo: Doggo) = parentFragment?.startPostponedEnterTransition()
-                    ?: Unit
+                ?: Unit
         }.bind(doggo)
     }
 

diff --git a/app/src/main/java/com/tunjid/androidx/tablists/doggo/DoggoRankFragment.kt b/app/src/main/java/com/tunjid/androidx/tablists/doggo/DoggoRankFragment.kt
@@ -43,8 +43,8 @@ import com.tunjid.androidx.uidrivers.callback
 import com.tunjid.androidx.uidrivers.uiState
 import com.tunjid.androidx.uidrivers.updatePartial
 import com.tunjid.androidx.view.util.hashTransitionName
-import kotlin.math.abs
 import kotlinx.parcelize.Parcelize
+import kotlin.math.abs
 
 @Parcelize
 data class RankArgs(

diff --git a/app/src/main/java/com/tunjid/androidx/tablists/doggo/DoggoRankViewModel.kt b/app/src/main/java/com/tunjid/androidx/tablists/doggo/DoggoRankViewModel.kt
@@ -16,7 +16,7 @@ sealed class RankAction {
 
     data class SwipeDragStarted(val doggo: Doggo, val actionState: Int) : RankAction()
     data class SwipeDragEnded(val doggo: Doggo, val actionState: Int) : RankAction()
-    data class ViewHash(val hashCode: Int): RankAction()
+    data class ViewHash(val hashCode: Int) : RankAction()
     object Reset : RankAction()
 }
 

diff --git a/app/src/main/java/com/tunjid/androidx/tablists/doggo/DoggoViewModel.kt b/app/src/main/java/com/tunjid/androidx/tablists/doggo/DoggoViewModel.kt
@@ -31,11 +31,11 @@ class DoggoViewModel(application: Application) : AndroidViewModel(application) {
     fun onSwiped(current: Int, fraction: Float) {
         val next = min(current + 1, doggos.lastIndex)
         disposables.add(Maybes.zip(
-                colorFor(doggos[current]),
-                colorFor(doggos[next])
+            colorFor(doggos[current]),
+            colorFor(doggos[next])
         ) { a, b -> colorEvaluator.evaluate(fraction, a, b) as Int }
-                .subscribeOn(io())
-                .subscribe(processor::onNext, Throwable::printStackTrace)
+            .subscribeOn(io())
+            .subscribe(processor::onNext, Throwable::printStackTrace)
         )
     }
 
@@ -45,18 +45,18 @@ class DoggoViewModel(application: Application) : AndroidViewModel(application) {
         val app = getApplication<App>()
         val metrics = app.resources.displayMetrics
         val bitmap = app.drawableAt(doggo.imageRes)?.toBitmap(
-                width = metrics.widthPixels / 4,
-                height = metrics.heightPixels / 4,
-                config = Bitmap.Config.ARGB_8888
+            width = metrics.widthPixels / 4,
+            height = metrics.heightPixels / 4,
+            config = Bitmap.Config.ARGB_8888
         ) ?: return@fromCallable Color.BLACK
 
         Palette.from(bitmap)
-                .generate()
-                .getDominantColor(Color.BLACK)
+            .generate()
+            .getDominantColor(Color.BLACK)
     }
-            .subscribeOn(io())
-            .observeOn(mainThread())
-            .cache()
+        .subscribeOn(io())
+        .observeOn(mainThread())
+        .cache()
 
     override fun onCleared() {
         super.onCleared()

diff --git a/app/src/main/java/com/tunjid/androidx/tablists/tables/StandingsFragment.kt b/app/src/main/java/com/tunjid/androidx/tablists/tables/StandingsFragment.kt
@@ -10,9 +10,8 @@ import com.tunjid.androidx.core.delegates.fragmentArgs
 import com.tunjid.androidx.databinding.FragmentStandingsBinding
 import com.tunjid.androidx.isDarkTheme
 import com.tunjid.androidx.recyclerview.multiscroll.DynamicCellSizer
-import com.tunjid.androidx.uidrivers.UiState
-import com.tunjid.androidx.uidrivers.uiState
 import com.tunjid.androidx.tabnav.routing.routeName
+import com.tunjid.androidx.uidrivers.uiState
 
 class StandingsFragment : Fragment(R.layout.fragment_standings) {
 

diff --git a/app/src/main/java/com/tunjid/androidx/tablists/tiles/EndlessTileViewModel.kt b/app/src/main/java/com/tunjid/androidx/tablists/tiles/EndlessTileViewModel.kt
@@ -31,12 +31,12 @@ class EndlessTileViewModel(application: Application) : AndroidViewModel(applicat
         disposables.add(Single.fromCallable {
             Diff.calculate(tiles, generateTiles()) { oldTiles, addedTiles -> oldTiles + addedTiles }
         }
-                .subscribeOn(io())
-                .observeOn(mainThread())
-                .map { diff ->
-                    tiles.replace(diff.items)
-                    diff.result
-                }.subscribe(moreTiles::setValue))
+            .subscribeOn(io())
+            .observeOn(mainThread())
+            .map { diff ->
+                tiles.replace(diff.items)
+                diff.result
+            }.subscribe(moreTiles::setValue))
     }
 
     private fun generateTiles(): List<Tile> {

diff --git a/app/src/main/java/com/tunjid/androidx/tablists/tiles/EndlessTilesFragment.kt b/app/src/main/java/com/tunjid/androidx/tablists/tiles/EndlessTilesFragment.kt
@@ -19,14 +19,13 @@ import com.tunjid.androidx.recyclerview.gridLayoutManager
 import com.tunjid.androidx.recyclerview.setEndlessScrollListener
 import com.tunjid.androidx.recyclerview.viewbinding.BindingViewHolder
 import com.tunjid.androidx.tablists.tiles.EndlessTileViewModel.Companion.NUM_TILES
-import com.tunjid.androidx.tabnav.navigator.MultipleStackChildFragment
+import com.tunjid.androidx.tabnav.routing.routeName
 import com.tunjid.androidx.uidrivers.InsetFlags
 import com.tunjid.androidx.uidrivers.SpringItemAnimator
 import com.tunjid.androidx.uidrivers.UiState
+import com.tunjid.androidx.uidrivers.callback
 import com.tunjid.androidx.uidrivers.uiState
 import com.tunjid.androidx.uidrivers.updatePartial
-import com.tunjid.androidx.tabnav.routing.routeName
-import com.tunjid.androidx.uidrivers.callback
 import me.everything.android.ui.overscroll.OverScrollDecoratorHelper
 import kotlin.math.abs