matrix/element-android
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2025-07-31 07:04:23 +03:00
Code Activity

Merge branch 'develop' into feature/ons/qr_code_login_ui

Browse Source 
# Conflicts:
#	library/ui-strings/src/main/res/values/strings.xml
#	library/ui-styles/src/main/res/values/stylable_sessions_list_header_view.xml
#	vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
#	vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
#	vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
#	vector/src/main/java/im/vector/app/features/VectorFeatures.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt
#	vector/src/main/res/layout/fragment_other_sessions.xml
#	vector/src/main/res/layout/fragment_settings_devices.xml
This commit is contained in:
Onuray Sahin
2022-10-12 14:32:09 +03:00
parent 4b14ee4695 def67b2e7d
commit 1e1affbb7b
325 changed files with 8787 additions and 1729 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/ui-styles/src/main/res/values/dimens.xml
View File

@ -50,9 +50,9 @@
<dimen name="chat_bubble_margin_start">28dp</dimen>
<dimen name="chat_bubble_margin_end">62dp</dimen>
<dimen name="chat_bubble_fixed_size">300dp</dimen>
<dimen name="chat_bubble_corner_radius">12dp</dimen>
<dimen name="chat_bubble_margin_end">6dp</dimen>
<dimen name="chat_bubble_fixed_size">350sp</dimen>
<dimen name="chat_bubble_corner_radius">8dp</dimen>
<!-- Onboarding -->
<item name="ftue_auth_gutter_start_percent" format="float" type="dimen">0.05</item>

6
library/ui-styles/src/main/res/values/stylable_session_overview_entry_view.xml
View File

@ -6,4 +6,10 @@
<attr name="sessionOverviewEntryDescription" format="string" />
</declare-styleable>
<declare-styleable name="SessionOverviewEntrySwitchView">
<attr name="sessionOverviewEntrySwitchTitle" format="string" />
<attr name="sessionOverviewEntrySwitchDescription" format="string" />
<attr name="sessionOverviewEntrySwitchEnabled" format="boolean" />
</declare-styleable>
</resources>

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

@ -4,7 +4,7 @@
<declare-styleable name="SessionsListHeaderView">
<attr name="sessionsListHeaderTitle" format="string" />
<attr name="sessionsListHeaderDescription" format="string" />
<attr name="sessionListHeaderShowLearnMore" format="boolean" />
<attr name="sessionsListHeaderHasLearnMoreLink" format="boolean" />
</declare-styleable>
</resources>