Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-12-22 15:21:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace TextDrawable with a Kotlin fork (#2929)

Browse Source 
* Replace old TextDrawable with Kotlin fork

* Update androidx preferences library
This commit is contained in:
TacoTheDank 2020-04-22 21:23:44 -04:00 committed by GitHub
parent f7c139030f
commit 34f7e4d448
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -126,7 +126,7 @@ dependencies {
implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'androidx.preference:preference:1.1.0' implementation 'androidx.preference:preference:1.1.1'
implementation 'androidx.annotation:annotation:1.1.0' implementation 'androidx.annotation:annotation:1.1.0'
implementation 'androidx.browser:browser:1.2.0' implementation 'androidx.browser:browser:1.2.0'
implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.multidex:multidex:2.0.1'
@ -219,7 +219,7 @@ dependencies {
implementation 'eu.davidea:flexible-adapter:5.1.0' implementation 'eu.davidea:flexible-adapter:5.1.0'
implementation 'eu.davidea:flexible-adapter-ui:1.0.0' implementation 'eu.davidea:flexible-adapter-ui:1.0.0'
implementation 'com.nononsenseapps:filepicker:2.5.2' implementation 'com.nononsenseapps:filepicker:2.5.2'
implementation 'com.github.amulyakhare:TextDrawable:558677e' implementation 'com.github.Kennyc1012:TextDrawable:2.0.1'
implementation 'com.nightlynexus.viewstatepageradapter:viewstatepageradapter:1.1.0' implementation 'com.nightlynexus.viewstatepageradapter:viewstatepageradapter:1.1.0'
implementation 'com.github.mthli:Slice:v1.3' implementation 'com.github.mthli:Slice:v1.3'
implementation 'com.github.chrisbanes:PhotoView:2.3.0' implementation 'com.github.chrisbanes:PhotoView:2.3.0'

17
app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt
View File

@ -14,10 +14,10 @@ import android.widget.TextView
import androidx.annotation.MenuRes import androidx.annotation.MenuRes
import androidx.appcompat.widget.PopupMenu import androidx.appcompat.widget.PopupMenu
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.amulyakhare.textdrawable.TextDrawable
import com.amulyakhare.textdrawable.util.ColorGenerator
import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
import com.google.android.material.snackbar.Snackbar import com.google.android.material.snackbar.Snackbar
import com.kennyc.textdrawable.ColorGenerator
import com.kennyc.textdrawable.TextDrawable
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import kotlin.math.min import kotlin.math.min
@ -93,11 +93,14 @@ fun ImageView.roundTextIcon(text: String) {
val letter = text.take(1).toUpperCase() val letter = text.take(1).toUpperCase()
val size = min(this.width, this.height) val size = min(this.width, this.height)
setImageDrawable( TextDrawable(
TextDrawable.builder().beginConfig().width(size).height(size).textColor(Color.WHITE) shape = TextDrawable.DRAWABLE_SHAPE_OVAL,
.useFont(Typeface.DEFAULT).endConfig().buildRound( desiredWidth = size,
letter, ColorGenerator.MATERIAL.getColor(letter) desiredHeight = size,
) typeFace = Typeface.DEFAULT,
textColor = Color.WHITE,
text = letter,
color = ColorGenerator.MATERIAL.getColor(letter)
) )
} }