From e617e8d6d30c0fc7b9e6cf387313b79804051fef Mon Sep 17 00:00:00 2001 From: Koitharu Date: Wed, 20 Apr 2022 12:06:49 +0300 Subject: [PATCH] Add password toggle to ProtectActivity --- .gitignore | 1 + app/build.gradle | 2 +- .../org/koitharu/kotatsu/tracker/ui/adapter/FeedItemAD.kt | 6 +++--- app/src/main/res/layout/activity_protect.xml | 5 +++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index a8c7b78f4..d4fcf16ce 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ /.idea/workspace.xml /.idea/navEditor.xml /.idea/assetWizardSettings.xml +/.idea/kotlinScripting.xml .DS_Store /build /captures diff --git a/app/build.gradle b/app/build.gradle index 4cd4b8cf9..9e32665c9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -86,7 +86,7 @@ dependencies { implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01' implementation 'androidx.preference:preference-ktx:1.2.0' implementation 'androidx.work:work-runtime-ktx:2.7.1' - implementation 'com.google.android.material:material:1.6.0-beta01' + implementation 'com.google.android.material:material:1.6.0-rc01' //noinspection LifecycleAnnotationProcessorWithJava8 kapt 'androidx.lifecycle:lifecycle-compiler:2.4.1' diff --git a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedItemAD.kt b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedItemAD.kt index 7df8279fd..74e5468b9 100644 --- a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedItemAD.kt +++ b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedItemAD.kt @@ -6,7 +6,7 @@ import coil.request.Disposable import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding import org.koitharu.kotatsu.R import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener -import org.koitharu.kotatsu.databinding.ItemTracklogBinding +import org.koitharu.kotatsu.databinding.ItemFeedBinding import org.koitharu.kotatsu.list.ui.model.ListModel import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.tracker.ui.model.FeedItem @@ -17,8 +17,8 @@ fun feedItemAD( coil: ImageLoader, lifecycleOwner: LifecycleOwner, clickListener: OnListItemClickListener -) = adapterDelegateViewBinding( - { inflater, parent -> ItemTracklogBinding.inflate(inflater, parent, false) } +) = adapterDelegateViewBinding( + { inflater, parent -> ItemFeedBinding.inflate(inflater, parent, false) } ) { var imageRequest: Disposable? = null diff --git a/app/src/main/res/layout/activity_protect.xml b/app/src/main/res/layout/activity_protect.xml index 3cba1f000..db3f7c3f7 100644 --- a/app/src/main/res/layout/activity_protect.xml +++ b/app/src/main/res/layout/activity_protect.xml @@ -40,10 +40,11 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="30dp" - app:errorIconDrawable="@null" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/textView_subtitle"> + app:layout_constraintTop_toBottomOf="@id/textView_subtitle" + app:passwordToggleEnabled="true" + app:startIconDrawable="@android:color/transparent">