diff --git a/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsFragment.kt b/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsFragment.kt index 24873ee39..b411bb378 100644 --- a/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/settings/fragment/SettingsFragment.kt @@ -8,7 +8,7 @@ import android.widget.AdapterView import android.widget.ArrayAdapter import androidx.annotation.UiThread import androidx.appcompat.app.AppCompatDelegate -import androidx.navigation.navGraphViewModels +import androidx.lifecycle.ViewModelProvider import org.linphone.LinphoneApplication.Companion.coreContext import org.linphone.R import org.linphone.core.tools.Log @@ -24,9 +24,7 @@ class SettingsFragment : GenericFragment() { private lateinit var binding: SettingsFragmentBinding - private val viewModel: SettingsViewModel by navGraphViewModels( - R.id.main_nav_graph - ) + private lateinit var viewModel: SettingsViewModel private val ringtoneListener = object : AdapterView.OnItemSelectedListener { override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) { @@ -73,6 +71,8 @@ class SettingsFragment : GenericFragment() { postponeEnterTransition() super.onViewCreated(view, savedInstanceState) + viewModel = ViewModelProvider(this)[SettingsViewModel::class.java] + binding.lifecycleOwner = viewLifecycleOwner binding.viewModel = viewModel diff --git a/app/src/main/res/layout/top_bar.xml b/app/src/main/res/layout/top_bar.xml index 8af766b56..8d4e84492 100644 --- a/app/src/main/res/layout/top_bar.xml +++ b/app/src/main/res/layout/top_bar.xml @@ -64,7 +64,7 @@ android:layout_marginEnd="10dp" android:gravity="center_vertical" android:text="@{viewModel.title, default=`Title`}" - android:textColor="#FFFFFF" + android:textColor="@color/white" android:textSize="20sp" app:layout_constraintEnd_toStartOf="@id/search_toggle" app:layout_constraintStart_toEndOf="@id/avatar" diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml new file mode 100644 index 000000000..bebe91daa --- /dev/null +++ b/app/src/main/res/values-night/colors.xml @@ -0,0 +1,46 @@ + + + #00000000 + #FFFFFF + #000000 + + #D13400 + #FF5E00 + #FFB266 + #4D2E00 + #80FFEACB + + #2A3F5F + #364860 + #4E6074 + #6C7A87 + #9AABB5 + #30454F + #142932 + #191919 + + #131313 + #1F1F1F + #C9C9C9 + #949494 + #4E4E4E + #CFD1D1 + #E7D2D8 + #FFFFFF + + #57200D + #E17474 + #B13B51 + #843B3B + + #60B78D + #60B78D + #0D6A27 + + #64B4FF + + #E1C133 + + #FF923F + #80FFFFFF + \ No newline at end of file