From 07d0c695f42210005b4cce4a9128b8cfee73aabc Mon Sep 17 00:00:00 2001 From: Jarne Demeulemeester Date: Mon, 23 Jan 2023 22:37:49 +0100 Subject: [PATCH] Fix Quick Connect code color in light mode Fix #239 --- .../java/dev/jdtech/jellyfin/fragments/LoginFragment.kt | 7 ------- app/phone/src/main/res/layout/fragment_login.xml | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/LoginFragment.kt b/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/LoginFragment.kt index 01d36218..1b9aad12 100644 --- a/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/LoginFragment.kt +++ b/app/phone/src/main/java/dev/jdtech/jellyfin/fragments/LoginFragment.kt @@ -1,12 +1,10 @@ package dev.jdtech.jellyfin.fragments import android.os.Bundle -import android.util.TypedValue import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.view.inputmethod.EditorInfo -import androidx.annotation.ColorInt import androidx.appcompat.widget.AppCompatEditText import androidx.core.view.isVisible import androidx.fragment.app.Fragment @@ -112,15 +110,10 @@ class LoginFragment : Fragment() { is LoginViewModel.QuickConnectUiState.Normal -> { binding.buttonQuickconnectLayout.isVisible = true binding.buttonQuickconnect.text = resources.getString(R.string.quick_connect) - val typedValue = TypedValue() - requireActivity().theme.resolveAttribute(R.attr.colorPrimary, typedValue, true) - @ColorInt val textColor: Int = typedValue.data - binding.buttonQuickconnect.setTextColor(textColor) binding.buttonQuickconnectProgress.isVisible = false } is LoginViewModel.QuickConnectUiState.Waiting -> { binding.buttonQuickconnect.text = quickConnectUiState.code - binding.buttonQuickconnect.setTextColor(resources.getColor(android.R.color.white, requireActivity().theme)) binding.buttonQuickconnectProgress.isVisible = true } } diff --git a/app/phone/src/main/res/layout/fragment_login.xml b/app/phone/src/main/res/layout/fragment_login.xml index a34af782..79d80833 100644 --- a/app/phone/src/main/res/layout/fragment_login.xml +++ b/app/phone/src/main/res/layout/fragment_login.xml @@ -126,7 +126,7 @@