6543/BayernMessenger
1
0
Fork 0
forked from GitHub-Mirror/riotX-android
Code Issues 4 Pull Requests Releases Wiki Activity

Rename im.vector.riotredesign to im.vector.riotx

Browse Source
This commit is contained in:
Benoit Marty
2019-07-02 17:27:08 +02:00
parent 73277c5b08
commit 504009499f
429 changed files with 1633 additions and 1742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vector/src/main/res/layout/activity_emoji_reaction_picker.xml
View File

@ -4,11 +4,11 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="im.vector.riotredesign.features.reactions.EmojiReactionPickerActivity">
tools:context="im.vector.riotx.features.reactions.EmojiReactionPickerActivity">
<fragment
android:id="@+id/fragment"
android:name="im.vector.riotredesign.features.reactions.EmojiChooserFragment"
android:name="im.vector.riotx.features.reactions.EmojiChooserFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"

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

@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="vertical"
tools:context="im.vector.riotredesign.features.reactions.EmojiChooserFragment"
tools:context="im.vector.riotx.features.reactions.EmojiChooserFragment"
tools:itemCount="100"
tools:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
tools:listitem="@layout/grid_item_emoji"

4
vector/src/main/res/layout/fragment_group_list.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<im.vector.riotredesign.core.platform.StateView xmlns:android="http://schemas.android.com/apk/res/android"
<im.vector.riotx.core.platform.StateView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/stateView"
android:layout_width="match_parent"
@ -11,4 +11,4 @@
android:layout_height="match_parent"
tools:listitem="@layout/item_group" />
</im.vector.riotredesign.core.platform.StateView>
</im.vector.riotx.core.platform.StateView>

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

@ -57,7 +57,7 @@
app:layout_constraintTop_toBottomOf="@id/groupToolbar"
tools:visibility="visible" />
<im.vector.riotredesign.core.ui.views.KeysBackupBanner
<im.vector.riotx.core.ui.views.KeysBackupBanner
android:id="@+id/homeKeysBackupBanner"
android:layout_width="0dp"
android:layout_height="wrap_content"

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

@ -81,7 +81,7 @@
app:layout_constraintStart_toEndOf="@id/keys_backup_passphrase_enter_til"
app:layout_constraintTop_toTopOf="@id/keys_backup_passphrase_enter_til" />
<im.vector.riotredesign.core.ui.views.PasswordStrengthBar
<im.vector.riotx.core.ui.views.PasswordStrengthBar
android:id="@+id/keys_backup_passphrase_security_progress"
android:layout_width="0dp"
android:layout_height="4dp"

4
vector/src/main/res/layout/fragment_room_detail.xml
View File

@ -81,7 +81,7 @@
tools:listitem="@layout/item_timeline_event_base" />
<im.vector.riotredesign.features.home.room.detail.composer.TextComposerView
<im.vector.riotx.features.home.room.detail.composer.TextComposerView
android:id="@+id/composerLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -89,7 +89,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<im.vector.riotredesign.features.invite.VectorInviteView
<im.vector.riotx.features.invite.VectorInviteView
android:id="@+id/inviteView"
android:layout_width="0dp"
android:layout_height="wrap_content"

6
vector/src/main/res/layout/fragment_room_list.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<im.vector.riotredesign.core.platform.StateView xmlns:android="http://schemas.android.com/apk/res/android"
<im.vector.riotx.core.platform.StateView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/stateView"
@ -12,7 +12,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
<im.vector.riotredesign.features.home.room.list.widget.FabMenuView
<im.vector.riotx.features.home.room.list.widget.FabMenuView
android:id="@+id/createChatFabMenu"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -50,4 +50,4 @@
tools:layout_marginEnd="144dp"
tools:visibility="visible" />
</im.vector.riotredesign.core.platform.StateView>
</im.vector.riotx.core.platform.StateView>

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

@ -118,7 +118,7 @@
tools:text="Error"
tools:visibility="visible" />
<im.vector.riotredesign.core.platform.ButtonStateView
<im.vector.riotx.core.platform.ButtonStateView
android:id="@+id/roomPreviewNoPreviewJoin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

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

@ -15,7 +15,7 @@
tools:visibility="visible"
android:background="@drawable/circle" />
<im.vector.riotredesign.features.reactions.EmojiDrawView
<im.vector.riotx.features.reactions.EmojiDrawView
android:id="@+id/grid_item_emoji_text"
android:layout_width="40dp"
android:layout_height="40dp"

4
vector/src/main/res/layout/item_group.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<im.vector.riotredesign.core.platform.CheckableConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<im.vector.riotx.core.platform.CheckableConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/itemGroupLayout"
@ -61,4 +61,4 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</im.vector.riotredesign.core.platform.CheckableConstraintLayout>
</im.vector.riotx.core.platform.CheckableConstraintLayout>

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

@ -102,7 +102,7 @@
app:layout_constraintStart_toEndOf="@+id/itemPublicRoomMembersCount"
tools:text="@sample/matrix.json/data/roomAlias" />
<im.vector.riotredesign.core.platform.ButtonStateView
<im.vector.riotx.core.platform.ButtonStateView
android:id="@+id/itemPublicRoomButtonState"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

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

@ -52,7 +52,7 @@
app:layout_constraintTop_toTopOf="parent"
tools:text="@sample/matrix.json/data/displayName" />
<im.vector.riotredesign.features.home.room.list.UnreadCounterBadgeView
<im.vector.riotx.features.home.room.list.UnreadCounterBadgeView
android:id="@+id/roomUnreadCounterBadgeView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

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

@ -33,7 +33,7 @@
android:textSize="14sp"
tools:text="@string/room_participants_header_direct_chats" />
<im.vector.riotredesign.features.home.room.list.UnreadCounterBadgeView
<im.vector.riotx.features.home.room.list.UnreadCounterBadgeView
android:id="@+id/roomCategoryUnreadCounterBadgeView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

4
vector/src/main/res/layout/item_room_invitation.xml
View File

@ -77,7 +77,7 @@
app:layout_constraintTop_toBottomOf="@+id/roomInvitationSubTitle"
tools:layout_marginStart="120dp" />
<im.vector.riotredesign.core.platform.ButtonStateView
<im.vector.riotx.core.platform.ButtonStateView
android:id="@+id/roomInvitationAccept"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -91,7 +91,7 @@
app:layout_constraintEnd_toEndOf="@+id/roomInvitationNameView"
app:layout_constraintTop_toBottomOf="@+id/roomLastEventBottomSpace" />
<im.vector.riotredesign.core.platform.ButtonStateView
<im.vector.riotx.core.platform.ButtonStateView
android:id="@+id/roomInvitationReject"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

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

@ -7,7 +7,7 @@
android:addStatesFromChildren="true"
android:background="?attr/selectableItemBackground">
<im.vector.riotredesign.core.platform.CheckableView
<im.vector.riotx.core.platform.CheckableView
android:id="@+id/messageSelectedBackground"
android:layout_width="0dp"
android:layout_height="0dp"

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

@ -7,7 +7,7 @@
android:addStatesFromChildren="true"
android:background="?attr/selectableItemBackground">
<im.vector.riotredesign.core.platform.CheckableView
<im.vector.riotx.core.platform.CheckableView
android:id="@+id/messageSelectedBackground"
android:layout_width="0dp"
android:layout_height="0dp"

16
vector/src/main/res/layout/item_timeline_event_bottom_reactions_stub.xml
View File

@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<im.vector.riotredesign.features.reactions.widget.ReactionButton
<im.vector.riotx.features.reactions.widget.ReactionButton
android:id="@+id/messageBottomReaction1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -16,7 +16,7 @@
tools:reaction_count="3"
tools:visibility="visible" />
<im.vector.riotredesign.features.reactions.widget.ReactionButton
<im.vector.riotx.features.reactions.widget.ReactionButton
android:id="@+id/messageBottomReaction2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -26,7 +26,7 @@
tools:reaction_count="10"
tools:visibility="visible" />
<im.vector.riotredesign.features.reactions.widget.ReactionButton
<im.vector.riotx.features.reactions.widget.ReactionButton
android:id="@+id/messageBottomReaction3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -35,7 +35,7 @@
tools:ignore="MissingConstraints"
tools:visibility="visible" />
<im.vector.riotredesign.features.reactions.widget.ReactionButton
<im.vector.riotx.features.reactions.widget.ReactionButton
android:id="@+id/messageBottomReaction4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -44,7 +44,7 @@
tools:ignore="MissingConstraints"
tools:visibility="visible" />
<im.vector.riotredesign.features.reactions.widget.ReactionButton
<im.vector.riotx.features.reactions.widget.ReactionButton
android:id="@+id/messageBottomReaction5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -54,7 +54,7 @@
tools:visibility="visible" />
<im.vector.riotredesign.features.reactions.widget.ReactionButton
<im.vector.riotx.features.reactions.widget.ReactionButton
android:id="@+id/messageBottomReaction6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -64,7 +64,7 @@
tools:visibility="visible" />
<im.vector.riotredesign.features.reactions.widget.ReactionButton
<im.vector.riotx.features.reactions.widget.ReactionButton
android:id="@+id/messageBottomReaction7"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -73,7 +73,7 @@
tools:ignore="MissingConstraints"
tools:visibility="visible" />
<im.vector.riotredesign.features.reactions.widget.ReactionButton
<im.vector.riotx.features.reactions.widget.ReactionButton
android:id="@+id/messageBottomReaction8"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

4
vector/src/main/res/layout/reaction_button.xml
View File

@ -16,7 +16,7 @@
<!--android:layout_height="match_parent"-->
<!--android:background="@drawable/rounded_rect_shape" />-->
<im.vector.riotredesign.features.reactions.widget.DotsView
<im.vector.riotx.features.reactions.widget.DotsView
android:id="@+id/dots"
android:layout_width="30dp"
android:layout_height="30dp"
@ -26,7 +26,7 @@
app:layout_constraintStart_toStartOf="@+id/reactionText"
app:layout_constraintTop_toTopOf="@+id/reactionText" />
<im.vector.riotredesign.features.reactions.widget.CircleView
<im.vector.riotx.features.reactions.widget.CircleView
android:id="@+id/circle"
android:layout_width="14dp"
android:layout_height="14dp"

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

@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<im.vector.riotredesign.features.home.room.list.UnreadCounterBadgeView
<im.vector.riotx.features.home.room.list.UnreadCounterBadgeView
android:id="@+id/actionUnreadCounterBadgeView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

2
vector/src/main/res/xml/vector_settings_flair.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<im.vector.riotredesign.core.preference.VectorPreferenceCategory
<im.vector.riotx.core.preference.VectorPreferenceCategory
android:key="SETTINGS_GROUPS_FLAIR_KEY"
android:title="@string/settings_flair" />

54
vector/src/main/res/xml/vector_settings_general.xml
View File

@ -4,20 +4,20 @@
xmlns:tools="http://schemas.android.com/tools">
<im.vector.riotredesign.core.preference.VectorPreferenceCategory
<im.vector.riotx.core.preference.VectorPreferenceCategory
android:key="SETTINGS_USER_SETTINGS_PREFERENCE_KEY"
android:title="@string/settings_user_settings">
<im.vector.riotredesign.core.preference.UserAvatarPreference
<im.vector.riotx.core.preference.UserAvatarPreference
android:key="SETTINGS_PROFILE_PICTURE_PREFERENCE_KEY"
android:title="@string/settings_profile_picture" />
<im.vector.riotredesign.core.preference.VectorEditTextPreference
<im.vector.riotx.core.preference.VectorEditTextPreference
android:key="SETTINGS_DISPLAY_NAME_PREFERENCE_KEY"
android:summary="@string/settings_display_name"
android:title="@string/settings_display_name" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:key="SETTINGS_CHANGE_PASSWORD_PREFERENCE_KEY"
android:summary="@string/password_hint"
android:title="@string/settings_password" />
@ -25,7 +25,7 @@
<!-- Email will be added here -->
<!-- Note: inputType does not work, it is set also in code, as well as iconTint -->
<im.vector.riotredesign.core.preference.VectorEditTextPreference
<im.vector.riotx.core.preference.VectorEditTextPreference
android:icon="@drawable/ic_add_black"
android:inputType="textEmailAddress"
android:key="ADD_EMAIL_PREFERENCE_KEY"
@ -36,80 +36,80 @@
<!-- Phone will be added here -->
<!-- Note: iconTint does not work, it is also done in code -->
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:icon="@drawable/ic_add_black"
android:key="ADD_PHONE_NUMBER_PREFERENCE_KEY"
android:order="200"
android:title="@string/settings_add_phone_number"
app:iconTint="?attr/vctr_settings_icon_tint_color" />
</im.vector.riotredesign.core.preference.VectorPreferenceCategory>
</im.vector.riotx.core.preference.VectorPreferenceCategory>
<im.vector.riotredesign.core.preference.VectorPreferenceDivider />
<im.vector.riotx.core.preference.VectorPreferenceDivider />
<im.vector.riotredesign.core.preference.VectorPreferenceCategory
<im.vector.riotx.core.preference.VectorPreferenceCategory
android:key="SETTINGS_CONTACT_PREFERENCE_KEYS"
android:title="@string/settings_contact">
<im.vector.riotredesign.core.preference.VectorSwitchPreference
<im.vector.riotx.core.preference.VectorSwitchPreference
android:key="CONTACT_BOOK_ACCESS_KEY"
android:title="@string/settings_contacts_app_permission" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:dialogTitle="@string/settings_select_country"
android:key="SETTINGS_CONTACTS_PHONEBOOK_COUNTRY_PREFERENCE_KEY"
android:title="@string/settings_contacts_phonebook_country" />
</im.vector.riotredesign.core.preference.VectorPreferenceCategory>
</im.vector.riotx.core.preference.VectorPreferenceCategory>
<im.vector.riotredesign.core.preference.VectorPreferenceDivider />
<im.vector.riotx.core.preference.VectorPreferenceDivider />
<im.vector.riotredesign.core.preference.VectorPreferenceCategory android:title="@string/settings_advanced">
<im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/settings_advanced">
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:key="SETTINGS_LOGGED_IN_PREFERENCE_KEY"
android:title="@string/settings_logged_in"
tools:summary="\@user:matrix.org" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:key="SETTINGS_HOME_SERVER_PREFERENCE_KEY"
android:title="@string/settings_home_server"
tools:summary="@string/default_hs_server_url" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:key="SETTINGS_IDENTITY_SERVER_PREFERENCE_KEY"
android:title="@string/settings_identity_server"
tools:summary="@string/default_identity_server_url" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:key="SETTINGS_CLEAR_MEDIA_CACHE_PREFERENCE_KEY"
android:title="@string/settings_clear_media_cache" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:key="SETTINGS_CLEAR_CACHE_PREFERENCE_KEY"
android:title="@string/settings_clear_cache" />
</im.vector.riotredesign.core.preference.VectorPreferenceCategory>
</im.vector.riotx.core.preference.VectorPreferenceCategory>
<im.vector.riotredesign.core.preference.VectorPreferenceDivider />
<im.vector.riotx.core.preference.VectorPreferenceDivider />
<im.vector.riotredesign.core.preference.VectorPreferenceCategory
<im.vector.riotx.core.preference.VectorPreferenceCategory
android:title="@string/action_sign_out">
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:key="SETTINGS_SIGN_OUT_KEY"
android:title="@string/action_sign_out" />
</im.vector.riotredesign.core.preference.VectorPreferenceCategory>
</im.vector.riotx.core.preference.VectorPreferenceCategory>
<im.vector.riotredesign.core.preference.VectorPreferenceCategory
<im.vector.riotx.core.preference.VectorPreferenceCategory
android:key="SETTINGS_DEACTIVATE_ACCOUNT_CATEGORY_KEY"
android:title="@string/settings_deactivate_account_section">
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:key="SETTINGS_DEACTIVATE_ACCOUNT_KEY"
android:title="@string/settings_deactivate_my_account" />
</im.vector.riotredesign.core.preference.VectorPreferenceCategory>
</im.vector.riotx.core.preference.VectorPreferenceCategory>
</androidx.preference.PreferenceScreen>

22
vector/src/main/res/xml/vector_settings_help_about.xml
View File

@ -2,50 +2,50 @@
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<im.vector.riotredesign.core.preference.VectorPreferenceCategory
<im.vector.riotx.core.preference.VectorPreferenceCategory
android:key="SETTINGS_OTHERS_PREFERENCE_KEY"
android:title="@string/settings_other">
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:key="APP_INFO_LINK_PREFERENCE_KEY"
android:summary="@string/settings_app_info_link_summary"
android:title="@string/settings_app_info_link_title" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:key="SETTINGS_VERSION_PREFERENCE_KEY"
android:title="@string/settings_version"
tools:summary="1.2.3" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:key="SETTINGS_SDK_VERSION_PREFERENCE_KEY"
android:title="@string/settings_sdk_version"
tools:summary="4.5.6" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:key="SETTINGS_OLM_VERSION_PREFERENCE_KEY"
android:title="@string/settings_olm_version"
tools:summary="7.8.9" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:key="SETTINGS_COPYRIGHT_PREFERENCE_KEY"
android:title="@string/settings_copyright" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:key="SETTINGS_APP_TERM_CONDITIONS_PREFERENCE_KEY"
android:title="@string/settings_app_term_conditions" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:key="SETTINGS_PRIVACY_POLICY_PREFERENCE_KEY"
android:title="@string/settings_privacy_policy" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:key="SETTINGS_THIRD_PARTY_NOTICES_PREFERENCE_KEY"
android:title="@string/settings_third_party_notices" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:key="SETTINGS_OTHER_THIRD_PARTY_NOTICES_PREFERENCE_KEY"
android:title="@string/settings_other_third_party_notices" />
</im.vector.riotredesign.core.preference.VectorPreferenceCategory>
</im.vector.riotx.core.preference.VectorPreferenceCategory>
</androidx.preference.PreferenceScreen>

4
vector/src/main/res/xml/vector_settings_ignored_users.xml
View File

@ -3,11 +3,11 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<im.vector.riotredesign.core.preference.VectorPreferenceCategory
<im.vector.riotx.core.preference.VectorPreferenceCategory
android:key="SETTINGS_IGNORED_USERS_PREFERENCE_KEY"
android:title="@string/settings_ignored_users" />
<im.vector.riotredesign.core.preference.VectorPreferenceDivider android:key="SETTINGS_IGNORE_USERS_DIVIDER_PREFERENCE_KEY" />
<im.vector.riotx.core.preference.VectorPreferenceDivider android:key="SETTINGS_IGNORE_USERS_DIVIDER_PREFERENCE_KEY" />
</androidx.preference.PreferenceScreen>

18
vector/src/main/res/xml/vector_settings_labs.xml
View File

@ -3,44 +3,44 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<!--<im.vector.riotredesign.core.preference.VectorPreferenceCategory-->
<!--<im.vector.riotx.core.preference.VectorPreferenceCategory-->
<!--android:key="SETTINGS_LABS_PREFERENCE_KEY"-->
<!--android:title="@string/room_settings_labs_pref_title">-->
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:focusable="false"
android:key="labs_warning"
android:summary="@string/room_settings_labs_warning_message" />
<!--<im.vector.riotredesign.core.preference.VectorSwitchPreference-->
<!--<im.vector.riotx.core.preference.VectorSwitchPreference-->
<!--android:key="SETTINGS_ROOM_SETTINGS_LABS_END_TO_END_PREFERENCE_KEY"-->
<!--android:title="@string/room_settings_labs_end_to_end" />-->
<!--<im.vector.riotredesign.core.preference.VectorPreference-->
<!--<im.vector.riotx.core.preference.VectorPreference-->
<!--android:focusable="false"-->
<!--android:key="SETTINGS_ROOM_SETTINGS_LABS_END_TO_END_IS_ACTIVE_PREFERENCE_KEY"-->
<!--android:title="@string/room_settings_labs_end_to_end_is_active" />-->
<!--<im.vector.riotredesign.core.preference.VectorSwitchPreference-->
<!--<im.vector.riotx.core.preference.VectorSwitchPreference-->
<!--android:key="SETTINGS_DATA_SAVE_MODE_PREFERENCE_KEY"-->
<!--android:summary="@string/settings_data_save_mode_summary"-->
<!--android:title="@string/settings_data_save_mode" />-->
<!--<im.vector.riotredesign.core.preference.VectorSwitchPreference-->
<!--<im.vector.riotx.core.preference.VectorSwitchPreference-->
<!--android:defaultValue="true"-->
<!--android:key="SETTINGS_USE_JITSI_CONF_PREFERENCE_KEY"-->
<!--android:title="@string/settings_labs_create_conference_with_jitsi" />-->
<!--<im.vector.riotredesign.core.preference.VectorSwitchPreference-->
<!--<im.vector.riotx.core.preference.VectorSwitchPreference-->
<!--android:key="SETTINGS_ENABLE_SEND_VOICE_FEATURE_PREFERENCE_KEY"-->
<!--android:summary="@string/settings_labs_enable_send_voice_summary"-->
<!--android:title="@string/settings_labs_enable_send_voice" />-->
<im.vector.riotredesign.core.preference.VectorSwitchPreference
<im.vector.riotx.core.preference.VectorSwitchPreference
android:key="SETTINGS_LABS_SHOW_HIDDEN_EVENTS_PREFERENCE_KEY"
android:defaultValue="false"
android:title="@string/settings_labs_show_hidden_events_in_timeline" />
<!--</im.vector.riotredesign.core.preference.VectorPreferenceCategory>-->
<!--</im.vector.riotx.core.preference.VectorPreferenceCategory>-->
</androidx.preference.PreferenceScreen>

28
vector/src/main/res/xml/vector_settings_notification_advanced_preferences.xml
View File

@ -1,63 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<im.vector.riotredesign.core.preference.VectorPreferenceCategory
<im.vector.riotx.core.preference.VectorPreferenceCategory
android:key="SETTINGS_NOTIFICATION_LEVEL"
android:persistent="false"
android:title="@string/settings_notification_by_event">
<im.vector.riotredesign.core.preference.BingRulePreference
<im.vector.riotx.core.preference.BingRulePreference
android:key="SETTINGS_CONTAINING_MY_DISPLAY_NAME_PREFERENCE_KEY_2"
android:title="@string/settings_containing_my_display_name" />
<im.vector.riotredesign.core.preference.BingRulePreference
<im.vector.riotx.core.preference.BingRulePreference
android:key="SETTINGS_CONTAINING_MY_USER_NAME_PREFERENCE_KEY_2"
android:title="@string/settings_containing_my_user_name" />
<im.vector.riotredesign.core.preference.BingRulePreference
<im.vector.riotx.core.preference.BingRulePreference
android:key="SETTINGS_MESSAGES_IN_ONE_TO_ONE_PREFERENCE_KEY_2"
android:title="@string/settings_messages_in_one_to_one" />
<im.vector.riotredesign.core.preference.BingRulePreference
<im.vector.riotx.core.preference.BingRulePreference
android:key="SETTINGS_MESSAGES_IN_GROUP_CHAT_PREFERENCE_KEY_2"
android:title="@string/settings_messages_in_group_chat" />
<im.vector.riotredesign.core.preference.BingRulePreference
<im.vector.riotx.core.preference.BingRulePreference
android:key="SETTINGS_INVITED_TO_ROOM_PREFERENCE_KEY_2"
android:title="@string/settings_invited_to_room" />
<im.vector.riotredesign.core.preference.BingRulePreference
<im.vector.riotx.core.preference.BingRulePreference
android:key="SETTINGS_CALL_INVITATIONS_PREFERENCE_KEY_2"
android:title="@string/settings_call_invitations" />
<im.vector.riotredesign.core.preference.BingRulePreference
<im.vector.riotx.core.preference.BingRulePreference
android:key="SETTINGS_MESSAGES_SENT_BY_BOT_PREFERENCE_KEY_2"
android:title="@string/settings_messages_sent_by_bot" />
</im.vector.riotredesign.core.preference.VectorPreferenceCategory>
</im.vector.riotx.core.preference.VectorPreferenceCategory>
<im.vector.riotredesign.core.preference.VectorPreferenceDivider />
<im.vector.riotx.core.preference.VectorPreferenceDivider />
<!-- For API < 26 -->
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:dialogTitle="@string/settings_notification_ringtone"
android:key="SETTINGS_NOTIFICATION_RINGTONE_SELECTION_PREFERENCE_KEY"
android:title="@string/settings_notification_ringtone" />
<!-- For API >= 26 -->
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:key="SETTINGS_SYSTEM_NOISY_NOTIFICATION_PREFERENCE_KEY"
android:persistent="false"
android:summary="@string/settings_system_preferences_summary"
android:title="@string/settings_noisy_notifications_preferences" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:key="SETTINGS_SYSTEM_SILENT_NOTIFICATION_PREFERENCE_KEY"
android:persistent="false"
android:summary="@string/settings_system_preferences_summary"
android:title="@string/settings_silent_notifications_preferences" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:key="SETTINGS_SYSTEM_CALL_NOTIFICATION_PREFERENCE_KEY"
android:persistent="false"
android:summary="@string/settings_system_preferences_summary"

46
vector/src/main/res/xml/vector_settings_notifications.xml
View File

@ -2,27 +2,27 @@
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<im.vector.riotredesign.core.preference.VectorPreferenceCategory
<im.vector.riotx.core.preference.VectorPreferenceCategory
android:key="SETTINGS_NOTIFICATIONS_KEY"
android:title="@string/settings_notifications">
<im.vector.riotredesign.core.preference.VectorSwitchPreference
<im.vector.riotx.core.preference.VectorSwitchPreference
android:defaultValue="true"
android:key="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"
android:title="@string/settings_enable_all_notif" />
<im.vector.riotredesign.core.preference.VectorSwitchPreference
<im.vector.riotx.core.preference.VectorSwitchPreference
android:defaultValue="true"
android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"
android:key="SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY"
android:title="@string/settings_enable_this_device" />
<!--<im.vector.riotredesign.core.preference.VectorSwitchPreference-->
<!--<im.vector.riotx.core.preference.VectorSwitchPreference-->
<!--android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"-->
<!--android:key="SETTINGS_TURN_SCREEN_ON_PREFERENCE_KEY"-->
<!--android:title="@string/settings_turn_screen_on" />-->
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:dependency="SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY"
android:enabled="false"
android:key="SETTINGS_NOTIFICATION_ADVANCED_PREFERENCE_KEY"
@ -32,62 +32,62 @@
android:visibility="gone"
app:fragment="im.vector.fragments.VectorSettingsNotificationsAdvancedFragment" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:key="SETTINGS_NOTIFICATION_TROUBLESHOOT_PREFERENCE_KEY"
android:title="@string/settings_notification_troubleshoot"
app:fragment="im.vector.riotredesign.features.settings.VectorSettingsNotificationsTroubleshootFragment" />
app:fragment="im.vector.riotx.features.settings.VectorSettingsNotificationsTroubleshootFragment" />
</im.vector.riotredesign.core.preference.VectorPreferenceCategory>
</im.vector.riotx.core.preference.VectorPreferenceCategory>
<!--im.vector.riotredesign.core.preference.VectorPreferenceCategory
<!--im.vector.riotx.core.preference.VectorPreferenceCategory
android:key="SETTINGS_BACKGROUND_SYNC_PREFERENCE_KEY"
android:title="@string/settings_background_sync">
<im.vector.riotredesign.core.preference.VectorSwitchPreference
<im.vector.riotx.core.preference.VectorSwitchPreference
android:defaultValue="true"
android:key="SETTINGS_START_ON_BOOT_PREFERENCE_KEY"
android:title="@string/settings_start_on_boot" />
<im.vector.riotredesign.core.preference.VectorSwitchPreference
<im.vector.riotx.core.preference.VectorSwitchPreference
android:key="SETTINGS_ENABLE_BACKGROUND_SYNC_PREFERENCE_KEY"
android:title="@string/settings_enable_background_sync" />
<im.vector.riotredesign.core.preference.VectorEditTextPreference
<im.vector.riotx.core.preference.VectorEditTextPreference
android:dependency="SETTINGS_ENABLE_BACKGROUND_SYNC_PREFERENCE_KEY"
android:key="SETTINGS_SET_SYNC_TIMEOUT_PREFERENCE_KEY"
android:numeric="integer"
android:title="@string/settings_set_sync_timeout" />
<im.vector.riotredesign.core.preference.VectorEditTextPreference
<im.vector.riotx.core.preference.VectorEditTextPreference
android:dependency="SETTINGS_ENABLE_BACKGROUND_SYNC_PREFERENCE_KEY"
android:key="SETTINGS_SET_SYNC_DELAY_PREFERENCE_KEY"
android:numeric="integer"
android:title="@string/settings_set_sync_delay" />
</im.vector.riotredesign.core.preference.VectorPreferenceCategory>
</im.vector.riotx.core.preference.VectorPreferenceCategory>
<im.vector.riotredesign.core.preference.VectorPreferenceDivider android:key="SETTINGS_BACKGROUND_SYNC_DIVIDER_PREFERENCE_KEY" />
<im.vector.riotx.core.preference.VectorPreferenceDivider android:key="SETTINGS_BACKGROUND_SYNC_DIVIDER_PREFERENCE_KEY" />
<im.vector.riotredesign.core.preference.VectorPreferenceCategory
<im.vector.riotx.core.preference.VectorPreferenceCategory
android:key="SETTINGS_NOTIFICATIONS_TARGETS_PREFERENCE_KEY"
android:title="@string/settings_notifications_targets" />
<im.vector.riotredesign.core.preference.VectorPreferenceDivider android:key="SETTINGS_NOTIFICATIONS_TARGET_DIVIDER_PREFERENCE_KEY" /-->
<im.vector.riotx.core.preference.VectorPreferenceDivider android:key="SETTINGS_NOTIFICATIONS_TARGET_DIVIDER_PREFERENCE_KEY" /-->
<im.vector.riotredesign.core.preference.VectorPreferenceCategory android:title="@string/settings_expert">
<im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/settings_expert">
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:layout_width="match_parent"
android:persistent="false"
android:title="@string/settings_notifications_targets"
app:fragment="im.vector.riotredesign.features.settings.push.PushGatewaysFragment" />
app:fragment="im.vector.riotx.features.settings.push.PushGatewaysFragment" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:layout_width="match_parent"
android:persistent="false"
android:title="@string/settings_push_rules"
app:fragment="im.vector.riotredesign.features.settings.push.PushRulesFragment" />
app:fragment="im.vector.riotx.features.settings.push.PushRulesFragment" />
</im.vector.riotredesign.core.preference.VectorPreferenceCategory>
</im.vector.riotx.core.preference.VectorPreferenceCategory>
</androidx.preference.PreferenceScreen>

60
vector/src/main/res/xml/vector_settings_preferences.xml
View File

@ -3,16 +3,16 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<im.vector.riotredesign.core.preference.VectorPreferenceCategory
<im.vector.riotx.core.preference.VectorPreferenceCategory
android:key="SETTINGS_USER_INTERFACE_KEY"
android:title="@string/settings_user_interface">
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:dialogTitle="@string/settings_select_language"
android:key="SETTINGS_INTERFACE_LANGUAGE_PREFERENCE_KEY"
android:title="@string/settings_interface_language" />
<im.vector.riotredesign.core.preference.VectorListPreference
<im.vector.riotx.core.preference.VectorListPreference
android:defaultValue="light"
android:entries="@array/theme_entries"
android:entryValues="@array/theme_values"
@ -21,65 +21,65 @@
android:title="@string/settings_theme"
app:iconSpaceReserved="false" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:dialogTitle="@string/font_size"
android:key="SETTINGS_INTERFACE_TEXT_SIZE_KEY"
android:title="@string/font_size" />
<im.vector.riotredesign.core.preference.VectorSwitchPreference
<im.vector.riotx.core.preference.VectorSwitchPreference
android:defaultValue="true"
android:key="SETTINGS_SHOW_URL_PREVIEW_KEY"
android:summary="@string/settings_inline_url_preview_summary"
android:title="@string/settings_inline_url_preview" />
<im.vector.riotredesign.core.preference.VectorSwitchPreference
<im.vector.riotx.core.preference.VectorSwitchPreference
android:defaultValue="true"
android:key="SETTINGS_SEND_TYPING_NOTIF_KEY"
android:summary="@string/settings_send_typing_notifs_summary"
android:title="@string/settings_send_typing_notifs" />
<im.vector.riotredesign.core.preference.VectorSwitchPreference
<im.vector.riotx.core.preference.VectorSwitchPreference
android:defaultValue="true"
android:key="SETTINGS_ENABLE_MARKDOWN_KEY"
android:summary="@string/settings_send_markdown_summary"
android:title="@string/settings_send_markdown" />
<im.vector.riotredesign.core.preference.VectorSwitchPreference
<im.vector.riotx.core.preference.VectorSwitchPreference
android:key="SETTINGS_ALWAYS_SHOW_TIMESTAMPS_KEY"
android:title="@string/settings_always_show_timestamps" />
<im.vector.riotredesign.core.preference.VectorSwitchPreference
<im.vector.riotx.core.preference.VectorSwitchPreference
android:key="SETTINGS_12_24_TIMESTAMPS_KEY"
android:title="@string/settings_12_24_timestamps" />
<im.vector.riotredesign.core.preference.VectorSwitchPreference
<im.vector.riotx.core.preference.VectorSwitchPreference
android:defaultValue="true"
android:key="SETTINGS_SHOW_READ_RECEIPTS_KEY"
android:summary="@string/settings_show_read_receipts_summary"
android:title="@string/settings_show_read_receipts" />
<im.vector.riotredesign.core.preference.VectorSwitchPreference
<im.vector.riotx.core.preference.VectorSwitchPreference
android:defaultValue="true"
android:key="SETTINGS_SHOW_JOIN_LEAVE_MESSAGES_KEY"
android:summary="@string/settings_show_join_leave_messages_summary"
android:title="@string/settings_show_join_leave_messages" />
<im.vector.riotredesign.core.preference.VectorSwitchPreference
<im.vector.riotx.core.preference.VectorSwitchPreference
android:defaultValue="true"
android:key="SETTINGS_SHOW_AVATAR_DISPLAY_NAME_CHANGES_MESSAGES_KEY"
android:summary="@string/settings_show_avatar_display_name_changes_messages_summary"
android:title="@string/settings_show_avatar_display_name_changes_messages" />
<im.vector.riotredesign.core.preference.VectorSwitchPreference
<im.vector.riotx.core.preference.VectorSwitchPreference
android:key="SETTINGS_VIBRATE_ON_MENTION_KEY"
android:title="@string/settings_vibrate_on_mention" />
<im.vector.riotredesign.core.preference.VectorSwitchPreference
<im.vector.riotx.core.preference.VectorSwitchPreference
android:key="SETTINGS_SEND_MESSAGE_WITH_ENTER"
android:summary="@string/settings_send_message_with_enter_summary"
android:title="@string/settings_send_message_with_enter" />
<im.vector.riotredesign.core.preference.VectorListPreference
<im.vector.riotx.core.preference.VectorListPreference
android:defaultValue="always"
android:entries="@array/show_info_area_entries"
android:entryValues="@array/show_info_area_values"
@ -87,50 +87,50 @@
android:summary="%s"
android:title="@string/settings_info_area_show" />
</im.vector.riotredesign.core.preference.VectorPreferenceCategory>
</im.vector.riotx.core.preference.VectorPreferenceCategory>
<im.vector.riotredesign.core.preference.VectorPreferenceDivider />
<im.vector.riotx.core.preference.VectorPreferenceDivider />
<im.vector.riotredesign.core.preference.VectorPreferenceCategory
<im.vector.riotx.core.preference.VectorPreferenceCategory
android:key="SETTINGS_HOME_DISPLAY_KEY"
android:title="@string/settings_home_display">
<im.vector.riotredesign.core.preference.VectorSwitchPreference
<im.vector.riotx.core.preference.VectorSwitchPreference
android:defaultValue="true"
android:key="SETTINGS_PIN_MISSED_NOTIFICATIONS_PREFERENCE_KEY"
android:title="@string/settings_pin_missed_notifications" />
<im.vector.riotredesign.core.preference.VectorSwitchPreference
<im.vector.riotx.core.preference.VectorSwitchPreference
android:defaultValue="true"
android:key="SETTINGS_PIN_UNREAD_MESSAGES_PREFERENCE_KEY"
android:title="@string/settings_pin_unread_messages" />
</im.vector.riotredesign.core.preference.VectorPreferenceCategory>
</im.vector.riotx.core.preference.VectorPreferenceCategory>
<im.vector.riotredesign.core.preference.VectorPreferenceDivider />
<im.vector.riotx.core.preference.VectorPreferenceDivider />
<im.vector.riotredesign.core.preference.VectorPreferenceCategory android:title="@string/settings_media">
<im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/settings_media">
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:key="SETTINGS_MEDIA_SAVING_PERIOD_KEY"
android:title="@string/settings_keep_media" />
<im.vector.riotredesign.core.preference.VectorSwitchPreference
<im.vector.riotx.core.preference.VectorSwitchPreference
android:key="SETTINGS_USE_NATIVE_CAMERA_PREFERENCE_KEY"
android:summary="@string/settings_labs_native_camera_summary"
android:title="@string/settings_labs_native_camera" />
<im.vector.riotredesign.core.preference.VectorSwitchPreference
<im.vector.riotx.core.preference.VectorSwitchPreference
android:defaultValue="true"
android:key="SETTINGS_PLAY_SHUTTER_SOUND_KEY"
android:title="@string/settings_play_shutter_sound" />
<im.vector.riotredesign.core.preference.VectorSwitchPreference
<im.vector.riotx.core.preference.VectorSwitchPreference
android:key="SETTINGS_PREVIEW_MEDIA_BEFORE_SENDING_KEY"
android:title="@string/settings_preview_media_before_sending" />
<im.vector.riotredesign.core.preference.VectorListPreference
<im.vector.riotx.core.preference.VectorListPreference
android:defaultValue="0"
android:entries="@array/compression_levels"
android:entryValues="@array/compression_level_values"
@ -138,7 +138,7 @@
android:summary="%s"
android:title="@string/settings_default_compression" />
<im.vector.riotredesign.core.preference.VectorListPreference
<im.vector.riotx.core.preference.VectorListPreference
android:defaultValue="0"
android:entries="@array/media_sources"
android:entryValues="@array/media_source_values"
@ -146,6 +146,6 @@
android:summary="%s"
android:title="@string/settings_default_media_source" />
</im.vector.riotredesign.core.preference.VectorPreferenceCategory>
</im.vector.riotx.core.preference.VectorPreferenceCategory>
</androidx.preference.PreferenceScreen>

36
vector/src/main/res/xml/vector_settings_root.xml
View File

@ -2,62 +2,62 @@
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:layout_width="match_parent"
android:icon="@drawable/ic_settings_root_general"
android:title="@string/settings_general_title"
app:fragment="im.vector.riotredesign.features.settings.VectorSettingsGeneralFragment" />
app:fragment="im.vector.riotx.features.settings.VectorSettingsGeneralFragment" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:layout_width="match_parent"
android:enabled="@bool/false_not_implemented"
android:icon="@drawable/ic_settings_root_flair"
android:title="@string/settings_flair"
app:fragment="im.vector.riotredesign.features.settings.VectorSettingsFlairFragment" />
app:fragment="im.vector.riotx.features.settings.VectorSettingsFlairFragment" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:layout_width="match_parent"
android:icon="@drawable/ic_settings_root_notification"
android:key="SETTINGS_NOTIFICATIONS_KEY"
android:title="@string/settings_notifications"
app:fragment="im.vector.riotredesign.features.settings.VectorSettingsNotificationPreferenceFragment" />
app:fragment="im.vector.riotx.features.settings.VectorSettingsNotificationPreferenceFragment" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:layout_width="match_parent"
android:icon="@drawable/ic_settings_root_preferences"
android:title="@string/settings_preferences"
app:fragment="im.vector.riotredesign.features.settings.VectorSettingsPreferencesFragment" />
app:fragment="im.vector.riotx.features.settings.VectorSettingsPreferencesFragment" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:layout_width="match_parent"
android:enabled="@bool/false_not_implemented"
android:icon="@drawable/ic_settings_root_call"
android:title="@string/preference_voice_and_video"
app:fragment="im.vector.riotredesign.features.settings.VectorSettingsVoiceVideoFragment" />
app:fragment="im.vector.riotx.features.settings.VectorSettingsVoiceVideoFragment" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:layout_width="match_parent"
android:enabled="@bool/false_not_implemented"
android:icon="@drawable/ic_settings_root_ignored_users"
android:title="@string/settings_ignored_users"
app:fragment="im.vector.riotredesign.features.settings.VectorSettingsIgnoredUsersFragment" />
app:fragment="im.vector.riotx.features.settings.VectorSettingsIgnoredUsersFragment" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:layout_width="match_parent"
android:icon="@drawable/ic_settings_root_security_privacy"
android:title="@string/settings_security_and_privacy"
app:fragment="im.vector.riotredesign.features.settings.VectorSettingsSecurityPrivacyFragment" />
app:fragment="im.vector.riotx.features.settings.VectorSettingsSecurityPrivacyFragment" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:layout_width="match_parent"
android:icon="@drawable/ic_settings_root_labs"
android:title="@string/room_settings_labs_pref_title"
app:fragment="im.vector.riotredesign.features.settings.VectorSettingsLabsFragment" />
app:fragment="im.vector.riotx.features.settings.VectorSettingsLabsFragment" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:layout_width="match_parent"
android:icon="@drawable/ic_settings_root_help_about"
android:title="@string/preference_root_help_about"
app:fragment="im.vector.riotredesign.features.settings.VectorSettingsHelpAboutFragment" />
app:fragment="im.vector.riotx.features.settings.VectorSettingsHelpAboutFragment" />
</androidx.preference.PreferenceScreen>

38
vector/src/main/res/xml/vector_settings_security_privacy.xml
View File

@ -2,74 +2,74 @@
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<!-- ************ Cryptography section ************ -->
<im.vector.riotredesign.core.preference.VectorPreferenceCategory
<im.vector.riotx.core.preference.VectorPreferenceCategory
android:key="SETTINGS_CRYPTOGRAPHY_PREFERENCE_KEY"
android:title="@string/settings_cryptography">
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:key="SETTINGS_ENCRYPTION_INFORMATION_DEVICE_NAME_PREFERENCE_KEY"
android:title="@string/encryption_information_device_name" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:key="SETTINGS_ENCRYPTION_INFORMATION_DEVICE_ID_PREFERENCE_KEY"
android:title="@string/encryption_information_device_id" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:key="SETTINGS_ENCRYPTION_INFORMATION_DEVICE_KEY_PREFERENCE_KEY"
android:title="@string/encryption_information_device_key" />
<im.vector.riotredesign.core.preference.VectorSwitchPreference
<im.vector.riotx.core.preference.VectorSwitchPreference
android:key="SETTINGS_ENCRYPTION_NEVER_SENT_TO_PREFERENCE_KEY"
android:summary="@string/encryption_never_send_to_unverified_devices_summary"
android:title="@string/encryption_never_send_to_unverified_devices_title" />
</im.vector.riotredesign.core.preference.VectorPreferenceCategory>
</im.vector.riotx.core.preference.VectorPreferenceCategory>
<im.vector.riotredesign.core.preference.VectorPreferenceDivider android:key="SETTINGS_CRYPTOGRAPHY_DIVIDER_PREFERENCE_KEY" />
<im.vector.riotx.core.preference.VectorPreferenceDivider android:key="SETTINGS_CRYPTOGRAPHY_DIVIDER_PREFERENCE_KEY" />
<im.vector.riotredesign.core.preference.VectorPreferenceCategory
<im.vector.riotx.core.preference.VectorPreferenceCategory
android:key="SETTINGS_CRYPTOGRAPHY_MANAGE_PREFERENCE_KEY"
android:title="@string/settings_cryptography_manage_keys">
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:key="SETTINGS_SECURE_MESSAGE_RECOVERY_PREFERENCE_KEY"
android:persistent="false"
android:summary="@string/encryption_settings_manage_message_recovery_summary"
android:title="@string/encryption_message_recovery" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:key="SETTINGS_ENCRYPTION_EXPORT_E2E_ROOM_KEYS_PREFERENCE_KEY"
android:summary="@string/encryption_export_room_keys_summary"
android:title="@string/encryption_export_e2e_room_keys" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:key="SETTINGS_ENCRYPTION_IMPORT_E2E_ROOM_KEYS_PREFERENCE_KEY"
android:summary="@string/encryption_import_room_keys_summary"
android:title="@string/encryption_import_e2e_room_keys" />
</im.vector.riotredesign.core.preference.VectorPreferenceCategory>
</im.vector.riotx.core.preference.VectorPreferenceCategory>
<im.vector.riotredesign.core.preference.VectorPreferenceDivider android:key="SETTINGS_CRYPTOGRAPHY_MANAGE_DIVIDER_PREFERENCE_KEY" />
<im.vector.riotx.core.preference.VectorPreferenceDivider android:key="SETTINGS_CRYPTOGRAPHY_MANAGE_DIVIDER_PREFERENCE_KEY" />
<!-- devices list: device ids + device names -->
<im.vector.riotredesign.core.preference.VectorPreferenceCategory
<im.vector.riotx.core.preference.VectorPreferenceCategory
android:key="SETTINGS_DEVICES_LIST_PREFERENCE_KEY"
android:title="@string/settings_devices_list" />
<im.vector.riotredesign.core.preference.VectorPreferenceDivider android:key="SETTINGS_DEVICES_DIVIDER_PREFERENCE_KEY" />
<im.vector.riotx.core.preference.VectorPreferenceDivider android:key="SETTINGS_DEVICES_DIVIDER_PREFERENCE_KEY" />
<im.vector.riotredesign.core.preference.VectorPreferenceCategory
<im.vector.riotx.core.preference.VectorPreferenceCategory
android:key="SETTINGS_ANALYTICS_PREFERENCE_KEY"
android:title="@string/settings_analytics">
<im.vector.riotredesign.core.preference.VectorSwitchPreference
<im.vector.riotx.core.preference.VectorSwitchPreference
android:defaultValue="false"
android:key="SETTINGS_USE_ANALYTICS_KEY"
android:summary="@string/settings_opt_in_of_analytics_summary"
android:title="@string/settings_opt_in_of_analytics" />
<im.vector.riotredesign.core.preference.VectorSwitchPreference
<im.vector.riotx.core.preference.VectorSwitchPreference
android:key="SETTINGS_USE_RAGE_SHAKE_KEY"
android:title="@string/send_bug_report_rage_shake" />
</im.vector.riotredesign.core.preference.VectorPreferenceCategory>
</im.vector.riotx.core.preference.VectorPreferenceCategory>
</androidx.preference.PreferenceScreen>

8
vector/src/main/res/xml/vector_settings_voice_video.xml
View File

@ -3,19 +3,19 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<im.vector.riotredesign.core.preference.VectorPreferenceCategory android:title="@string/settings_call_category">
<im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/settings_call_category">
<im.vector.riotredesign.core.preference.VectorSwitchPreference
<im.vector.riotx.core.preference.VectorSwitchPreference
android:defaultValue="true"
android:disableDependentsState="true"
android:key="SETTINGS_CALL_RINGTONE_USE_RIOT_PREFERENCE_KEY"
android:title="@string/settings_call_ringtone_use_riot_ringtone" />
<im.vector.riotredesign.core.preference.VectorPreference
<im.vector.riotx.core.preference.VectorPreference
android:dependency="SETTINGS_CALL_RINGTONE_USE_RIOT_PREFERENCE_KEY"
android:key="SETTINGS_CALL_RINGTONE_URI_PREFERENCE_KEY"
android:title="@string/settings_call_ringtone_title" />
</im.vector.riotredesign.core.preference.VectorPreferenceCategory>
</im.vector.riotx.core.preference.VectorPreferenceCategory>
</androidx.preference.PreferenceScreen>