From d73dc19d3d064dc2cb40787e1cd72f4a22db7462 Mon Sep 17 00:00:00 2001 From: Pupil Date: Fri, 24 Jan 2020 17:02:53 +0900 Subject: [PATCH] Fixed enlarged chip spacing --- app/src/main/AndroidManifest.xml | 3 +++ app/src/main/java/xyz/quaver/pupil/Pupil.kt | 7 ++++++- .../main/java/xyz/quaver/pupil/ui/dialog/GalleryDialog.kt | 6 ++++-- app/src/main/res/drawable/ic_download.xml | 2 +- .../layout/{dialog_galleryblock.xml => dialog_gallery.xml} | 0 app/src/main/res/layout/item_gallery_details.xml | 2 +- app/src/main/res/layout/item_galleryblock.xml | 2 +- app/src/main/res/layout/item_mirrors.xml | 6 ++++-- app/src/main/res/layout/item_next.xml | 2 +- app/src/main/res/layout/item_prev.xml | 2 +- 10 files changed, 22 insertions(+), 10 deletions(-) rename app/src/main/res/layout/{dialog_galleryblock.xml => dialog_gallery.xml} (100%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4db90b6f..26121a52 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,9 @@ + AppCompatDelegate.MODE_NIGHT_YES false -> AppCompatDelegate.MODE_NIGHT_NO }) CoroutineScope(Dispatchers.IO).launch { - updateOldReaderGalleries(this@Pupil) + try { + updateOldReaderGalleries(this@Pupil) + } catch (e: Exception) { + // do nothing + } } super.onCreate() diff --git a/app/src/main/java/xyz/quaver/pupil/ui/dialog/GalleryDialog.kt b/app/src/main/java/xyz/quaver/pupil/ui/dialog/GalleryDialog.kt index 8896a4f8..d1e7d99c 100644 --- a/app/src/main/java/xyz/quaver/pupil/ui/dialog/GalleryDialog.kt +++ b/app/src/main/java/xyz/quaver/pupil/ui/dialog/GalleryDialog.kt @@ -32,7 +32,7 @@ import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide import com.google.android.material.chip.Chip import com.google.android.material.snackbar.Snackbar -import kotlinx.android.synthetic.main.dialog_galleryblock.* +import kotlinx.android.synthetic.main.dialog_gallery.* import kotlinx.android.synthetic.main.gallery_details.view.* import kotlinx.android.synthetic.main.item_gallery_details.view.* import kotlinx.coroutines.* @@ -64,7 +64,7 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.dialog_galleryblock) + setContentView(R.layout.dialog_gallery) window?.attributes.apply { this ?: return@apply @@ -183,6 +183,8 @@ class GalleryDialog(context: Context, private val galleryID: Int) : Dialog(conte else -> tag.tag.wordCapitalize() } + setEnsureMinTouchTargetSize(false) + setOnClickListener { onChipClickedHandler.forEach { handler -> handler.invoke(tag) diff --git a/app/src/main/res/drawable/ic_download.xml b/app/src/main/res/drawable/ic_download.xml index aa88433b..81c5a029 100644 --- a/app/src/main/res/drawable/ic_download.xml +++ b/app/src/main/res/drawable/ic_download.xml @@ -1,4 +1,4 @@ - diff --git a/app/src/main/res/layout/dialog_galleryblock.xml b/app/src/main/res/layout/dialog_gallery.xml similarity index 100% rename from app/src/main/res/layout/dialog_galleryblock.xml rename to app/src/main/res/layout/dialog_gallery.xml diff --git a/app/src/main/res/layout/item_gallery_details.xml b/app/src/main/res/layout/item_gallery_details.xml index 94223858..dde36cef 100644 --- a/app/src/main/res/layout/item_gallery_details.xml +++ b/app/src/main/res/layout/item_gallery_details.xml @@ -35,6 +35,6 @@ android:id="@+id/gallery_details_tags" android:layout_width="wrap_content" android:layout_height="wrap_content" - app:chipSpacingVertical="8dp"/> + app:chipSpacingVertical="4dp"/> \ No newline at end of file diff --git a/app/src/main/res/layout/item_galleryblock.xml b/app/src/main/res/layout/item_galleryblock.xml index 5d654286..bef8a183 100644 --- a/app/src/main/res/layout/item_galleryblock.xml +++ b/app/src/main/res/layout/item_galleryblock.xml @@ -177,7 +177,7 @@ android:layout_marginStart="8dp" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" - app:chipSpacing="2dp" + app:chipSpacing="4dp" app:layout_constraintTop_toBottomOf="@id/galleryblock_padding" app:layout_constraintLeft_toRightOf="@id/galleryblock_thumbnail" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/item_mirrors.xml b/app/src/main/res/layout/item_mirrors.xml index e9566ed6..265ca8af 100644 --- a/app/src/main/res/layout/item_mirrors.xml +++ b/app/src/main/res/layout/item_mirrors.xml @@ -22,7 +22,9 @@ android:layout_height="wrap_content" xmlns:app="http://schemas.android.com/apk/res-auto" android:paddingStart="32dp" + android:paddingLeft="32dp" android:paddingEnd="32dp" + android:paddingRight="32dp" android:paddingTop="16dp"> - diff --git a/app/src/main/res/layout/item_next.xml b/app/src/main/res/layout/item_next.xml index 5d48f44d..4627e96d 100644 --- a/app/src/main/res/layout/item_next.xml +++ b/app/src/main/res/layout/item_next.xml @@ -36,7 +36,7 @@ android:layout_height="match_parent" android:layout_weight="1" app:srcCompat="@drawable/ic_navigate_next_black_24dp" - android:tint="@color/colorAccent" + app:tint="@color/colorAccent" android:rotation="180"/>