rei-forks
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes night mode colors

This commit is contained in:
ericdecanini 2022-05-05 15:51:28 +02:00
parent 2d2f8f5479
commit 051adad0ed
7 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/ui-styles/src/main/res/values-night/bools.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<bool name="isDarkMode">true</bool>
</resources>

6
library/ui-styles/src/main/res/values-night/colors.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="modal_background_color">@color/element_system_dark</color>
</resources>

1
library/ui-styles/src/main/res/values/bools.xml
View File

@ -3,5 +3,6 @@
<!-- Created to detect what has to be implemented (especially in the settings) --> <!-- Created to detect what has to be implemented (especially in the settings) -->
<bool name="false_not_implemented">false</bool> <bool name="false_not_implemented">false</bool>
<bool name="isDarkMode">false</bool>
</resources> </resources>

2
library/ui-styles/src/main/res/values/colors.xml
View File

@ -36,6 +36,8 @@
<color name="android_status_bar_background_dark">@color/element_background_dark</color> <color name="android_status_bar_background_dark">@color/element_background_dark</color>
<color name="android_navigation_bar_background_dark">@color/element_system_dark</color> <color name="android_navigation_bar_background_dark">@color/element_system_dark</color>
<color name="modal_background_color">#FFFFFF</color>
<!-- Used for toolbar background --> <!-- Used for toolbar background -->
<attr name="vctr_toolbar_background" format="color" /> <attr name="vctr_toolbar_background" format="color" />

6
vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
View File

@ -46,6 +46,7 @@ import androidx.viewbinding.ViewBinding
import com.airbnb.mvrx.MavericksView import com.airbnb.mvrx.MavericksView
import com.bumptech.glide.util.Util import com.bumptech.glide.util.Util
import com.google.android.material.appbar.MaterialToolbar import com.google.android.material.appbar.MaterialToolbar
import com.google.android.material.color.MaterialColors
import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.snackbar.Snackbar import com.google.android.material.snackbar.Snackbar
import dagger.hilt.android.EntryPointAccessors import dagger.hilt.android.EntryPointAccessors
@ -238,8 +239,9 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
initUiAndData() initUiAndData()
window.statusBarColor = ContextCompat.getColor(this, android.R.color.white) val toolbarBackgroundRes = R.color.modal_background_color
window.navigationBarColor = ContextCompat.getColor(this, android.R.color.white) window.statusBarColor = ContextCompat.getColor(this, toolbarBackgroundRes)
window.navigationBarColor = ContextCompat.getColor(this, toolbarBackgroundRes)
val titleRes = getTitleRes() val titleRes = getTitleRes()
if (titleRes != -1) { if (titleRes != -1) {
supportActionBar?.let { supportActionBar?.let {

2
vector/src/main/res/drawable/bg_space_modal.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#FFF"/> <solid android:color="@color/modal_background_color"/>
<corners <corners
android:bottomLeftRadius="12dp" android:bottomLeftRadius="12dp"
android:bottomRightRadius="12dp" /> android:bottomRightRadius="12dp" />

2
vector/src/main/res/layout/fragment_space_list_modal.xml
View File

@ -56,7 +56,7 @@
app:layout_constraintEnd_toEndOf="@id/add_space_icon_background" app:layout_constraintEnd_toEndOf="@id/add_space_icon_background"
app:layout_constraintStart_toStartOf="@id/add_space_icon_background" app:layout_constraintStart_toStartOf="@id/add_space_icon_background"
app:layout_constraintTop_toTopOf="@id/add_space_icon_background" app:layout_constraintTop_toTopOf="@id/add_space_icon_background"
app:tint="#000" /> app:tint="?attr/vctr_spoiler_background_color" />
<TextView <TextView
style="@style/Widget.Vector.TextView.Body.Medium" style="@style/Widget.Vector.TextView.Body.Medium"