Merge pull request #510 from squanchy-dev/cleanup_support_package

fourlastor · web-flow · commit c924b8b06979 · 2018-04-04T23:19:58.000+01:00
Cleanup support package
diff --git a/app/src/debug/java/net/squanchy/support/injection/CurrentTimeModule.kt b/app/src/debug/java/net/squanchy/support/injection/CurrentTimeModule.kt
@@ -9,5 +9,5 @@ import net.squanchy.support.system.DebugCurrentTime
 class CurrentTimeModule {
 
     @Provides
-    internal fun provideCurrentTime(): CurrentTime = DebugCurrentTime()
+    internal fun currentTime(): CurrentTime = DebugCurrentTime()
 }
diff --git a/app/src/main/java/net/squanchy/home/BottomNavigationHelper.kt b/app/src/main/java/net/squanchy/home/BottomNavigationHelper.kt
@@ -5,7 +5,7 @@ import android.annotation.SuppressLint
 import android.support.design.internal.BottomNavigationItemView
 import android.support.design.internal.BottomNavigationMenuView
 import android.support.design.widget.BottomNavigationView
-import net.squanchy.support.kotlin.children
+import androidx.view.children
 import timber.log.Timber
 
 @SuppressLint("RestrictedApi") // This is a hack, not much we can do about it until there is an API for this
diff --git a/app/src/main/java/net/squanchy/home/HomeComponent.kt b/app/src/main/java/net/squanchy/home/HomeComponent.kt
@@ -1,17 +1,16 @@
 package net.squanchy.home
 
 import android.support.v7.app.AppCompatActivity
+import dagger.Component
 import net.squanchy.analytics.Analytics
+import net.squanchy.injection.ActivityContextModule
 import net.squanchy.injection.ActivityLifecycle
 import net.squanchy.injection.ApplicationComponent
+import net.squanchy.injection.applicationComponent
 import net.squanchy.navigation.NavigationModule
 import net.squanchy.navigation.Navigator
 import net.squanchy.support.injection.CurrentTimeModule
 
-import dagger.Component
-import net.squanchy.injection.ActivityContextModule
-import net.squanchy.injection.applicationComponent
-
 fun homeComponent(activity: AppCompatActivity) =
     DaggerHomeComponent.builder()
         .applicationComponent(activity.applicationComponent)
diff --git a/app/src/main/java/net/squanchy/injection/ApplicationComponent.kt b/app/src/main/java/net/squanchy/injection/ApplicationComponent.kt
@@ -15,7 +15,7 @@ import net.squanchy.service.repository.EventRepository
 import net.squanchy.service.repository.SpeakerRepository
 import net.squanchy.service.repository.TracksRepository
 import net.squanchy.service.repository.injection.RepositoryModule
-import net.squanchy.support.injection.ChecksumModule
+import net.squanchy.support.checksum.ChecksumModule
 import net.squanchy.support.injection.CurrentTimeModule
 
 fun createApplicationComponent(application: Application): ApplicationComponent {
diff --git a/app/src/main/java/net/squanchy/schedule/ScheduleModule.kt b/app/src/main/java/net/squanchy/schedule/ScheduleModule.kt
@@ -5,8 +5,8 @@ import dagger.Provides
 import net.squanchy.schedule.tracksfilter.TracksFilter
 import net.squanchy.service.firebase.FirebaseAuthService
 import net.squanchy.service.firebase.FirestoreDbService
-import net.squanchy.support.injection.ChecksumModule
-import net.squanchy.support.lang.Checksum
+import net.squanchy.support.checksum.ChecksumModule
+import net.squanchy.support.checksum.Checksum
 
 @Module(includes = [ChecksumModule::class])
 class ScheduleModule {
diff --git a/app/src/main/java/net/squanchy/schedule/ScheduleService.kt b/app/src/main/java/net/squanchy/schedule/ScheduleService.kt
@@ -15,7 +15,7 @@ import net.squanchy.service.firebase.model.schedule.FirestoreEvent
 import net.squanchy.service.firebase.model.schedule.FirestoreFavorite
 import net.squanchy.service.firebase.model.schedule.FirestoreSchedulePage
 import net.squanchy.service.firebase.toEvent
-import net.squanchy.support.lang.Checksum
+import net.squanchy.support.checksum.Checksum
 import org.joda.time.DateTimeZone
 import org.joda.time.LocalDate
 
diff --git a/app/src/main/java/net/squanchy/service/firebase/FirestoreMappers.kt b/app/src/main/java/net/squanchy/service/firebase/FirestoreMappers.kt
@@ -10,7 +10,7 @@ import net.squanchy.service.firebase.model.schedule.FirestorePlace
 import net.squanchy.service.firebase.model.schedule.FirestoreSpeaker
 import net.squanchy.service.firebase.model.schedule.FirestoreTrack
 import net.squanchy.speaker.domain.view.Speaker
-import net.squanchy.support.lang.Checksum
+import net.squanchy.support.checksum.Checksum
 import net.squanchy.support.lang.optional
 import net.squanchy.venue.domain.view.Venue
 import org.joda.time.DateTimeZone
diff --git a/app/src/main/java/net/squanchy/service/repository/firestore/FirestoreEventRepository.kt b/app/src/main/java/net/squanchy/service/repository/firestore/FirestoreEventRepository.kt
@@ -11,7 +11,7 @@ import net.squanchy.service.firebase.model.schedule.FirestoreEvent
 import net.squanchy.service.firebase.model.schedule.FirestoreFavorite
 import net.squanchy.service.firebase.toEvent
 import net.squanchy.service.repository.EventRepository
-import net.squanchy.support.lang.Checksum
+import net.squanchy.support.checksum.Checksum
 import org.joda.time.DateTimeZone
 
 class FirestoreEventRepository(
diff --git a/app/src/main/java/net/squanchy/service/repository/firestore/FirestoreSpeakerRepository.kt b/app/src/main/java/net/squanchy/service/repository/firestore/FirestoreSpeakerRepository.kt
@@ -5,7 +5,7 @@ import net.squanchy.service.firebase.FirestoreDbService
 import net.squanchy.service.firebase.toSpeaker
 import net.squanchy.service.repository.SpeakerRepository
 import net.squanchy.speaker.domain.view.Speaker
-import net.squanchy.support.lang.Checksum
+import net.squanchy.support.checksum.Checksum
 
 class FirestoreSpeakerRepository(
     private val dbService: FirestoreDbService,
diff --git a/app/src/main/java/net/squanchy/service/repository/firestore/FirestoreTracksRepository.kt b/app/src/main/java/net/squanchy/service/repository/firestore/FirestoreTracksRepository.kt
@@ -5,7 +5,7 @@ import net.squanchy.schedule.domain.view.Track
 import net.squanchy.service.firebase.FirestoreDbService
 import net.squanchy.service.firebase.toTrack
 import net.squanchy.service.repository.TracksRepository
-import net.squanchy.support.lang.Checksum
+import net.squanchy.support.checksum.Checksum
 
 class FirestoreTracksRepository(private val firestoreDbService: FirestoreDbService, private val checksum: Checksum) : TracksRepository {
 
diff --git a/app/src/main/java/net/squanchy/service/repository/injection/RepositoryModule.kt b/app/src/main/java/net/squanchy/service/repository/injection/RepositoryModule.kt
@@ -9,8 +9,8 @@ import net.squanchy.service.repository.TracksRepository
 import net.squanchy.service.repository.firestore.FirestoreEventRepository
 import net.squanchy.service.repository.firestore.FirestoreSpeakerRepository
 import net.squanchy.service.repository.firestore.FirestoreTracksRepository
-import net.squanchy.support.injection.ChecksumModule
-import net.squanchy.support.lang.Checksum
+import net.squanchy.support.checksum.ChecksumModule
+import net.squanchy.support.checksum.Checksum
 
 @Module(includes = [ChecksumModule::class])
 class RepositoryModule {
diff --git a/app/src/main/java/net/squanchy/support/checksum/Checksum.kt b/app/src/main/java/net/squanchy/support/checksum/Checksum.kt
@@ -1,4 +1,4 @@
-package net.squanchy.support.lang
+package net.squanchy.support.checksum
 
 import java.io.UnsupportedEncodingException
 import java.util.zip.CRC32
diff --git a/app/src/main/java/net/squanchy/support/checksum/ChecksumModule.kt b/app/src/main/java/net/squanchy/support/checksum/ChecksumModule.kt
@@ -0,0 +1,11 @@
+package net.squanchy.support.checksum
+
+import dagger.Module
+import dagger.Provides
+
+@Module
+class ChecksumModule {
+
+    @Provides
+    internal fun checksum() = Checksum()
+}
diff --git a/app/src/main/java/net/squanchy/support/config/DialogLayoutParameters.kt b/app/src/main/java/net/squanchy/support/config/DialogLayoutParameters.kt
@@ -1,16 +1,18 @@
 package net.squanchy.support.config
 
 import android.app.Activity
+import android.content.Context
 import android.view.ViewGroup
 import android.view.Window
+import net.squanchy.R
 
 class DialogLayoutParameters private constructor(
-    private val formFactorChecker: FormFactorChecker,
+    private val context: Context,
     private val height: Int
 ) {
 
     fun applyTo(window: Window) {
-        if (formFactorChecker.isTablet) {
+        if (context.isTablet) {
             window.setLayout(ViewGroup.LayoutParams.WRAP_CONTENT, height)
         } else {
             window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, height)
@@ -20,17 +22,14 @@ class DialogLayoutParameters private constructor(
     companion object {
 
         fun fullHeight(activity: Activity): DialogLayoutParameters {
-            return DialogLayoutParameters(
-                    FormFactorChecker(activity),
-                    ViewGroup.LayoutParams.MATCH_PARENT
-            )
+            return DialogLayoutParameters(activity, ViewGroup.LayoutParams.MATCH_PARENT)
         }
 
         fun wrapHeight(activity: Activity): DialogLayoutParameters {
-            return DialogLayoutParameters(
-                    FormFactorChecker(activity),
-                    ViewGroup.LayoutParams.WRAP_CONTENT
-            )
+            return DialogLayoutParameters(activity, ViewGroup.LayoutParams.WRAP_CONTENT)
         }
     }
+
+    private val Context.isTablet: Boolean
+        get() = resources.getBoolean(R.bool.isTablet)
 }
diff --git a/app/src/main/java/net/squanchy/support/config/FormFactorChecker.kt b/app/src/main/java/net/squanchy/support/config/FormFactorChecker.kt
diff --git a/app/src/main/java/net/squanchy/support/injection/ChecksumModule.kt b/app/src/main/java/net/squanchy/support/injection/ChecksumModule.kt
diff --git a/app/src/main/java/net/squanchy/support/kotlin/ViewHelper.kt b/app/src/main/java/net/squanchy/support/kotlin/ViewHelper.kt
diff --git a/app/src/main/java/net/squanchy/support/system/CurrentTime.kt b/app/src/main/java/net/squanchy/support/system/CurrentTime.kt
@@ -3,9 +3,11 @@ package net.squanchy.support.system
 import org.joda.time.DateTime
 
 interface CurrentTime {
+
     fun currentDateTime(): DateTime
 }
 
+@Suppress("unused") // It's actually used in the release CurrentTimeModule
 class AndroidCurrentTime : CurrentTime {
 
     override fun currentDateTime(): DateTime = DateTime.now()
diff --git a/app/src/main/java/net/squanchy/support/widget/CardLayout.kt b/app/src/main/java/net/squanchy/support/widget/CardLayout.kt
@@ -8,6 +8,7 @@ import android.util.AttributeSet
 import android.view.View
 import android.view.ViewOutlineProvider
 import android.widget.FrameLayout
+import androidx.content.res.use
 
 import net.squanchy.R
 
@@ -22,18 +23,17 @@ open class CardLayout @JvmOverloads constructor(
         super.setClipToOutline(false)
 
         val a = context.obtainStyledAttributes(attrs, R.styleable.CardLayout, defStyleAttr, defStyleRes)
-        val insetHorizontal: Int
-        val insetTop: Int
-        val insetBottom: Int
-        val radius: Int
-        try {
+        var insetHorizontal = 0
+        var insetTop = 0
+        var insetBottom = 0
+        var radius = 0
+
+        a.use {
             ensureHasNecessaryAttributes(a)
             insetHorizontal = a.getDimensionPixelSize(R.styleable.CardLayout_cardInsetHorizontal, 0)
             insetTop = a.getDimensionPixelSize(R.styleable.CardLayout_cardInsetTop, 0)
             insetBottom = a.getDimensionPixelSize(R.styleable.CardLayout_cardInsetBottom, 0)
             radius = a.getDimensionPixelSize(R.styleable.CardLayout_cardCornerRadius, 0)
-        } finally {
-            a.recycle()
         }
 
         applyInsetsAndRadius(insetHorizontal, insetTop, insetBottom, radius)
diff --git a/app/src/main/java/net/squanchy/support/widget/SpeakerView.kt b/app/src/main/java/net/squanchy/support/widget/SpeakerView.kt
@@ -6,12 +6,12 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.LinearLayout
+import androidx.view.children
 import kotlinx.android.synthetic.main.activity_event_details.view.*
 import net.squanchy.R
 import net.squanchy.imageloader.ImageLoader
 import net.squanchy.imageloader.imageLoaderComponent
 import net.squanchy.speaker.domain.view.Speaker
-import net.squanchy.support.kotlin.children
 import net.squanchy.support.unwrapToActivityContext
 
 abstract class SpeakerView @JvmOverloads constructor(
diff --git a/app/src/release/java/net/squanchy/support/injection/CurrentTimeModule.kt b/app/src/release/java/net/squanchy/support/injection/CurrentTimeModule.kt
@@ -9,5 +9,5 @@ import net.squanchy.support.system.CurrentTime
 class CurrentTimeModule {
 
     @Provides
-    internal fun provideCurrentTime(): CurrentTime = AndroidCurrentTime()
+    internal fun currentTime(): CurrentTime = AndroidCurrentTime()
 }
diff --git a/app/src/test/java/net/squanchy/schedule/FirestoreScheduleServiceTest.kt b/app/src/test/java/net/squanchy/schedule/FirestoreScheduleServiceTest.kt
@@ -17,7 +17,7 @@ import net.squanchy.service.firebase.aFirestoreSchedulePage
 import net.squanchy.service.firebase.aFirestoreSpeaker
 import net.squanchy.service.firebase.aFirestoreTrack
 import net.squanchy.service.firebase.model.schedule.FirestoreFavorite
-import net.squanchy.support.lang.Checksum
+import net.squanchy.support.checksum.Checksum
 import net.squanchy.support.lang.Optional
 import org.joda.time.LocalDate
 import org.joda.time.LocalDateTime
diff --git a/app/src/test/java/net/squanchy/service/firebase/FirestoreEventMapperTest.kt b/app/src/test/java/net/squanchy/service/firebase/FirestoreEventMapperTest.kt
@@ -3,7 +3,7 @@ package net.squanchy.service.firebase
 import com.google.common.truth.Truth.assertThat
 import net.squanchy.eventdetails.domain.view.ExperienceLevel
 import net.squanchy.schedule.domain.view.Event
-import net.squanchy.support.lang.Checksum
+import net.squanchy.support.checksum.Checksum
 import org.joda.time.DateTimeZone
 import org.joda.time.LocalDateTime
 import org.junit.Before
diff --git a/app/src/test/java/net/squanchy/service/firebase/FirestoreSpeakerMapperTest.kt b/app/src/test/java/net/squanchy/service/firebase/FirestoreSpeakerMapperTest.kt
@@ -1,6 +1,6 @@
 package net.squanchy.service.firebase
 
-import net.squanchy.support.lang.Checksum
+import net.squanchy.support.checksum.Checksum
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Rule
diff --git a/app/src/test/java/net/squanchy/service/firebase/FirestoreTrackMapperTest.kt b/app/src/test/java/net/squanchy/service/firebase/FirestoreTrackMapperTest.kt
@@ -1,6 +1,6 @@
 package net.squanchy.service.firebase
 
-import net.squanchy.support.lang.Checksum
+import net.squanchy.support.checksum.Checksum
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Rule
diff --git a/app/src/test/java/net/squanchy/service/firebase/model/schedule/FirestoreTracksRepositoryTest.kt b/app/src/test/java/net/squanchy/service/firebase/model/schedule/FirestoreTracksRepositoryTest.kt
@@ -7,7 +7,7 @@ import net.squanchy.schedule.domain.view.aTrack
 import net.squanchy.service.firebase.FirestoreDbService
 import net.squanchy.service.firebase.aFirestoreTrack
 import net.squanchy.service.repository.firestore.FirestoreTracksRepository
-import net.squanchy.support.lang.Checksum
+import net.squanchy.support.checksum.Checksum
 import net.squanchy.support.lang.Optional
 import org.junit.Before
 import org.junit.Rule

Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,5 @@ import net.squanchy.support.system.DebugCurrentTime`
`9`	`9`	`class CurrentTimeModule {`
`10`	`10`
`11`	`11`	`@Provides`
`12`		`- internal fun provideCurrentTime(): CurrentTime = DebugCurrentTime()`
	`12`	`+ internal fun currentTime(): CurrentTime = DebugCurrentTime()`
`13`	`13`	`}`