filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix regressions

This commit is contained in:
Olivér Falvai 2022-04-17 11:35:30 +02:00
parent 2c84f234a6
commit 2bbecd4cc5
9 changed files with 119 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/ui-styles/build.gradle
View File

@ -54,6 +54,10 @@ android {
dependencies {
implementation libs.androidx.appCompat
implementation libs.google.material
// Pref theme
implementation libs.androidx.preferenceKtx
// PFLockScreen attrs
implementation 'com.github.vector-im:PFLockScreen-Android:1.0.0-beta12'
// dialpad dimen
implementation 'im.dlg:android-dialer:1.2.5'
}

13
library/ui-styles/src/main/res/drawable/bg_pin_key.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorControlHighlight">
<item
android:gravity="center">
<shape android:shape="oval">
<solid android:color="#44FFFFFF" />
<size
android:width="70dp"
android:height="70dp" />
</shape>
</item>
</ripple>

13
library/ui-styles/src/main/res/drawable/pin_code_dot_empty.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<stroke
android:color="?vctr_content_secondary"
android:width="1px"/>
<size
android:width="24dp"
android:height="24dp"/>
</shape>

12
library/ui-styles/src/main/res/drawable/pin_code_dot_fill.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid
android:color="?colorPrimary"/>
<size
android:width="24dp"
android:height="24dp"/>
</shape>

9
library/ui-styles/src/main/res/drawable/pin_code_dots.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- NOTE: order is important (the first matching state(s) is what is rendered) -->
<item
android:state_checked="true"
android:drawable="@drawable/pin_code_dot_fill"/>
<item
android:drawable="@drawable/pin_code_dot_empty"/>
</selector>

44
library/ui-styles/src/main/res/values/styles_pin_code.xml Normal file
View File

@ -0,0 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="PinCodeScreenStyle" >
<item name="android:background">?android:colorBackground</item>
</style>
<style name="PinCodeKeyButtonStyle">
<item name="android:textColor">?vctr_content_primary</item>
<item name="android:textSize">18sp</item>
<item name="android:background">@drawable/bg_pin_key</item>
</style>
<style name="PinCodeDotsViewStyle">
<item name="android:button">@drawable/pin_code_dots</item>
</style>
<style name="PinCodeNextButtonStyle" parent="Widget.Vector.Button">
<item name="android:textSize">18sp</item>
<item name="android:backgroundTint">@android:color/transparent</item>
<item name="android:layout_marginBottom">24dp</item>
</style>
<style name="PinCodeDeleteButtonStyle">
<item name="android:src">@drawable/delete_lockscreen_pf</item>
<item name="android:tint">?vctr_content_primary</item>
<item name="background">@drawable/bg_pin_key</item>
</style>
<style name="PinCodeFingerprintButtonStyle">
<item name="android:src">@drawable/fingerprint_lockscreen_pf</item>
<item name="android:tint">?vctr_content_primary</item>
<item name="background">@drawable/bg_pin_key</item>
</style>
<style name="PinCodeTitleStyle">
<item name="android:textColor">?vctr_content_primary</item>
</style>
<style name="PinCodeHintStyle">
<item name="android:textColor">?vctr_content_primary</item>
</style>
</resources>

11
library/ui-styles/src/main/res/values/theme_dark.xml
View File

@ -106,6 +106,17 @@
<!-- disable the overscroll because setOverscrollHeader/Footer don't always work -->
<item name="android:overScrollMode">never</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
<item name="pf_lock_screen">@style/PinCodeScreenStyle</item>
<item name="pf_key_button">@style/PinCodeKeyButtonStyle</item>
<item name="pf_title">@style/PinCodeTitleStyle</item>
<item name="pf_hint">@style/PinCodeHintStyle</item>
<item name="pf_code_view">@style/PinCodeDotsViewStyle</item>
<item name="pf_delete_button">@style/PinCodeDeleteButtonStyle</item>
<item name="pf_fingerprint_button">@style/PinCodeFingerprintButtonStyle</item>
<item name="pf_next">@style/PinCodeNextButtonStyle</item>
<item name="android:statusBarColor">@color/android_status_bar_background_dark</item>
<item name="android:navigationBarColor">@color/android_navigation_bar_background_dark</item>

11
library/ui-styles/src/main/res/values/theme_light.xml
View File

@ -106,6 +106,17 @@
<!-- disable the overscroll because setOverscrollHeader/Footer don't always work -->
<item name="android:overScrollMode">never</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
<item name="pf_lock_screen">@style/PinCodeScreenStyle</item>
<item name="pf_key_button">@style/PinCodeKeyButtonStyle</item>
<item name="pf_title">@style/PinCodeTitleStyle</item>
<item name="pf_hint">@style/PinCodeHintStyle</item>
<item name="pf_code_view">@style/PinCodeDotsViewStyle</item>
<item name="pf_delete_button">@style/PinCodeDeleteButtonStyle</item>
<item name="pf_fingerprint_button">@style/PinCodeFingerprintButtonStyle</item>
<item name="pf_next">@style/PinCodeNextButtonStyle</item>
<!-- Use dark color, to have enough contrast with icons color. windowLightStatusBar is only available in API 23+ -->
<item name="android:statusBarColor">@color/android_status_bar_background_dark</item>
<!-- Use dark color, to have enough contrast with icons color. windowLightNavigationBar is only available in API 27+ -->

2
vector/build.gradle
View File

@ -6,6 +6,7 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-parcelize'
apply plugin: 'kotlin-kapt'
apply plugin: 'com.likethesalad.stem'
apply plugin: 'dagger.hilt.android.plugin'
kapt {
correctErrorTypes = true
@ -446,6 +447,7 @@ dependencies {
implementation 'com.github.jetradarmobile:android-snowfall:1.2.1'
// DI
implementation libs.dagger.hilt
kapt libs.dagger.hiltCompiler
// Analytics
implementation 'com.posthog.android:posthog:1.1.2'