Unverified Commit 309d3712 authored by Neil Alexander's avatar Neil Alexander
Browse files

Merge tag 'v1.1.7' into neilalexander/p2p

parents 6eaf1256 a9c966b8
......@@ -2177,6 +2177,14 @@
<string name="send_suggestion_sent">Thanks, the suggestion has been successfully sent</string>
<string name="send_suggestion_failed">The suggestion failed to be sent (%s)</string>
<string name="send_feedback_space_title">Spaces feedback</string>
<string name="feedback">Feedback</string>
<string name="send_feedback_space_info">You’re using a beta version of spaces. Your feedback will help inform the next versions. Your platform and username will be noted to help us use your feedback as much as we can.</string>
<string name="you_may_contact_me">You may contact me if you have any follow up questions</string>
<string name="feedback_sent">Thanks, your feedback has been successfully sent</string>
<string name="feedback_failed">The feedback failed to be sent (%s)</string>
<string name="give_feedback">Give Feedback</string>
<string name="settings_labs_show_hidden_events_in_timeline">Show hidden events in timeline</string>
<string name="settings_labs_show_complete_history_in_encrypted_room">"Show complete history in encrypted rooms"</string>
......@@ -2296,6 +2304,7 @@
<string name="a11y_show_password">Show password</string>
<string name="a11y_hide_password">Hide password</string>
<string name="a11y_jump_to_bottom">Jump to bottom</string>
<string name="a11y_beta">This feature is in beta</string>
<!-- Read receipts list a11y -->
<plurals name="two_and_some_others_read">
......@@ -3261,6 +3270,7 @@
<string name="a11y_rule_notify_silent">Notify without sound</string>
<string name="a11y_rule_notify_off">Do not notify</string>
<string name="a11y_view_read_receipts">View read receipts</string>
<string name="a11y_public_room">This room is public</string>
<string name="dev_tools_menu_name">Dev Tools</string>
<string name="dev_tools_explore_room_state">Explore Room State</string>
......@@ -3356,7 +3366,7 @@
<string name="space_add_existing_rooms">Add existing rooms and space</string>
<string name="spaces_beta_welcome_to_spaces">Welcome to Spaces!</string>
<string name="spaces_beta_welcome_to_spaces_desc">Spaces are ways to group rooms and people for work, fun or just yourself.</string>
<string name="spaces_beta_welcome_to_spaces_desc">Spaces are a new way to group rooms and people.</string>
<string name="you_are_invited">You are invited</string>
......@@ -3365,4 +3375,16 @@
<string name="user_invites_you">%s invites you</string>
<string name="looking_for_someone_not_in_space">Looking for someone not in %s?</string>
<string name="space_settings_manage_rooms">Manage rooms</string>
<string name="make_this_space_public">Make this space public</string>
<string name="space_suggested">Suggested</string>
<string name="space_mark_as_suggested">Mark as suggested</string>
<string name="space_mark_as_not_suggested">Mark as not suggested</string>
<string name="space_manage_rooms_and_spaces">Manage rooms and spaces</string>
<string name="labs_space_show_orphan_in_home">Experimental Space - Only show orphans in Home</string>
<string name="spaces_feeling_experimental_subspace">Feeling experimental?\nYou can add existing spaces to a space.</string>
<string name="spaces_no_server_support_title">It looks like your homeserver does not support Spaces yet</string>
<string name="spaces_no_server_support_description">Please contact your homserver admin for further information</string>
</resources>
......@@ -11,6 +11,13 @@
<item name="android:background">?riotx_background</item>
</style>
<style name="ActionModeTheme" parent="Widget.AppCompat.ActionMode">
<item name="background">?riotx_background</item>
<item name="titleTextStyle">@style/Vector.Toolbar.Title</item>
<item name="subtitleTextStyle">@style/Vector.Toolbar.SubTitle</item>
<item name="actionMenuTextColor">?colorOnPrimary</item>
</style>
<style name="VectorToolbarStyle" parent="VectorToolbarStyleWithPadding">
<item name="contentInsetStartWithNavigation">0dp</item>
</style>
......@@ -65,7 +72,7 @@
<!-- actionbar icons color -->
<style name="Vector.ActionBarTheme" parent="ThemeOverlay.MaterialComponents.ActionBar">
<item name="colorControlNormal">@android:color/white</item>
<item name="colorControlNormal">?android:attr/textColorPrimary</item>
</style>
<!-- custom action bar -->
......
......@@ -181,6 +181,8 @@
<!-- chat effect -->
<item name="vctr_chat_effect_snow_background">@android:color/transparent</item>
<item name="actionModeStyle">@style/ActionModeTheme</item>
</style>
<style name="AppTheme.Dark" parent="AppTheme.Base.Dark" />
......
......@@ -183,6 +183,9 @@
<!-- chat effect -->
<item name="vctr_chat_effect_snow_background">@color/black_alpha</item>
<item name="actionModeStyle">@style/ActionModeTheme</item>
</style>
<style name="AppTheme.Light" parent="AppTheme.Base.Light" />
......
......@@ -7,6 +7,7 @@
<im.vector.app.core.preference.VectorSwitchPreference
android:defaultValue="false"
android:key="SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY"
android:icon="@drawable/ic_verification_glasses"
android:summary="@string/settings_developer_mode_summary"
android:title="@string/settings_developer_mode" />
......
......@@ -52,4 +52,9 @@
android:summary="@string/labs_use_restricted_join_rule_desc"/>
<!--</im.vector.app.core.preference.VectorPreferenceCategory>-->
<im.vector.app.core.preference.VectorSwitchPreference
android:defaultValue="false"
android:key="SETTINGS_LABS_SPACES_HOME_AS_ORPHAN"
android:title="@string/labs_space_show_orphan_in_home"/>
</androidx.preference.PreferenceScreen>
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment