diff --git a/.idea/misc.xml b/.idea/misc.xml index 84da703c..7631aec3 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c7cfaa59..22b0cb32 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -40,7 +40,6 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.0.2' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation "ru.noties.markwon:core:${markwonVersion}" - implementation 'com.shawnlin:number-picker:2.4.8' implementation 'com.github.clans:fab:1.6.4' testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test.ext:junit:1.1.0' diff --git a/app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt b/app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt index 3bec8707..7ba74574 100644 --- a/app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt +++ b/app/src/main/java/xyz/quaver/pupil/ReaderActivity.kt @@ -1,6 +1,7 @@ package xyz.quaver.pupil import android.os.Bundle +import android.util.Log import android.view.* import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity @@ -255,7 +256,7 @@ class ReaderActivity : AppCompatActivity() { menu?.findItem(R.id.reader_menu_page_indicator)?.title = "$currentPage/$gallerySize" } - reader.chunked(8).forEach { chunked -> + reader.chunked(4).forEach { chunked -> chunked.map { async(Dispatchers.IO) { val url = if (it.galleryInfo?.haswebp == 1) webpUrlFromUrl(it.url) else it.url diff --git a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt index c32ffb78..c7c4f67e 100644 --- a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt +++ b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt @@ -6,6 +6,7 @@ import android.view.View import android.view.ViewGroup import android.widget.LinearLayout import androidx.cardview.widget.CardView +import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.google.android.material.chip.Chip import kotlinx.android.synthetic.main.item_galleryblock.view.* @@ -14,8 +15,8 @@ import kotlinx.coroutines.Deferred import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import xyz.quaver.hitomi.GalleryBlock -import xyz.quaver.hitomi.toTag import xyz.quaver.pupil.R +import xyz.quaver.pupil.types.Tag class GalleryBlockAdapter(private val galleries: List>>) : RecyclerView.Adapter() { @@ -110,11 +111,29 @@ class GalleryBlockAdapter(private val galleries: List { + chip.setChipBackgroundColorResource(R.color.material_blue_100) + chip.setTextColor(ContextCompat.getColor(context, android.R.color.white)) + ContextCompat.getDrawable(context, R.drawable.ic_gender_male_white) } - ) + "female" -> { + chip.setChipBackgroundColorResource(R.color.material_pink_100) + chip.setTextColor(ContextCompat.getColor(context, android.R.color.white)) + ContextCompat.getDrawable(context, R.drawable.ic_gender_female_white) + } + else -> null + } + + chip.chipIcon = icon + chip.text = Tag.parse(it).tag.wordCapitalize() + + galleryblock_tag_group.addView(chip) } } } diff --git a/app/src/main/java/xyz/quaver/pupil/types/Tags.kt b/app/src/main/java/xyz/quaver/pupil/types/Tags.kt index 7abc6c97..083674bd 100644 --- a/app/src/main/java/xyz/quaver/pupil/types/Tags.kt +++ b/app/src/main/java/xyz/quaver/pupil/types/Tags.kt @@ -2,7 +2,7 @@ package xyz.quaver.pupil.types data class Tag(val area: String?, val tag: String, val isNegative: Boolean = false) { companion object { - fun parseTag(tag: String) : Tag { + fun parse(tag: String) : Tag { if (tag.first() == '-') { tag.substring(1).split(Regex(":"), 2).let { return when(it.size) { @@ -49,7 +49,7 @@ class Tags(tag: List?) : ArrayList() { return Tags( tags.split(' ').map { if (it.isNotEmpty()) - Tag.parseTag(it) + Tag.parse(it) else null } @@ -74,7 +74,7 @@ class Tags(tag: List?) : ArrayList() { } fun add(element: String): Boolean { - return super.add(Tag.parseTag(element)) + return super.add(Tag.parse(element)) } fun remove(element: String) { diff --git a/app/src/main/res/drawable/ic_gender_female_white.xml b/app/src/main/res/drawable/ic_gender_female_white.xml new file mode 100644 index 00000000..6620153b --- /dev/null +++ b/app/src/main/res/drawable/ic_gender_female_white.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_gender_male_white.xml b/app/src/main/res/drawable/ic_gender_male_white.xml new file mode 100644 index 00000000..a6e1a428 --- /dev/null +++ b/app/src/main/res/drawable/ic_gender_male_white.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_reader.xml b/app/src/main/res/layout/activity_reader.xml index f77b8d6b..edc95288 100644 --- a/app/src/main/res/layout/activity_reader.xml +++ b/app/src/main/res/layout/activity_reader.xml @@ -4,6 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/dark_gray" tools:context=".ReaderActivity"> + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index fcd0a08d..2f09f814 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -4,4 +4,7 @@ #0093c4 #D81B60 #FFFFFF + + #d81b60 + #1976d2 diff --git a/libpupil/src/main/java/xyz/quaver/hitomi/common.kt b/libpupil/src/main/java/xyz/quaver/hitomi/common.kt index 23b705da..bc3c181b 100644 --- a/libpupil/src/main/java/xyz/quaver/hitomi/common.kt +++ b/libpupil/src/main/java/xyz/quaver/hitomi/common.kt @@ -2,22 +2,6 @@ package xyz.quaver.hitomi const val protocol = "https:" -fun String.toTag() : String { - if (this.indexOf(':') > -1) { - val split = this.split(':') - - val field = split[0] - val term = split[1] - - when(field) { - "male" -> return "$term ♂" - "female" -> return "$term ♀" - } - } - - return this -} - //common.js var adapose = false const val numberOfFrontends = 2