diff --git a/app/src/main/java/com/ctech/eaty/annotation/ConnectionType.kt b/app/src/main/java/com/ctech/eaty/annotation/ConnectionType.kt index 25d72c2..424e205 100644 --- a/app/src/main/java/com/ctech/eaty/annotation/ConnectionType.kt +++ b/app/src/main/java/com/ctech/eaty/annotation/ConnectionType.kt @@ -3,9 +3,9 @@ package com.ctech.eaty.annotation import android.net.ConnectivityManager import android.support.annotation.IntDef -const val WIFI = ConnectivityManager.TYPE_WIFI.toLong() -const val MOBILE = ConnectivityManager.TYPE_MOBILE.toLong() -const val NONE = -1L +const val WIFI = ConnectivityManager.TYPE_WIFI +const val MOBILE = ConnectivityManager.TYPE_MOBILE +const val NONE = -1 @Retention(AnnotationRetention.SOURCE) @IntDef(WIFI, MOBILE, NONE) diff --git a/app/src/main/java/com/ctech/eaty/annotation/Lightness.kt b/app/src/main/java/com/ctech/eaty/annotation/Lightness.kt index ba77b87..9bbbae2 100644 --- a/app/src/main/java/com/ctech/eaty/annotation/Lightness.kt +++ b/app/src/main/java/com/ctech/eaty/annotation/Lightness.kt @@ -2,9 +2,9 @@ package com.ctech.eaty.annotation import android.support.annotation.IntDef -const val IS_LIGHT = 0L -const val IS_DARK = 1L -const val LIGHTNESS_UNKNOWN = 2L +const val IS_LIGHT = 0 +const val IS_DARK = 1 +const val LIGHTNESS_UNKNOWN = 2 @Retention(AnnotationRetention.SOURCE) @IntDef(IS_LIGHT, IS_DARK, LIGHTNESS_UNKNOWN) diff --git a/app/src/main/java/com/ctech/eaty/di/StoreModule.kt b/app/src/main/java/com/ctech/eaty/di/StoreModule.kt index 9704ce6..685d055 100644 --- a/app/src/main/java/com/ctech/eaty/di/StoreModule.kt +++ b/app/src/main/java/com/ctech/eaty/di/StoreModule.kt @@ -37,12 +37,14 @@ import okio.BufferedSource @Module class StoreModule { - private val PRODUCT_LIMIT = 10 - private val COMMENT_LIMIT = 10 - private val COLLECTION_LIMIT = 10 - private val TOPIC_LIMIT = 10 - private val VOTE_LIMIT = 10 - private val SEARCH_LIMIT = 10 + companion object { + private const val PRODUCT_LIMIT = 10 + private const val COMMENT_LIMIT = 10 + private const val COLLECTION_LIMIT = 10 + private const val TOPIC_LIMIT = 10 + private const val VOTE_LIMIT = 10 + private const val SEARCH_LIMIT = 10 + } @Provides fun providerRealmPersister(): Persister { diff --git a/app/src/main/java/com/ctech/eaty/linking/UniversalLinkActivity.kt b/app/src/main/java/com/ctech/eaty/linking/UniversalLinkActivity.kt index efdec95..52fa84e 100644 --- a/app/src/main/java/com/ctech/eaty/linking/UniversalLinkActivity.kt +++ b/app/src/main/java/com/ctech/eaty/linking/UniversalLinkActivity.kt @@ -8,7 +8,7 @@ import android.support.v7.app.AppCompatActivity import com.ctech.eaty.R import com.ctech.eaty.di.Injectable import com.uber.autodispose.android.lifecycle.AndroidLifecycleScopeProvider -import com.uber.autodispose.kotlin.autoDisposeWith +import com.uber.autodispose.kotlin.autoDisposable import timber.log.Timber import javax.inject.Inject @@ -31,15 +31,13 @@ class UniversalLinkActivity : AppCompatActivity(), Injectable { super.onCreate(savedInstanceState) setContentView(R.layout.activity_loading) universalLinkDispatcher.dispatch(intent.dataString) - .autoDisposeWith(AndroidLifecycleScopeProvider.from(this)) - .subscribe( - { - finish() - }, - { - Timber.e(it) - finish() - }) + .autoDisposable(AndroidLifecycleScopeProvider.from(this)) + .subscribe({ + finish() + }, { + Timber.e(it) + finish() + }) } diff --git a/app/src/main/java/com/ctech/eaty/messaging/AppFirebaseMessagingService.kt b/app/src/main/java/com/ctech/eaty/messaging/AppFirebaseMessagingService.kt index 6aef944..4c4d534 100644 --- a/app/src/main/java/com/ctech/eaty/messaging/AppFirebaseMessagingService.kt +++ b/app/src/main/java/com/ctech/eaty/messaging/AppFirebaseMessagingService.kt @@ -14,7 +14,10 @@ import com.google.firebase.messaging.RemoteMessage class AppFirebaseMessagingService : FirebaseMessagingService() { - private val KEY_URL = "url" + companion object { + private const val KEY_URL = "url" + + } override fun onMessageReceived(remoteMessage: RemoteMessage?) { @@ -33,8 +36,8 @@ class AppFirebaseMessagingService : FirebaseMessagingService() { val defaultSoundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION) val notificationBuilder = NotificationCompat.Builder(this, channelId) .setSmallIcon(R.mipmap.ic_launcher) - .setContentTitle(message.notification.title) - .setContentText(message.notification.body) + .setContentTitle(message.notification?.title) + .setContentText(message.notification?.body) .setAutoCancel(true) .setSound(defaultSoundUri) .setContentIntent(pendingIntent) diff --git a/app/src/main/java/com/ctech/eaty/ui/app/AppState.kt b/app/src/main/java/com/ctech/eaty/ui/app/AppState.kt index 0f48762..af5a586 100644 --- a/app/src/main/java/com/ctech/eaty/ui/app/AppState.kt +++ b/app/src/main/java/com/ctech/eaty/ui/app/AppState.kt @@ -2,4 +2,4 @@ package com.ctech.eaty.ui.app import com.ctech.eaty.annotation.ConnectionType -data class AppState(@ConnectionType val connectionType: Long) \ No newline at end of file +data class AppState(@ConnectionType val connectionType: Int) \ No newline at end of file diff --git a/app/src/main/java/com/ctech/eaty/ui/app/result/NetworkChangeResult.kt b/app/src/main/java/com/ctech/eaty/ui/app/result/NetworkChangeResult.kt index 29975ae..8e61fed 100644 --- a/app/src/main/java/com/ctech/eaty/ui/app/result/NetworkChangeResult.kt +++ b/app/src/main/java/com/ctech/eaty/ui/app/result/NetworkChangeResult.kt @@ -2,4 +2,4 @@ package com.ctech.eaty.ui.app.result import com.ctech.eaty.base.redux.Result -data class NetworkChangeResult(val connectionType: Long) : Result \ No newline at end of file +data class NetworkChangeResult(val connectionType: Int) : Result \ No newline at end of file diff --git a/app/src/main/java/com/ctech/eaty/ui/home/component/DataSaverComponentSpec.kt b/app/src/main/java/com/ctech/eaty/ui/home/component/DataSaverComponentSpec.kt index bf750df..f4afb5e 100644 --- a/app/src/main/java/com/ctech/eaty/ui/home/component/DataSaverComponentSpec.kt +++ b/app/src/main/java/com/ctech/eaty/ui/home/component/DataSaverComponentSpec.kt @@ -10,6 +10,7 @@ import com.ctech.eaty.ui.home.state.HomeState import com.facebook.litho.Border import com.facebook.litho.ClickEvent import com.facebook.litho.Column +import com.facebook.litho.Component import com.facebook.litho.ComponentContext import com.facebook.litho.ComponentLayout import com.facebook.litho.annotations.LayoutSpec @@ -27,7 +28,7 @@ import com.facebook.yoga.YogaJustify object DataSaverComponentSpec { @OnCreateLayout - fun onCreateLayout(c: ComponentContext): ComponentLayout { + fun onCreateLayout(c: ComponentContext): Component { return Column.create(c) .child( diff --git a/app/src/main/java/com/ctech/eaty/ui/home/component/ErrorFooterComponentSpec.kt b/app/src/main/java/com/ctech/eaty/ui/home/component/ErrorFooterComponentSpec.kt index 60a480d..450ffb8 100644 --- a/app/src/main/java/com/ctech/eaty/ui/home/component/ErrorFooterComponentSpec.kt +++ b/app/src/main/java/com/ctech/eaty/ui/home/component/ErrorFooterComponentSpec.kt @@ -2,6 +2,7 @@ package com.ctech.eaty.ui.home.component import com.ctech.eaty.R import com.facebook.litho.Column +import com.facebook.litho.Component import com.facebook.litho.ComponentContext import com.facebook.litho.ComponentLayout import com.facebook.litho.Row @@ -17,7 +18,7 @@ import com.facebook.yoga.YogaJustify object ErrorFooterComponentSpec { @OnCreateLayout - fun onCreateLayout(c: ComponentContext): ComponentLayout = + fun onCreateLayout(c: ComponentContext): Component = Column.create(c) .justifyContent(YogaJustify.CENTER) .alignItems(YogaAlign.CENTER) diff --git a/app/src/main/java/com/ctech/eaty/ui/home/component/HomeFeedSectionSpec.kt b/app/src/main/java/com/ctech/eaty/ui/home/component/HomeFeedSectionSpec.kt index 15a8c9c..39733f9 100644 --- a/app/src/main/java/com/ctech/eaty/ui/home/component/HomeFeedSectionSpec.kt +++ b/app/src/main/java/com/ctech/eaty/ui/home/component/HomeFeedSectionSpec.kt @@ -33,8 +33,8 @@ import com.facebook.litho.sections.common.SingleComponentSection @GroupSectionSpec object HomeFeedSectionSpec { - private val KEY_FOOTER_LOADING = "loading" - private val KEY_FOOTER_ERROR = "error" + private const val KEY_FOOTER_LOADING = "loading" + private const val KEY_FOOTER_ERROR = "error" @OnCreateChildren fun onCreateChildren(c: SectionContext, diff --git a/app/src/main/java/com/ctech/eaty/ui/home/component/HomeListComponentSpec.kt b/app/src/main/java/com/ctech/eaty/ui/home/component/HomeListComponentSpec.kt index 29bf3d8..4ffa6a4 100644 --- a/app/src/main/java/com/ctech/eaty/ui/home/component/HomeListComponentSpec.kt +++ b/app/src/main/java/com/ctech/eaty/ui/home/component/HomeListComponentSpec.kt @@ -4,6 +4,7 @@ import com.ctech.eaty.R import com.ctech.eaty.base.redux.Store import com.ctech.eaty.ui.home.model.HomeFeed import com.ctech.eaty.ui.home.state.HomeState +import com.facebook.litho.Component import com.facebook.litho.ComponentContext import com.facebook.litho.ComponentLayout import com.facebook.litho.annotations.LayoutSpec @@ -23,7 +24,7 @@ object HomeListComponentSpec { fun onCreateLayout(c: ComponentContext, @Prop dataSource: List, @Prop store: Store, - @Prop eventsController: RecyclerCollectionEventsController): ComponentLayout { + @Prop eventsController: RecyclerCollectionEventsController): Component { return RecyclerCollectionComponent.create(c) .section( HomeFeedSection.create(SectionContext(c)) @@ -34,7 +35,7 @@ object HomeListComponentSpec { .refreshProgressBarColorRes(R.color.colorAccent) .disablePTR(false) .testKey(MAIN_SCREEN) - .buildWithLayout() + .build() } } \ No newline at end of file diff --git a/app/src/main/java/com/ctech/eaty/ui/home/component/HorizontalAdsSectionSpec.kt b/app/src/main/java/com/ctech/eaty/ui/home/component/HorizontalAdsSectionSpec.kt index a3a96e4..6d4d8b7 100644 --- a/app/src/main/java/com/ctech/eaty/ui/home/component/HorizontalAdsSectionSpec.kt +++ b/app/src/main/java/com/ctech/eaty/ui/home/component/HorizontalAdsSectionSpec.kt @@ -44,7 +44,7 @@ object HorizontalAdsSectionSpec { c: SectionContext, @FromEvent model: HorizontalAdsItemViewModel): RenderInfo { return ViewRenderInfo.create() - .viewCreator { context -> + .viewCreator { context, _ -> return@viewCreator HorizontalAdsView(context) } .viewBinder(object : SimpleViewBinder() { diff --git a/app/src/main/java/com/ctech/eaty/ui/home/component/LoadingFooterComponentSpec.kt b/app/src/main/java/com/ctech/eaty/ui/home/component/LoadingFooterComponentSpec.kt index 64dd784..4f9ef08 100644 --- a/app/src/main/java/com/ctech/eaty/ui/home/component/LoadingFooterComponentSpec.kt +++ b/app/src/main/java/com/ctech/eaty/ui/home/component/LoadingFooterComponentSpec.kt @@ -1,6 +1,7 @@ package com.ctech.eaty.ui.home.component import com.ctech.eaty.R +import com.facebook.litho.Component import com.facebook.litho.ComponentContext import com.facebook.litho.ComponentLayout import com.facebook.litho.Row @@ -13,7 +14,7 @@ import com.facebook.yoga.YogaJustify object LoadingFooterComponentSpec { @OnCreateLayout - fun onCreateLayout(c: ComponentContext) : ComponentLayout = + fun onCreateLayout(c: ComponentContext) : Component = Row.create(c) .justifyContent(YogaJustify.CENTER) .child( diff --git a/app/src/main/java/com/ctech/eaty/ui/home/component/StickyLabelComponentSpec.kt b/app/src/main/java/com/ctech/eaty/ui/home/component/StickyLabelComponentSpec.kt index ab07bbd..65997cf 100644 --- a/app/src/main/java/com/ctech/eaty/ui/home/component/StickyLabelComponentSpec.kt +++ b/app/src/main/java/com/ctech/eaty/ui/home/component/StickyLabelComponentSpec.kt @@ -4,6 +4,7 @@ import android.graphics.Color import com.ctech.eaty.R import com.ctech.eaty.ui.home.viewmodel.StickyItemViewModel import com.facebook.litho.Column +import com.facebook.litho.Component import com.facebook.litho.ComponentContext import com.facebook.litho.ComponentLayout import com.facebook.litho.annotations.LayoutSpec @@ -17,7 +18,7 @@ import com.facebook.yoga.YogaEdge object StickyLabelComponentSpec { @OnCreateLayout - fun onCreateLayout(c: ComponentContext, @Prop viewModel: StickyItemViewModel): ComponentLayout = + fun onCreateLayout(c: ComponentContext, @Prop viewModel: StickyItemViewModel): Component = Column.create(c) .backgroundColor(Color.WHITE) .paddingRes(YogaEdge.BOTTOM, R.dimen.content_padding_vertical) diff --git a/app/src/main/java/com/ctech/eaty/ui/home/component/collection/CollectionComponentSpec.kt b/app/src/main/java/com/ctech/eaty/ui/home/component/collection/CollectionComponentSpec.kt index 5e8b377..a7be1ff 100644 --- a/app/src/main/java/com/ctech/eaty/ui/home/component/collection/CollectionComponentSpec.kt +++ b/app/src/main/java/com/ctech/eaty/ui/home/component/collection/CollectionComponentSpec.kt @@ -16,6 +16,7 @@ import com.facebook.drawee.drawable.ScalingUtils import com.facebook.imagepipeline.request.ImageRequest import com.facebook.litho.ClickEvent import com.facebook.litho.Column +import com.facebook.litho.Component import com.facebook.litho.ComponentContext import com.facebook.litho.ComponentLayout import com.facebook.litho.annotations.FromEvent @@ -46,7 +47,7 @@ object CollectionComponentSpec { ListRecyclerConfiguration(LinearLayout.HORIZONTAL, false, ListRecyclerConfiguration.SNAP_NONE) @OnCreateLayout - fun onCreateLayout(c: ComponentContext, @Prop collection: SuggestedCollection): ComponentLayout { + fun onCreateLayout(c: ComponentContext, @Prop collection: SuggestedCollection): Component { val width = c.resources.getDimensionPixelSize(R.dimen.upcoming_product_width) val controller = Fresco.newDraweeControllerBuilder() diff --git a/app/src/main/java/com/ctech/eaty/ui/home/component/collection/CollectionProductComponentSpec.kt b/app/src/main/java/com/ctech/eaty/ui/home/component/collection/CollectionProductComponentSpec.kt index 9492fd8..b1afda4 100644 --- a/app/src/main/java/com/ctech/eaty/ui/home/component/collection/CollectionProductComponentSpec.kt +++ b/app/src/main/java/com/ctech/eaty/ui/home/component/collection/CollectionProductComponentSpec.kt @@ -11,6 +11,7 @@ import com.facebook.drawee.drawable.ScalingUtils import com.facebook.imagepipeline.request.ImageRequest import com.facebook.litho.ClickEvent import com.facebook.litho.Column +import com.facebook.litho.Component import com.facebook.litho.ComponentContext import com.facebook.litho.ComponentLayout import com.facebook.litho.Row @@ -27,7 +28,7 @@ import com.facebook.yoga.YogaJustify object CollectionProductComponentSpec { @OnCreateLayout - fun onCreateLayout(c: ComponentContext, @Prop viewModel: ProductItemViewModel): ComponentLayout { + fun onCreateLayout(c: ComponentContext, @Prop viewModel: ProductItemViewModel): Component { val height = c.resources.getDimensionPixelSize(R.dimen.feed_job_size) val controller = Fresco.newDraweeControllerBuilder() diff --git a/app/src/main/java/com/ctech/eaty/ui/home/component/daily/DailyProductBodyComponentSpec.kt b/app/src/main/java/com/ctech/eaty/ui/home/component/daily/DailyProductBodyComponentSpec.kt index b85e342..3d53a18 100644 --- a/app/src/main/java/com/ctech/eaty/ui/home/component/daily/DailyProductBodyComponentSpec.kt +++ b/app/src/main/java/com/ctech/eaty/ui/home/component/daily/DailyProductBodyComponentSpec.kt @@ -13,6 +13,7 @@ import com.facebook.drawee.drawable.ScalingUtils import com.facebook.imagepipeline.request.ImageRequest import com.facebook.litho.ClickEvent import com.facebook.litho.Column +import com.facebook.litho.Component import com.facebook.litho.ComponentContext import com.facebook.litho.ComponentLayout import com.facebook.litho.annotations.LayoutSpec @@ -29,7 +30,7 @@ object DailyProductBodyComponentSpec { @OnCreateLayout - fun onCreateLayout(c: ComponentContext, @Prop viewModel: ProductItemViewModel, @Prop store: Store): ComponentLayout { + fun onCreateLayout(c: ComponentContext, @Prop viewModel: ProductItemViewModel, @Prop store: Store): Component { val height = c.resources.getDimensionPixelSize(R.dimen.feed_product_height) val controller = Fresco.newDraweeControllerBuilder() .setLowResImageRequest(ImageRequest.fromUri(ResizeImageUrlProvider.overrideUrl(viewModel.imageUrl, c.resources.getDimensionPixelSize(R.dimen.thumbnail_preview_size)))) diff --git a/app/src/main/java/com/ctech/eaty/ui/home/component/daily/FooterActionComponentSpec.kt b/app/src/main/java/com/ctech/eaty/ui/home/component/daily/FooterActionComponentSpec.kt index e86fc18..59a836d 100644 --- a/app/src/main/java/com/ctech/eaty/ui/home/component/daily/FooterActionComponentSpec.kt +++ b/app/src/main/java/com/ctech/eaty/ui/home/component/daily/FooterActionComponentSpec.kt @@ -5,6 +5,7 @@ import com.ctech.eaty.R import com.ctech.eaty.ui.comment.view.CommentActivity import com.ctech.eaty.ui.home.viewmodel.ProductItemViewModel import com.facebook.litho.ClickEvent +import com.facebook.litho.Component import com.facebook.litho.ComponentContext import com.facebook.litho.ComponentLayout import com.facebook.litho.Row @@ -25,7 +26,7 @@ object FooterActionComponentSpec { @OnCreateLayout fun onCreateLayout(c: ComponentContext, @Prop actionResId: Int, - @Prop actionLabelResId: Int): ComponentLayout { + @Prop actionLabelResId: Int): Component { return Row.create(c) .child( Image.create(c) diff --git a/app/src/main/java/com/ctech/eaty/ui/home/component/daily/FooterComponentSpec.kt b/app/src/main/java/com/ctech/eaty/ui/home/component/daily/FooterComponentSpec.kt index 510bfbc..a20732b 100644 --- a/app/src/main/java/com/ctech/eaty/ui/home/component/daily/FooterComponentSpec.kt +++ b/app/src/main/java/com/ctech/eaty/ui/home/component/daily/FooterComponentSpec.kt @@ -4,6 +4,7 @@ import android.support.v4.content.ContextCompat import com.ctech.eaty.R import com.ctech.eaty.ui.home.viewmodel.ProductItemViewModel import com.facebook.litho.Column +import com.facebook.litho.Component import com.facebook.litho.ComponentContext import com.facebook.litho.ComponentLayout import com.facebook.litho.Row @@ -19,7 +20,7 @@ import com.facebook.yoga.YogaJustify object FooterComponentSpec { @OnCreateLayout - fun onCreateLayout(c: ComponentContext, @Prop viewModel: ProductItemViewModel): ComponentLayout { + fun onCreateLayout(c: ComponentContext, @Prop viewModel: ProductItemViewModel): Component { val resources = c.resources val interaction = Row.create(c) .child( diff --git a/app/src/main/java/com/ctech/eaty/ui/home/component/daily/HeaderComponentSpec.kt b/app/src/main/java/com/ctech/eaty/ui/home/component/daily/HeaderComponentSpec.kt index d456daa..6a90c7e 100644 --- a/app/src/main/java/com/ctech/eaty/ui/home/component/daily/HeaderComponentSpec.kt +++ b/app/src/main/java/com/ctech/eaty/ui/home/component/daily/HeaderComponentSpec.kt @@ -7,6 +7,7 @@ import com.ctech.eaty.ui.user.view.UserActivity import com.facebook.drawee.backends.pipeline.Fresco import com.facebook.drawee.drawable.ScalingUtils import com.facebook.litho.ClickEvent +import com.facebook.litho.Component import com.facebook.litho.ComponentContext import com.facebook.litho.ComponentLayout import com.facebook.litho.Row @@ -25,7 +26,7 @@ object HeaderComponentSpec { @OnCreateLayout - fun onCreateLayout(c: ComponentContext, @Prop viewModel: ProductItemViewModel): ComponentLayout { + fun onCreateLayout(c: ComponentContext, @Prop viewModel: ProductItemViewModel): Component { val controller = Fresco.newDraweeControllerBuilder() .setUri(viewModel.userImageUrl) .build() diff --git a/app/src/main/java/com/ctech/eaty/ui/home/component/daily/ProductComponentSpec.kt b/app/src/main/java/com/ctech/eaty/ui/home/component/daily/ProductComponentSpec.kt index 2062c9e..0013fce 100644 --- a/app/src/main/java/com/ctech/eaty/ui/home/component/daily/ProductComponentSpec.kt +++ b/app/src/main/java/com/ctech/eaty/ui/home/component/daily/ProductComponentSpec.kt @@ -6,6 +6,7 @@ import com.ctech.eaty.base.redux.Store import com.ctech.eaty.ui.home.state.HomeState import com.ctech.eaty.ui.home.viewmodel.ProductItemViewModel import com.facebook.litho.Column +import com.facebook.litho.Component import com.facebook.litho.ComponentContext import com.facebook.litho.ComponentLayout import com.facebook.litho.annotations.LayoutSpec @@ -19,7 +20,7 @@ object ProductComponentSpec { @OnCreateLayout fun onCreateLayout(c: ComponentContext, @Prop viewModel: ProductItemViewModel, - @Prop store: Store): ComponentLayout { + @Prop store: Store): Component { return Column.create(c) .child(HeaderComponent.create(c) .viewModel(viewModel)) diff --git a/app/src/main/java/com/ctech/eaty/ui/home/component/job/JobComponentSpec.kt b/app/src/main/java/com/ctech/eaty/ui/home/component/job/JobComponentSpec.kt index 6cfd92d..cd27b4b 100644 --- a/app/src/main/java/com/ctech/eaty/ui/home/component/job/JobComponentSpec.kt +++ b/app/src/main/java/com/ctech/eaty/ui/home/component/job/JobComponentSpec.kt @@ -15,6 +15,7 @@ import com.facebook.drawee.drawable.ScalingUtils import com.facebook.imagepipeline.request.ImageRequest import com.facebook.litho.ClickEvent import com.facebook.litho.Column +import com.facebook.litho.Component import com.facebook.litho.ComponentContext import com.facebook.litho.ComponentLayout import com.facebook.litho.Row @@ -33,7 +34,7 @@ import com.facebook.yoga.YogaJustify object JobComponentSpec { @OnCreateLayout - fun onCreateLayout(c: ComponentContext, @Prop viewModel: Job): ComponentLayout { + fun onCreateLayout(c: ComponentContext, @Prop viewModel: Job): Component { val height = c.resources.getDimensionPixelSize(R.dimen.feed_job_size) val controller = Fresco.newDraweeControllerBuilder() diff --git a/app/src/main/java/com/ctech/eaty/ui/home/component/job/JobsComponentSpec.kt b/app/src/main/java/com/ctech/eaty/ui/home/component/job/JobsComponentSpec.kt index 8ddb074..17d68bb 100644 --- a/app/src/main/java/com/ctech/eaty/ui/home/component/job/JobsComponentSpec.kt +++ b/app/src/main/java/com/ctech/eaty/ui/home/component/job/JobsComponentSpec.kt @@ -7,6 +7,7 @@ import com.ctech.eaty.entity.Job import com.ctech.eaty.ui.home.model.Jobs import com.ctech.eaty.widget.recyclerview.HorizontalSpaceItemDecoration2 import com.facebook.litho.Column +import com.facebook.litho.Component import com.facebook.litho.ComponentContext import com.facebook.litho.ComponentLayout import com.facebook.litho.annotations.FromEvent @@ -35,7 +36,7 @@ object JobsComponentSpec { ListRecyclerConfiguration(LinearLayout.HORIZONTAL, false, ListRecyclerConfiguration.SNAP_NONE) @OnCreateLayout - fun onCreateLayout(c: ComponentContext, @Prop jobs: Jobs): ComponentLayout { + fun onCreateLayout(c: ComponentContext, @Prop jobs: Jobs): Component { return Column.create(c) .child( Text.create(c, 0, R.style.Text_Body2) diff --git a/app/src/main/java/com/ctech/eaty/ui/home/component/popular/NewProductComponentSpec.kt b/app/src/main/java/com/ctech/eaty/ui/home/component/popular/NewProductComponentSpec.kt index eaf1983..f60de55 100644 --- a/app/src/main/java/com/ctech/eaty/ui/home/component/popular/NewProductComponentSpec.kt +++ b/app/src/main/java/com/ctech/eaty/ui/home/component/popular/NewProductComponentSpec.kt @@ -12,6 +12,7 @@ import com.facebook.drawee.backends.pipeline.Fresco import com.facebook.drawee.drawable.ScalingUtils import com.facebook.imagepipeline.request.ImageRequest import com.facebook.litho.Column +import com.facebook.litho.Component import com.facebook.litho.ComponentContext import com.facebook.litho.ComponentLayout import com.facebook.litho.Row @@ -29,7 +30,7 @@ object NewProductComponentSpec { @OnCreateLayout fun onCreateLayout(c: ComponentContext, @Prop viewModel: ProductItemViewModel, - @Prop store: Store): ComponentLayout { + @Prop store: Store): Component { val resources = c.resources val height = c.resources.getDimensionPixelSize(R.dimen.feed_horizontal_product_height) diff --git a/app/src/main/java/com/ctech/eaty/ui/home/component/popular/NewProductsComponentSpec.kt b/app/src/main/java/com/ctech/eaty/ui/home/component/popular/NewProductsComponentSpec.kt index fbae809..8bda6e7 100644 --- a/app/src/main/java/com/ctech/eaty/ui/home/component/popular/NewProductsComponentSpec.kt +++ b/app/src/main/java/com/ctech/eaty/ui/home/component/popular/NewProductsComponentSpec.kt @@ -12,6 +12,7 @@ import com.ctech.eaty.ui.home.state.HomeState import com.ctech.eaty.ui.home.viewmodel.ProductItemViewModel import com.ctech.eaty.widget.recyclerview.HorizontalSpaceItemDecoration2 import com.facebook.litho.Column +import com.facebook.litho.Component import com.facebook.litho.ComponentContext import com.facebook.litho.ComponentLayout import com.facebook.litho.annotations.FromEvent @@ -42,7 +43,7 @@ object NewProductsComponentSpec { ListRecyclerConfiguration(LinearLayout.HORIZONTAL, false, ListRecyclerConfiguration.SNAP_TO_CENTER) @OnCreateLayout - fun onCreateLayout(c: ComponentContext, @Prop products: HorizontalProduct): ComponentLayout { + fun onCreateLayout(c: ComponentContext, @Prop products: HorizontalProduct): Component { return Column.create(c) .child( Text.create(c, 0, R.style.Text_Body2) diff --git a/app/src/main/java/com/ctech/eaty/ui/home/component/topic/TopicComponentSpec.kt b/app/src/main/java/com/ctech/eaty/ui/home/component/topic/TopicComponentSpec.kt index 8d64a2a..52c3a94 100644 --- a/app/src/main/java/com/ctech/eaty/ui/home/component/topic/TopicComponentSpec.kt +++ b/app/src/main/java/com/ctech/eaty/ui/home/component/topic/TopicComponentSpec.kt @@ -11,6 +11,7 @@ import com.facebook.drawee.drawable.ScalingUtils import com.facebook.imagepipeline.request.ImageRequest import com.facebook.litho.ClickEvent import com.facebook.litho.Column +import com.facebook.litho.Component import com.facebook.litho.ComponentContext import com.facebook.litho.ComponentLayout import com.facebook.litho.annotations.LayoutSpec @@ -25,7 +26,7 @@ import com.facebook.yoga.YogaEdge object TopicComponentSpec { @OnCreateLayout - fun onCreateLayout(c: ComponentContext, @Prop viewModel: Topic): ComponentLayout { + fun onCreateLayout(c: ComponentContext, @Prop viewModel: Topic): Component { val height = c.resources.getDimensionPixelSize(R.dimen.feed_horizontal_product_height) val controller = Fresco.newDraweeControllerBuilder() .setImageRequest(ImageRequest.fromUri(ResizeImageUrlProvider.overrideUrl(viewModel.imageUrl, height / 2))) diff --git a/app/src/main/java/com/ctech/eaty/ui/home/component/topic/TopicsComponentSpec.kt b/app/src/main/java/com/ctech/eaty/ui/home/component/topic/TopicsComponentSpec.kt index 81fea79..2c478ad 100644 --- a/app/src/main/java/com/ctech/eaty/ui/home/component/topic/TopicsComponentSpec.kt +++ b/app/src/main/java/com/ctech/eaty/ui/home/component/topic/TopicsComponentSpec.kt @@ -10,6 +10,7 @@ import com.ctech.eaty.ui.home.model.SuggestedTopics import com.ctech.eaty.ui.home.state.HomeState import com.ctech.eaty.widget.recyclerview.HorizontalSpaceItemDecoration2 import com.facebook.litho.Column +import com.facebook.litho.Component import com.facebook.litho.ComponentContext import com.facebook.litho.ComponentLayout import com.facebook.litho.annotations.FromEvent @@ -38,7 +39,7 @@ object TopicsComponentSpec { ListRecyclerConfiguration(LinearLayout.HORIZONTAL, false, ListRecyclerConfiguration.SNAP_NONE) @OnCreateLayout - fun onCreateLayout(c: ComponentContext, @Prop topics: SuggestedTopics): ComponentLayout { + fun onCreateLayout(c: ComponentContext, @Prop topics: SuggestedTopics): Component { return Column.create(c) .child( Text.create(c, 0, R.style.Text_Body2) diff --git a/app/src/main/java/com/ctech/eaty/ui/home/component/upcoming/TopUsersComponentSpec.kt b/app/src/main/java/com/ctech/eaty/ui/home/component/upcoming/TopUsersComponentSpec.kt index 3436038..e3ca84f 100644 --- a/app/src/main/java/com/ctech/eaty/ui/home/component/upcoming/TopUsersComponentSpec.kt +++ b/app/src/main/java/com/ctech/eaty/ui/home/component/upcoming/TopUsersComponentSpec.kt @@ -5,6 +5,7 @@ import com.ctech.eaty.R import com.ctech.eaty.entity.User import com.ctech.eaty.util.ResizeImageUrlProvider import com.facebook.drawee.backends.pipeline.Fresco +import com.facebook.litho.Component import com.facebook.litho.ComponentContext import com.facebook.litho.ComponentLayout import com.facebook.litho.Row @@ -19,7 +20,7 @@ import com.facebook.yoga.YogaEdge object TopUsersComponentSpec { @OnCreateLayout - fun onCreateLayout(c: ComponentContext, @Prop users: List): ComponentLayout { + fun onCreateLayout(c: ComponentContext, @Prop users: List): Component { val size = c.resources.getDimensionPixelSize(R.dimen.top_user_avatar_size) diff --git a/app/src/main/java/com/ctech/eaty/ui/home/component/upcoming/UpcomingProductComponentSpec.kt b/app/src/main/java/com/ctech/eaty/ui/home/component/upcoming/UpcomingProductComponentSpec.kt index 1a5dd45..b8ae1f4 100644 --- a/app/src/main/java/com/ctech/eaty/ui/home/component/upcoming/UpcomingProductComponentSpec.kt +++ b/app/src/main/java/com/ctech/eaty/ui/home/component/upcoming/UpcomingProductComponentSpec.kt @@ -16,6 +16,7 @@ import com.facebook.drawee.drawable.ScalingUtils import com.facebook.imagepipeline.request.ImageRequest import com.facebook.litho.ClickEvent import com.facebook.litho.Column +import com.facebook.litho.Component import com.facebook.litho.ComponentContext import com.facebook.litho.ComponentLayout import com.facebook.litho.Row @@ -36,7 +37,7 @@ object UpcomingProductComponentSpec { @OnCreateLayout - fun onCreateLayout(c: ComponentContext, @Prop viewModel: UpcomingProductItemProps, @Prop store: Store): ComponentLayout { + fun onCreateLayout(c: ComponentContext, @Prop viewModel: UpcomingProductItemProps, @Prop store: Store): Component { val backgroundSize = c.resources.getDimensionPixelSize(R.dimen.upcoming_product_height) val foregroundSize = c.resources.getDimensionPixelSize(R.dimen.upcoming_foreground_product_size) @@ -57,7 +58,7 @@ object UpcomingProductComponentSpec { val body = if (viewModel.saveMode) { DataSaverComponent.create(c) .store(store) - .buildWithLayout() + .build() } else { Column.create(c) .child( diff --git a/app/src/main/java/com/ctech/eaty/ui/home/component/upcoming/UpcomingProductsComponentSpec.kt b/app/src/main/java/com/ctech/eaty/ui/home/component/upcoming/UpcomingProductsComponentSpec.kt index 9b8c670..4b62901 100644 --- a/app/src/main/java/com/ctech/eaty/ui/home/component/upcoming/UpcomingProductsComponentSpec.kt +++ b/app/src/main/java/com/ctech/eaty/ui/home/component/upcoming/UpcomingProductsComponentSpec.kt @@ -10,6 +10,7 @@ import com.ctech.eaty.ui.home.state.HomeState import com.ctech.eaty.ui.home.viewmodel.UpcomingProductItemProps import com.ctech.eaty.widget.recyclerview.HorizontalSpaceItemDecoration2 import com.facebook.litho.Column +import com.facebook.litho.Component import com.facebook.litho.ComponentContext import com.facebook.litho.ComponentLayout import com.facebook.litho.annotations.FromEvent @@ -40,7 +41,7 @@ object UpcomingProductsComponentSpec { ListRecyclerConfiguration(LinearLayout.HORIZONTAL, false, SNAP_TO_CENTER) @OnCreateLayout - fun onCreateLayout(c: ComponentContext, @Prop products: UpcomingProducts): ComponentLayout { + fun onCreateLayout(c: ComponentContext, @Prop products: UpcomingProducts): Component { return Column.create(c) .child( Text.create(c, 0, R.style.Text_Body2) diff --git a/app/src/main/java/com/ctech/eaty/ui/upcomingdetail/view/MessageAdapter.kt b/app/src/main/java/com/ctech/eaty/ui/upcomingdetail/view/MessageAdapter.kt index 4685be3..a12bfa8 100644 --- a/app/src/main/java/com/ctech/eaty/ui/upcomingdetail/view/MessageAdapter.kt +++ b/app/src/main/java/com/ctech/eaty/ui/upcomingdetail/view/MessageAdapter.kt @@ -27,13 +27,13 @@ class MessageAdapter : RecyclerView.Adapter() { } } - override fun onCreateViewHolder(viewGroup: ViewGroup, type: Int): MessageViewHolder? { + override fun onCreateViewHolder(viewGroup: ViewGroup, type: Int): MessageViewHolder { if (type == TYPE_DEFAULT) { return MessageViewHolder.create(viewGroup) } else if (type == TYPE_EXTENDED) { return MessageExtendedViewHolder.create(viewGroup) } - return null + throw IllegalArgumentException("Unsupported type $type") } override fun onViewRecycled(holder: MessageViewHolder) { diff --git a/app/src/main/java/com/ctech/eaty/util/ColorUtils.kt b/app/src/main/java/com/ctech/eaty/util/ColorUtils.kt index c165495..c42fed4 100644 --- a/app/src/main/java/com/ctech/eaty/util/ColorUtils.kt +++ b/app/src/main/java/com/ctech/eaty/util/ColorUtils.kt @@ -28,7 +28,7 @@ class ColorUtils private constructor() { return modifyAlpha(color, (255f * alpha).toInt()) } - @Lightness fun isDark(palette: Palette): Long { + @Lightness fun isDark(palette: Palette): Int { val mostPopulous = getMostPopulousSwatch(palette) ?: return LIGHTNESS_UNKNOWN return if (isDark(mostPopulous.hsl)) IS_DARK else IS_LIGHT } diff --git a/app/src/main/java/com/ctech/eaty/util/EventLogger.kt b/app/src/main/java/com/ctech/eaty/util/EventLogger.kt index 61cc5b9..9c346ca 100644 --- a/app/src/main/java/com/ctech/eaty/util/EventLogger.kt +++ b/app/src/main/java/com/ctech/eaty/util/EventLogger.kt @@ -3,14 +3,26 @@ package com.ctech.eaty.util import android.os.SystemClock import android.util.Log import android.view.Surface -import com.google.android.exoplayer2.* +import com.google.android.exoplayer2.C +import com.google.android.exoplayer2.ExoPlaybackException +import com.google.android.exoplayer2.Format +import com.google.android.exoplayer2.PlaybackParameters +import com.google.android.exoplayer2.Player +import com.google.android.exoplayer2.RendererCapabilities +import com.google.android.exoplayer2.Timeline import com.google.android.exoplayer2.audio.AudioRendererEventListener import com.google.android.exoplayer2.decoder.DecoderCounters import com.google.android.exoplayer2.drm.DefaultDrmSessionManager import com.google.android.exoplayer2.metadata.Metadata import com.google.android.exoplayer2.metadata.MetadataRenderer import com.google.android.exoplayer2.metadata.emsg.EventMessage -import com.google.android.exoplayer2.metadata.id3.* +import com.google.android.exoplayer2.metadata.id3.ApicFrame +import com.google.android.exoplayer2.metadata.id3.CommentFrame +import com.google.android.exoplayer2.metadata.id3.GeobFrame +import com.google.android.exoplayer2.metadata.id3.Id3Frame +import com.google.android.exoplayer2.metadata.id3.PrivFrame +import com.google.android.exoplayer2.metadata.id3.TextInformationFrame +import com.google.android.exoplayer2.metadata.id3.UrlLinkFrame import com.google.android.exoplayer2.source.AdaptiveMediaSourceEventListener import com.google.android.exoplayer2.source.ExtractorMediaSource import com.google.android.exoplayer2.source.TrackGroup @@ -20,11 +32,10 @@ import com.google.android.exoplayer2.trackselection.TrackSelection import com.google.android.exoplayer2.trackselection.TrackSelectionArray import com.google.android.exoplayer2.upstream.DataSpec import com.google.android.exoplayer2.video.VideoRendererEventListener +import timber.log.Timber import java.io.IOException import java.text.NumberFormat -import java.util.* -import com.google.android.exoplayer2.Player -import timber.log.Timber +import java.util.Locale class EventLogger(private val trackSelector: MappingTrackSelector) : Player.EventListener, @@ -32,9 +43,10 @@ class EventLogger(private val trackSelector: MappingTrackSelector) : Player.Even ExtractorMediaSource.EventListener, DefaultDrmSessionManager.EventListener, MetadataRenderer.Output { + override fun onAudioSinkUnderrun(bufferSize: Int, bufferSizeMs: Long, elapsedSinceLastFeedMs: Long) { printInternalError("audioTrackUnderrun [" + bufferSize + ", " + bufferSizeMs + ", " - + elapsedSinceLastFeedMs + "]", null); } + + elapsedSinceLastFeedMs + "]", null); } private fun getDiscontinuityReasonString(@Player.DiscontinuityReason reason: Int): String { return when (reason) { @@ -47,7 +59,7 @@ class EventLogger(private val trackSelector: MappingTrackSelector) : Player.Even } override fun onPositionDiscontinuity(reason: Int) { - Timber.d("positionDiscontinuity [%s]", getDiscontinuityReasonString(reason)) + Timber.d("positionDiscontinuity [%s]", getDiscontinuityReasonString(reason)) } override fun onSeekProcessed() { @@ -55,7 +67,7 @@ class EventLogger(private val trackSelector: MappingTrackSelector) : Player.Even } override fun onShuffleModeEnabledChanged(shuffleModeEnabled: Boolean) { - Log.d(TAG, "shuffleModeEnabled [" + shuffleModeEnabled + "]"); + Timber.d("%s]", "shuffleModeEnabled [$shuffleModeEnabled"); } private val TAG = "EventLogger" @@ -94,26 +106,26 @@ class EventLogger(private val trackSelector: MappingTrackSelector) : Player.Even "[speed=%.2f, pitch=%.2f]", playbackParameters.speed, playbackParameters.pitch)) } - override fun onTimelineChanged(timeline: Timeline, manifest: Any) { + override fun onTimelineChanged(timeline: Timeline, manifest: Any?, reason: Int) { val periodCount = timeline.periodCount val windowCount = timeline.windowCount - Log.d(TAG, "sourceInfo [periodCount=$periodCount, windowCount=$windowCount") + Timber.d("sourceInfo [periodCount=$periodCount, windowCount=$windowCount") for (i in 0 until Math.min(periodCount, MAX_TIMELINE_ITEM_LINES)) { timeline.getPeriod(i, period) - Log.d(TAG, " " + "period [" + getTimeString(period.durationMs) + "]") + Timber.d(" " + "period [" + getTimeString(period.durationMs) + "]") } if (periodCount > MAX_TIMELINE_ITEM_LINES) { - Log.d(TAG, " ...") + Timber.d(" ...") } for (i in 0 until Math.min(windowCount, MAX_TIMELINE_ITEM_LINES)) { timeline.getWindow(i, window) - Log.d(TAG, " " + "window [" + getTimeString(window.durationMs) + ", " + Timber.d(" " + "window [" + getTimeString(window.durationMs) + ", " + window.isSeekable + ", " + window.isDynamic + "]") } if (windowCount > MAX_TIMELINE_ITEM_LINES) { - Log.d(TAG, " ...") + Timber.d(" ...") } - Log.d(TAG, "]") + Timber.d("]") } override fun onPlayerError(e: ExoPlaybackException) { @@ -128,7 +140,7 @@ class EventLogger(private val trackSelector: MappingTrackSelector) : Player.Even } Timber.d("Tracks [") // Log tracks associated to renderers. - for (rendererIndex in 0..mappedTrackInfo.length - 1) { + for (rendererIndex in 0 until mappedTrackInfo.length) { val rendererTrackGroups = mappedTrackInfo.getTrackGroups(rendererIndex) val trackSelection = trackSelections.get(rendererIndex) if (rendererTrackGroups.length > 0) { @@ -150,7 +162,7 @@ class EventLogger(private val trackSelector: MappingTrackSelector) : Player.Even } // Log metadata for at most one of the tracks selected for the renderer. if (trackSelection != null) { - for (selectionIndex in 0..trackSelection.length() - 1) { + for (selectionIndex in 0 until trackSelection.length()) { val metadata = trackSelection.getFormat(selectionIndex).metadata if (metadata != null) { Timber.d(" Metadata [") @@ -167,10 +179,10 @@ class EventLogger(private val trackSelector: MappingTrackSelector) : Player.Even val unassociatedTrackGroups = mappedTrackInfo.unassociatedTrackGroups if (unassociatedTrackGroups.length > 0) { Timber.d(" Renderer:None [") - for (groupIndex in 0..unassociatedTrackGroups.length - 1) { + for (groupIndex in 0 until unassociatedTrackGroups.length) { Log.d(TAG, " Group:$groupIndex [") val trackGroup = unassociatedTrackGroups.get(groupIndex) - for (trackIndex in 0..trackGroup.length - 1) { + for (trackIndex in 0 until trackGroup.length) { val status = getTrackStatusString(false) val formatSupport = getFormatSupportString( RendererCapabilities.FORMAT_UNSUPPORTED_TYPE) @@ -321,11 +333,6 @@ class EventLogger(private val trackSelector: MappingTrackSelector) : Player.Even .map { metadata.get(it) } .forEach { when (it) { - is TextInformationFrame -> { - val textInformationFrame = it - Log.d(TAG, prefix + String.format("%s: value=%s", textInformationFrame.id, - textInformationFrame.value)) - } is UrlLinkFrame -> { val urlLinkFrame = it Log.d(TAG, prefix + String.format("%s: url=%s", urlLinkFrame.id, urlLinkFrame.url)) diff --git a/app/src/main/java/com/ctech/eaty/util/NetworkManager.kt b/app/src/main/java/com/ctech/eaty/util/NetworkManager.kt index 9124dfd..0493b76 100644 --- a/app/src/main/java/com/ctech/eaty/util/NetworkManager.kt +++ b/app/src/main/java/com/ctech/eaty/util/NetworkManager.kt @@ -12,12 +12,12 @@ interface NetworkManager { fun isConnected(): Boolean @ConnectionType - fun connectionType(): Long + fun connectionType(): Int class IMPL(private val context: Context) : NetworkManager { private val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager - override fun connectionType(): Long { + override fun connectionType(): Int { return if (isConnected()) { if (connectivityManager.activeNetworkInfo.type == ConnectivityManager.TYPE_WIFI) { WIFI diff --git a/build.gradle b/build.gradle index e37d2e8..11ab2cf 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ apply from: 'gradleScript/dependencies.gradle' buildscript { - ext.kotlin_version = '1.2.20' + ext.kotlin_version = '1.2.31' repositories { maven { url 'https://maven.google.com' } maven { url 'https://maven.fabric.io/public' } @@ -11,16 +11,16 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.google.gms:google-services:3.1.2' + classpath 'com.google.gms:google-services:3.2.0' classpath 'io.fabric.tools:gradle:1.+' classpath "io.realm:realm-gradle-plugin:4.2.0" - classpath 'com.apollographql.apollo:apollo-gradle-plugin:0.4.4-SNAPSHOT' + classpath 'com.apollographql.apollo:apollo-gradle-plugin:0.4.4' classpath('com.google.firebase:firebase-plugins:1.1.0') { exclude group: 'com.google.guava', module: 'guava-jdk5' } - classpath 'com.uber:okbuck:0.32.1' + classpath 'com.uber:okbuck:0.33.0' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradleScript/dependencies.gradle b/gradleScript/dependencies.gradle index 0385985..eb8a57e 100644 --- a/gradleScript/dependencies.gradle +++ b/gradleScript/dependencies.gradle @@ -1,12 +1,12 @@ def versions = [ - support : '27.0.2', - litho : '0.11.0', - autodispose: '0.5.1', - firebase : '11.4.2' + support : '27.1.0', + litho : '0.13.1', + autodispose: '0.7.0', + firebase : '12.0.0' ] def build = [ - buildToolsVersion: '27.0.1', + buildToolsVersion: '27.0.3', compileSdkVersion: 27, ci : 'true' == System.getenv('CI'), minSdkVersion : 21, @@ -50,11 +50,11 @@ def test = [ ] def exo = [ - core : 'com.google.android.exoplayer:exoplayer-core:2.6.0', - ui : 'com.google.android.exoplayer:exoplayer-ui:2.6.0', - dash : 'com.google.android.exoplayer:exoplayer-dash:2.6.0', - hls : 'com.google.android.exoplayer:exoplayer-hls:2.6.0', - smoothstreaming: 'com.google.android.exoplayer:exoplayer-smoothstreaming:2.6.0' + core : 'com.google.android.exoplayer:exoplayer-core:2.7.1', + ui : 'com.google.android.exoplayer:exoplayer-ui:2.7.1', + dash : 'com.google.android.exoplayer:exoplayer-dash:2.7.1', + hls : 'com.google.android.exoplayer:exoplayer-hls:2.7.1', + smoothstreaming: 'com.google.android.exoplayer:exoplayer-smoothstreaming:2.7.1' ] def network = [ @@ -73,11 +73,11 @@ def glide = [ ] def store = [ - lib : 'com.nytimes.android:store3:3.0.0-beta', - cache : 'com.nytimes.android:cache3:3.0.0-beta', - middleware: 'com.nytimes.android:middleware3:3.0.0-beta', - filesystem: 'com.nytimes.android:filesystem3:3.0.0-beta', - kotlin : 'com.nytimes.android:store-kotlin3:3.0.0-beta' + lib : 'com.nytimes.android:store3:3.0.1', + cache : 'com.nytimes.android:cache3:3.0.1', + middleware: 'com.nytimes.android:middleware3:3.0.1', + filesystem: 'com.nytimes.android:filesystem3:3.0.1', + kotlin : 'com.nytimes.android:store-kotlin3:3.0.1' ] def firebase = [ @@ -147,7 +147,7 @@ ext.deps = [ "versions" : versions, "support" : support, "kotlin" : "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version", - "timber" : "com.jakewharton.timber:timber:4.6.0", + "timber" : "com.jakewharton.timber:timber:4.7.0", "jodatime" : "net.danlew:android.joda:2.9.9", "dagger" : dagger, "butterknife": butterknife,