mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-24 02:15:46 +03:00
Code Issues Projects Releases Packages Wiki Activity

[merge] Fix new layout crash

Browse source 
Change-Id: I662d6e394db1fb95181e7aa25ed82045495d8b41
This commit is contained in:
SpiritCroc 2022-09-14 10:17:44 +02:00
parent 49a9d17521
commit 5c276966f4
3 changed files with 34 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
library/ui-strings/src/main/res/values/strings_sc.xml
View file

@ -198,4 +198,5 @@
<string name="settings_follow_system_locale">Follow system language</string>
<string name="settings_follow_system_locale_summary">When changing the system language, also change the app\'s language</string>
<string name="labs_enable_new_app_layout_summary_sc">Element\'s new simplified layout with optional tabs</string>
</resources>

32
vector/src/main/res/menu/menu_new_home.xml
View file

@ -43,4 +43,36 @@
app:iconTint="?vctr_content_secondary"
app:showAsAction="ifRoom" />
<item
android:id="@+id/dev_theming"
android:title="@string/settings_theme"
android:visible="false"
tools:visible="true"
app:showAsAction="never">
<menu>
<group>
<item
android:id="@+id/dev_base_theme"
android:title="@string/settings_theme">
<!-- Programmatically inflated menu -->
<menu>
<group
android:id="@+id/dev_base_theme_group"
android:checkableBehavior="single" />
</menu>
</item>
<item
android:id="@+id/dev_theme_accent"
android:title="@string/setting_sc_accent_color">
<!-- Programmatically inflated menu -->
<menu>
<group
android:id="@+id/dev_theme_accent_group"
android:checkableBehavior="single" />
</menu>
</item>
</group>
</menu>
</item>
</menu>

2
vector/src/main/res/xml/vector_settings_labs.xml
View file

@ -157,7 +157,7 @@
<im.vector.app.core.preference.VectorSwitchPreference
android:defaultValue="@bool/settings_labs_new_app_layout_default"
android:key="SETTINGS_LABS_NEW_APP_LAYOUT_KEY"
android:summary="@string/labs_enable_new_app_layout_summary"
android:summary="@string/labs_enable_new_app_layout_summary_sc"
android:title="@string/labs_enable_new_app_layout_title" />
</im.vector.app.core.preference.VectorPreferenceCategory>