Fixes for building and new extensions screen
This commit is contained in:
parent
50e08156dd
commit
851a6712b7
@ -1,5 +1,5 @@
|
||||
import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile
|
||||
//noinspection GradleDependency
|
||||
|
||||
import java.text.SimpleDateFormat
|
||||
|
||||
apply plugin: 'com.android.application'
|
||||
@ -309,9 +309,6 @@ dependencies {
|
||||
// Text distance (EH)
|
||||
implementation 'info.debatty:java-string-similarity:1.2.1'
|
||||
|
||||
// Pin lock view (EH)
|
||||
implementation 'com.github.jawnnypoo:pinlockview:2.2.0'
|
||||
|
||||
// Reprint (EH)
|
||||
implementation 'com.github.ajalt.reprint:core:3.2.1@aar'
|
||||
implementation 'com.github.ajalt.reprint:rxjava:3.2.1@aar' // optional: the RxJava 1 interface
|
||||
|
@ -1,5 +1,6 @@
|
||||
package eu.kanade.tachiyomi.ui.browse.extension
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.view.View
|
||||
import eu.kanade.tachiyomi.R
|
||||
import eu.kanade.tachiyomi.data.glide.GlideApp
|
||||
@ -90,7 +91,12 @@ class ExtensionHolder(view: View, override val adapter: ExtensionAdapter) :
|
||||
setText(R.string.ext_update)
|
||||
}
|
||||
else -> {
|
||||
setText(R.string.action_settings)
|
||||
if (extension.sources.any { it is ConfigurableSource }) {
|
||||
@SuppressLint("SetTextI18n")
|
||||
text = context.getString(R.string.action_settings) + "+"
|
||||
} else {
|
||||
setText(R.string.action_settings)
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if (extension is Extension.Untrusted) {
|
||||
|
@ -36,7 +36,6 @@ import kotlinx.android.synthetic.main.manga_all_in_one_header.btn_smart_search
|
||||
import kotlinx.android.synthetic.main.manga_all_in_one_header.btn_tracking
|
||||
import kotlinx.android.synthetic.main.manga_all_in_one_header.btn_webview
|
||||
import kotlinx.android.synthetic.main.manga_all_in_one_header.manga_author
|
||||
import kotlinx.android.synthetic.main.manga_all_in_one_header.manga_author_label
|
||||
import kotlinx.android.synthetic.main.manga_all_in_one_header.manga_chapters
|
||||
import kotlinx.android.synthetic.main.manga_all_in_one_header.manga_cover
|
||||
import kotlinx.android.synthetic.main.manga_all_in_one_header.manga_full_title
|
||||
@ -156,7 +155,7 @@ class MangaAllInOneHolder(
|
||||
.onEach {
|
||||
// EXH Special case E-Hentai/ExHentai to ignore author field (unused)
|
||||
if (!adapter.delegate.isEHentaiBasedSource()) {
|
||||
adapter.delegate.copyToClipboard(manga_author_label.text.toString(), manga_author.text.toString())
|
||||
adapter.delegate.copyToClipboard("author", manga_author.text.toString())
|
||||
}
|
||||
}
|
||||
.launchIn(adapter.delegate.controllerScope)
|
||||
|
@ -1,48 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:card_view="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="?android:attr/colorBackground">
|
||||
|
||||
<com.andrognito.pinlockview.PinLockView
|
||||
android:id="@+id/pin_lock_view"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
app:keypadDeleteButtonPressedColor="?android:attr/textColorPrimary"
|
||||
app:keypadTextColor="?android:attr/textColorSecondary"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/indicator_dots" />
|
||||
|
||||
<com.andrognito.pinlockview.IndicatorDots
|
||||
android:id="@+id/indicator_dots"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="8dp"
|
||||
app:dotEmptyBackground="@drawable/lock_dot_empty"
|
||||
app:dotFilledBackground="@drawable/lock_dot_filled"
|
||||
app:layout_constraintBottom_toTopOf="@+id/pin_lock_view"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintVertical_chainStyle="packed" />
|
||||
|
||||
<androidx.cardview.widget.CardView
|
||||
android:id="@+id/swirl_container"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:layout_marginLeft="8dp"
|
||||
android:layout_marginRight="8dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
card_view:cardCornerRadius="30dp"
|
||||
card_view:cardElevation="4dp">
|
||||
|
||||
</androidx.cardview.widget.CardView>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
@ -15,7 +15,6 @@
|
||||
<string name="action_search_manually">Search manually</string>
|
||||
<string name="action_migrate_now">Migrate now</string>
|
||||
<string name="action_copy_now">Copy now</string>
|
||||
<string name="action_start">Start</string>
|
||||
|
||||
<!-- Preferences -->
|
||||
<!-- Filter -->
|
||||
|
Loading…
x
Reference in New Issue
Block a user