diff --git a/app/src/main/java/com/isolaatti/common/CoilImageLoader.kt b/app/src/main/java/com/isolaatti/common/CoilImageLoader.kt index d44af38..2f49474 100644 --- a/app/src/main/java/com/isolaatti/common/CoilImageLoader.kt +++ b/app/src/main/java/com/isolaatti/common/CoilImageLoader.kt @@ -3,12 +3,18 @@ package com.isolaatti.common import android.content.Context import coil.ImageLoader import coil.decode.SvgDecoder +import coil.memory.MemoryCache import com.isolaatti.MyApplication object CoilImageLoader { val imageLoader by lazy { ImageLoader .Builder(MyApplication.myApp) + .memoryCache { + MemoryCache.Builder(MyApplication.myApp.applicationContext) + .maxSizePercent(0.25) + .build() + } .components { add(SvgDecoder.Factory()) }.build() diff --git a/app/src/main/java/com/isolaatti/home/FeedFragment.kt b/app/src/main/java/com/isolaatti/home/FeedFragment.kt index 4e49534..d0b2a1b 100644 --- a/app/src/main/java/com/isolaatti/home/FeedFragment.kt +++ b/app/src/main/java/com/isolaatti/home/FeedFragment.kt @@ -163,6 +163,7 @@ class FeedFragment : Fragment(), OnUserInteractedWithPostCallback { .build() adapter = PostsRecyclerViewAdapter(markwon, this) viewBinding.feedRecyclerView.adapter = adapter + viewBinding.feedRecyclerView.setItemViewCacheSize(7) viewBinding.feedRecyclerView.layoutManager = LinearLayoutManager(requireContext()) diff --git a/app/src/main/java/com/isolaatti/posting/posts/viewer/presentation/PostViewerViewModel.kt b/app/src/main/java/com/isolaatti/posting/posts/viewer/presentation/PostViewerViewModel.kt index 4413d3b..9a5ca7d 100644 --- a/app/src/main/java/com/isolaatti/posting/posts/viewer/presentation/PostViewerViewModel.kt +++ b/app/src/main/java/com/isolaatti/posting/posts/viewer/presentation/PostViewerViewModel.kt @@ -50,7 +50,7 @@ class PostViewerViewModel @Inject constructor(private val loadSinglePost: LoadSi is Resource.Loading -> {} is Resource.Success -> { if(it.data != null) { - post.postValue(it.data) + post.postValue(it.data!!) postLiked.postValue(it.data.liked) } } @@ -62,7 +62,7 @@ class PostViewerViewModel @Inject constructor(private val loadSinglePost: LoadSi private fun updateLikesCount(likesCount: Int) { val updatedPost = post.value?.copy(numberOfLikes = likesCount) if(updatedPost != null) { - post.postValue(updatedPost) + post.postValue(updatedPost!!) } } diff --git a/app/src/main/java/com/isolaatti/settings/presentation/ChangePasswordViewModel.kt b/app/src/main/java/com/isolaatti/settings/presentation/ChangePasswordViewModel.kt index 0b32f2b..0316a8f 100644 --- a/app/src/main/java/com/isolaatti/settings/presentation/ChangePasswordViewModel.kt +++ b/app/src/main/java/com/isolaatti/settings/presentation/ChangePasswordViewModel.kt @@ -24,8 +24,8 @@ class ChangePasswordViewModel @Inject constructor(private val accountSettingsRep field = value validatePassword(value) } - var signOut = false - var signOutCurrent = true + var signOut = true + var signOutCurrent = false val newPasswordIsValid: MutableLiveData = MutableLiveData() diff --git a/app/src/main/java/com/isolaatti/settings/ui/ChangePasswordFragment.kt b/app/src/main/java/com/isolaatti/settings/ui/ChangePasswordFragment.kt index 80abbd3..6745684 100644 --- a/app/src/main/java/com/isolaatti/settings/ui/ChangePasswordFragment.kt +++ b/app/src/main/java/com/isolaatti/settings/ui/ChangePasswordFragment.kt @@ -19,11 +19,14 @@ import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject @AndroidEntryPoint -class ChangePasswordFragment @Inject constructor(private val signOutUC: SignOutUC) : Fragment() { +class ChangePasswordFragment : Fragment() { lateinit var viewBinding: FragmentSettingsChangePasswordBinding private val viewModel: ChangePasswordViewModel by viewModels() + @Inject + lateinit var signOutUC: SignOutUC + override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, @@ -69,7 +72,7 @@ class ChangePasswordFragment @Inject constructor(private val signOutUC: SignOutU viewBinding.signOutAll.setOnCheckedChangeListener { buttonView, isChecked -> viewBinding.signOutCurrent.isEnabled = isChecked - viewModel.signOutCurrent = isChecked + viewModel.signOut = isChecked if(!isChecked){ viewBinding.signOutCurrent.isChecked = false } diff --git a/app/src/main/res/layout/fragment_settings_change_password.xml b/app/src/main/res/layout/fragment_settings_change_password.xml index 8d9b9ff..4956c6a 100644 --- a/app/src/main/res/layout/fragment_settings_change_password.xml +++ b/app/src/main/res/layout/fragment_settings_change_password.xml @@ -130,6 +130,7 @@ android:text="@string/sign_out_all_sessions" android:layout_marginTop="24dp" android:layout_marginHorizontal="16dp" + android:checked="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintStart_toStartOf="parent"