diff --git a/app/build.gradle b/app/build.gradle index 1fe7b20..53f63f3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -71,9 +71,9 @@ dependencies { implementation "com.android.support.constraint:constraint-layout:1.0.2" //Database - implementation "android.arch.persistence.room:runtime:1.0.0-rc1" - implementation "android.arch.persistence.room:rxjava2:1.0.0-rc1" - kapt "android.arch.persistence.room:compiler:1.0.0-rc1" + implementation "android.arch.persistence.room:runtime:1.0.0" + implementation "android.arch.persistence.room:rxjava2:1.0.0" + kapt "android.arch.persistence.room:compiler:1.0.0" //RX implementation "io.reactivex.rxjava2:rxjava:${rxJavaVersion}" @@ -103,7 +103,7 @@ dependencies { kapt "com.github.bumptech.glide:compiler:${glideVersion}" //Leak canary - debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.1' + debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.4' //Testing testImplementation 'junit:junit:4.12' diff --git a/app/src/main/kotlin/io/armcha/ribble/di/module/ApiModule.kt b/app/src/main/kotlin/io/armcha/ribble/di/module/ApiModule.kt index f8ed454..4f89ccf 100644 --- a/app/src/main/kotlin/io/armcha/ribble/di/module/ApiModule.kt +++ b/app/src/main/kotlin/io/armcha/ribble/di/module/ApiModule.kt @@ -46,7 +46,6 @@ class ApiModule { okHttpBuilder.addInterceptor(logging) } return okHttpBuilder.apply { - protocols(listOf(Protocol.HTTP_1_1)) readTimeout(15.toLong(), TimeUnit.SECONDS) connectTimeout(15.toLong(), TimeUnit.SECONDS) } diff --git a/app/src/main/kotlin/io/armcha/ribble/presentation/screen/home/HomePresenter.kt b/app/src/main/kotlin/io/armcha/ribble/presentation/screen/home/HomePresenter.kt index fcab88a..869fe6a 100644 --- a/app/src/main/kotlin/io/armcha/ribble/presentation/screen/home/HomePresenter.kt +++ b/app/src/main/kotlin/io/armcha/ribble/presentation/screen/home/HomePresenter.kt @@ -40,11 +40,6 @@ class HomePresenter @Inject constructor(private val userInteractor: UserInteract } } - @OnLifecycleEvent(value = Lifecycle.Event.ON_DESTROY) - fun onDestroy() { - userInteractor.clearCache() - } - override fun onPresenterCreate() { super.onPresenterCreate() fetch(userInteractor.getAuthenticatedUser()) { @@ -54,6 +49,11 @@ class HomePresenter @Inject constructor(private val userInteractor: UserInteract view?.openShotFragment() } + override fun onPresenterDestroy() { + super.onPresenterDestroy() + userInteractor.clearCache() + } + override fun handleFragmentChanges(currentTag: String, fragment: Fragment) { val tag = if (fragment is BaseFragment<*, *>) { fragment.getTitle() diff --git a/app/src/main/kotlin/io/armcha/ribble/presentation/screen/shot_detail/ShotDetailPresenter.kt b/app/src/main/kotlin/io/armcha/ribble/presentation/screen/shot_detail/ShotDetailPresenter.kt index cdd4101..3cf9ad2 100644 --- a/app/src/main/kotlin/io/armcha/ribble/presentation/screen/shot_detail/ShotDetailPresenter.kt +++ b/app/src/main/kotlin/io/armcha/ribble/presentation/screen/shot_detail/ShotDetailPresenter.kt @@ -6,7 +6,6 @@ import io.armcha.ribble.domain.fetcher.result_listener.RequestType import io.armcha.ribble.domain.interactor.CommentInteractor import io.armcha.ribble.domain.interactor.ShotLikeInteractor import io.armcha.ribble.presentation.base_mvp.api.ApiPresenter -import io.armcha.ribble.presentation.utils.extensions.log import javax.inject.Inject /** diff --git a/app/src/main/kotlin/io/armcha/ribble/presentation/screen/user_likes/UserLikesFragment.kt b/app/src/main/kotlin/io/armcha/ribble/presentation/screen/user_likes/UserLikesFragment.kt index 9d24168..bdac0fc 100644 --- a/app/src/main/kotlin/io/armcha/ribble/presentation/screen/user_likes/UserLikesFragment.kt +++ b/app/src/main/kotlin/io/armcha/ribble/presentation/screen/user_likes/UserLikesFragment.kt @@ -14,8 +14,6 @@ import io.armcha.ribble.presentation.utils.S import io.armcha.ribble.presentation.utils.extensions.takeColor import io.armcha.ribble.presentation.utils.glide.load import io.armcha.ribble.presentation.widget.navigation_view.NavigationId -import kotlinx.android.extensions.CacheImplementation -import kotlinx.android.extensions.ContainerOptions import kotlinx.android.synthetic.main.fragment_user_likes.* import kotlinx.android.synthetic.main.liked_shot_item.view.* import kotlinx.android.synthetic.main.progress_bar.* diff --git a/app/src/main/kotlin/io/armcha/ribble/presentation/utils/glide/GlideImageViewExtensions.kt b/app/src/main/kotlin/io/armcha/ribble/presentation/utils/glide/GlideImageViewExtensions.kt index c9b314b..ea4d372 100644 --- a/app/src/main/kotlin/io/armcha/ribble/presentation/utils/glide/GlideImageViewExtensions.kt +++ b/app/src/main/kotlin/io/armcha/ribble/presentation/utils/glide/GlideImageViewExtensions.kt @@ -8,6 +8,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.load.resource.bitmap.CircleCrop import com.bumptech.glide.load.resource.bitmap.RoundedCorners import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions +import com.bumptech.glide.request.target.DrawableImageViewTarget /** * Created by Chatikyan on 28.08.2017. @@ -34,7 +35,7 @@ private fun load(view: ImageView, if (transformationType != TransformationType.NOTHING) { glideRequest.transform(transformationType.getTransformation()) } - glideRequest.into(view) + glideRequest.into(DrawableImageViewTarget(view)) } fun ImageView.clear() { diff --git a/app/src/main/kotlin/io/armcha/ribble/presentation/utils/glide/RibbleGlideModule.kt b/app/src/main/kotlin/io/armcha/ribble/presentation/utils/glide/RibbleGlideModule.kt index 6bec708..5ae0987 100644 --- a/app/src/main/kotlin/io/armcha/ribble/presentation/utils/glide/RibbleGlideModule.kt +++ b/app/src/main/kotlin/io/armcha/ribble/presentation/utils/glide/RibbleGlideModule.kt @@ -37,9 +37,4 @@ class RibbleGlideModule : AppGlideModule() { ) } - override fun registerComponents(context: Context?, glide: Glide, registry: Registry) { - val client = OkHttpClient.Builder().build() - val factory = OkHttpUrlLoader.Factory(client) - glide.registry.replace(GlideUrl::class.java, InputStream::class.java, factory) - } } diff --git a/app/src/main/res/layout/shot_item.xml b/app/src/main/res/layout/shot_item.xml index 5a1a7a6..e1bef66 100644 --- a/app/src/main/res/layout/shot_item.xml +++ b/app/src/main/res/layout/shot_item.xml @@ -9,10 +9,12 @@ android:id="@+id/cardView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="7dp" + android:layout_marginTop="10dp" + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" app:cardCornerRadius="18dp" - app:cardElevation="5dp" - app:cardUseCompatPadding="true"> + app:cardElevation="10dp" + app:cardUseCompatPadding="false">