diff --git a/app/src/main/java/ani/dantotsu/profile/ProfileFragment.kt b/app/src/main/java/ani/dantotsu/profile/ProfileFragment.kt index 5d98a746..e70cd4e9 100644 --- a/app/src/main/java/ani/dantotsu/profile/ProfileFragment.kt +++ b/app/src/main/java/ani/dantotsu/profile/ProfileFragment.kt @@ -16,6 +16,7 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView +import ani.dantotsu.R import ani.dantotsu.connections.anilist.ProfileViewModel import ani.dantotsu.connections.anilist.api.Query import ani.dantotsu.databinding.FragmentProfileBinding @@ -59,27 +60,12 @@ class ProfileFragment : Fragment() { viewLifecycleOwner.lifecycleScope.launch(Dispatchers.IO) { model.setData(user.id) } - val backGroundColorTypedValue = TypedValue() - val textColorTypedValue = TypedValue() - activity.theme.resolveAttribute( - android.R.attr.windowBackground, - backGroundColorTypedValue, - true - ) - activity.theme.resolveAttribute( - com.google.android.material.R.attr.colorOnBackground, - textColorTypedValue, - true - ) - binding.profileUserBio.settings.loadWithOverviewMode = true binding.profileUserBio.settings.useWideViewPort = true binding.profileUserBio.setInitialScale(1) - Logger.log("Text color: ${textColorTypedValue.data} Background color: ${backGroundColorTypedValue.data}") val styledHtml = getFullAniHTML( user.about ?: "", - backGroundColorTypedValue.data, - textColorTypedValue.data + activity.getColor(R.color.bg_opp) ) binding.profileUserBio.loadDataWithBaseURL( null, diff --git a/app/src/main/java/ani/dantotsu/util/AniMarkdown.kt b/app/src/main/java/ani/dantotsu/util/AniMarkdown.kt index ca45b0e6..6bac3fcc 100644 --- a/app/src/main/java/ani/dantotsu/util/AniMarkdown.kt +++ b/app/src/main/java/ani/dantotsu/util/AniMarkdown.kt @@ -1,6 +1,7 @@ package ani.dantotsu.util import ani.dantotsu.util.ColorEditor.Companion.toCssColor +import ani.dantotsu.util.ColorEditor.Companion.toHexColor class AniMarkdown { //istg anilist has the worst api companion object { @@ -60,7 +61,7 @@ class AniMarkdown { //istg anilist has the worst api return underlineToHtml(step3) } - fun getFullAniHTML(html: String, backGroundColor: Int, textColor: Int): String { + fun getFullAniHTML(html: String, textColor: Int): String { val basicHtml = getBasicAniHTML(html) @@ -95,7 +96,6 @@ class AniMarkdown { //istg anilist has the worst api """.trimIndent() - Logger.log(returnHtml) return returnHtml } } diff --git a/app/src/main/java/ani/dantotsu/util/ColorEditor.kt b/app/src/main/java/ani/dantotsu/util/ColorEditor.kt index eb19f145..d4f9662c 100644 --- a/app/src/main/java/ani/dantotsu/util/ColorEditor.kt +++ b/app/src/main/java/ani/dantotsu/util/ColorEditor.kt @@ -91,8 +91,11 @@ class ColorEditor { base += "${Color.green(this)}, " base += "${Color.blue(this)}, " base += "${Color.alpha(this) / 255.0})" - Logger.log("Color: $base") return base } + + fun Int.toHexColor(): String { + return String.format("#%06X", 0xFFFFFF and this) + } } } \ No newline at end of file