diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SourceHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SourceHolder.kt index 323f597603..85240e06f9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SourceHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SourceHolder.kt @@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.ui.migration import android.view.View import eu.kanade.tachiyomi.source.icon import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder -import eu.kanade.tachiyomi.util.view.roundTextIcon import kotlinx.android.synthetic.main.migration_card_item.* import kotlinx.android.synthetic.main.source_item.edit_button import kotlinx.android.synthetic.main.source_item.title @@ -30,7 +29,6 @@ class SourceHolder(view: View, val adapter: SourceAdapter) : itemView.post { val icon = source.icon() if (icon != null) edit_button.setImageDrawable(source.icon()) - else edit_button.roundTextIcon(source.name) } } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationSourceHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationSourceHolder.kt index bb75df7181..526b99e1cb 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationSourceHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/MigrationSourceHolder.kt @@ -7,7 +7,6 @@ import eu.kanade.tachiyomi.data.preference.getOrDefault import eu.kanade.tachiyomi.source.icon import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder -import eu.kanade.tachiyomi.util.view.roundTextIcon import kotlinx.android.synthetic.main.migration_source_item.* import uy.kohesive.injekt.injectLazy @@ -27,7 +26,6 @@ class MigrationSourceHolder(view: View, val adapter: MigrationSourceAdapter) : itemView.post { val icon = source.icon() if (icon != null) edit_button.setImageDrawable(source.icon()) - else edit_button.roundTextIcon(source.name) } if (sourceEnabled) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/SourceHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/SourceHolder.kt index 384c7a9c9a..fa07fb6861 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/SourceHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/SourceHolder.kt @@ -3,11 +3,11 @@ package eu.kanade.tachiyomi.ui.source import android.content.res.ColorStateList import android.view.View import eu.kanade.tachiyomi.R +import eu.kanade.tachiyomi.source.LocalSource import eu.kanade.tachiyomi.source.icon import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder import eu.kanade.tachiyomi.util.system.getResourceColor import eu.kanade.tachiyomi.util.view.gone -import eu.kanade.tachiyomi.util.view.roundTextIcon import eu.kanade.tachiyomi.util.view.visible import kotlinx.android.synthetic.main.source_item.* @@ -55,7 +55,8 @@ class SourceHolder(view: View, val adapter: SourceAdapter) : itemView.post { val icon = source.icon() if (icon != null) edit_button.setImageDrawable(source.icon()) - else edit_button.roundTextIcon(source.name) + else if (item.source.id == LocalSource.ID) + edit_button.setImageResource(R.drawable.ic_local_source_32dp) } if (source.supportsLatest) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt index 9cc964393e..a47ba5a5a1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt @@ -8,7 +8,6 @@ import android.content.res.ColorStateList import android.content.res.Configuration import android.graphics.Color import android.graphics.Point -import android.graphics.Typeface import android.os.Build import android.view.View import android.view.ViewGroup @@ -16,7 +15,6 @@ import android.view.ViewTreeObserver import android.view.WindowInsets import android.widget.Button import android.widget.FrameLayout -import android.widget.ImageView import android.widget.TextView import androidx.annotation.ColorRes import androidx.annotation.IdRes @@ -24,8 +22,6 @@ import androidx.annotation.Px import androidx.appcompat.view.menu.MenuBuilder import androidx.core.graphics.ColorUtils import androidx.swiperefreshlayout.widget.SwipeRefreshLayout -import com.amulyakhare.textdrawable.TextDrawable -import com.amulyakhare.textdrawable.util.ColorGenerator import com.google.android.material.bottomnavigation.BottomNavigationItemView import com.google.android.material.bottomnavigation.BottomNavigationMenuView import com.google.android.material.bottomnavigation.BottomNavigationView @@ -39,7 +35,6 @@ import eu.kanade.tachiyomi.util.system.contextCompatColor import eu.kanade.tachiyomi.util.system.getResourceColor import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get -import kotlin.math.min /** * Returns coordinates of view. @@ -117,23 +112,6 @@ inline fun View.visInvisIf(show: Boolean) { visibility = if (show) View.VISIBLE else View.INVISIBLE } -/** - * Returns a TextDrawable determined by input - * - * @param text text of [TextDrawable] - * @param random random color - */ -fun ImageView.roundTextIcon(text: String) { - val size = min(this.width, this.height) - val letter = text.take(1).toUpperCase() - setImageDrawable( - TextDrawable.builder().beginConfig().width(size).height(size).textColor(Color.WHITE) - .useFont(Typeface.DEFAULT).endConfig().buildRound( - letter, ColorGenerator.MATERIAL.getColor(letter) - ) - ) -} - inline val View.marginTop: Int get() = (layoutParams as? ViewGroup.MarginLayoutParams)?.topMargin ?: 0 diff --git a/app/src/main/res/drawable/ic_local_source_32dp.xml b/app/src/main/res/drawable/ic_local_source_32dp.xml new file mode 100644 index 0000000000..fea12ef0fa --- /dev/null +++ b/app/src/main/res/drawable/ic_local_source_32dp.xml @@ -0,0 +1,28 @@ + + + + + + + + + + +