nomad/ananas
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Quick Connect code color in light mode

Browse source 
Fix #239
This commit is contained in:
Jarne Demeulemeester 2023-01-23 22:37:49 +01:00
parent 9c287a9896
commit 07d0c695f4
No known key found for this signature in database
GPG key ID: 65C6006F2032DD14
2 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/phone/src/main/java/dev/jdtech/jellyfin/fragments/LoginFragment.kt
View file

@ -1,12 +1,10 @@
package dev.jdtech.jellyfin.fragments package dev.jdtech.jellyfin.fragments
import android.os.Bundle import android.os.Bundle
import android.util.TypedValue
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.view.inputmethod.EditorInfo import android.view.inputmethod.EditorInfo
import androidx.annotation.ColorInt
import androidx.appcompat.widget.AppCompatEditText import androidx.appcompat.widget.AppCompatEditText
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
@ -112,15 +110,10 @@ class LoginFragment : Fragment() {
is LoginViewModel.QuickConnectUiState.Normal -> { is LoginViewModel.QuickConnectUiState.Normal -> {
binding.buttonQuickconnectLayout.isVisible = true binding.buttonQuickconnectLayout.isVisible = true
binding.buttonQuickconnect.text = resources.getString(R.string.quick_connect) 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 binding.buttonQuickconnectProgress.isVisible = false
} }
is LoginViewModel.QuickConnectUiState.Waiting -> { is LoginViewModel.QuickConnectUiState.Waiting -> {
binding.buttonQuickconnect.text = quickConnectUiState.code binding.buttonQuickconnect.text = quickConnectUiState.code
binding.buttonQuickconnect.setTextColor(resources.getColor(android.R.color.white, requireActivity().theme))
binding.buttonQuickconnectProgress.isVisible = true binding.buttonQuickconnectProgress.isVisible = true
} }
} }

2
app/phone/src/main/res/layout/fragment_login.xml
View file

@ -126,7 +126,7 @@
<Button <Button
android:id="@+id/button_quickconnect" android:id="@+id/button_quickconnect"
style="@style/Widget.Material3.Button.ElevatedButton" style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/quick_connect" /> android:text="@string/quick_connect" />