jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename package `im.vector.riotx` to `im.vector.app` (other manual changes)

This commit is contained in:
Benoit Marty 2020-08-03 18:31:41 +02:00 committed by Benoit Marty
parent 05b849de13
commit 8931fd314d
26 changed files with 81 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/check/forbidden_strings_in_resources.txt
View File

@ -73,10 +73,10 @@ layout_constraintLeft_
### Use Preference from androidx library (androidx.preference.PreferenceScreen) ### Use Preference from androidx library (androidx.preference.PreferenceScreen)
<PreferenceScreen <PreferenceScreen
### Use im.vector.riotx.core.preference.VectorSwitchPreference to support multiline of the title ### Use im.vector.app.core.preference.VectorSwitchPreference to support multiline of the title
<SwitchPreference <SwitchPreference
### Use im.vector.riotx.core.preference.VectorPreference to support multiline of the title ### Use im.vector.app.core.preference.VectorPreference to support multiline of the title
<Preference\n <Preference\n
### Will crash on API < 21. Use ?colorAccent instead ### Will crash on API < 21. Use ?colorAccent instead

2
tools/debug_alter_scalar_token.sh
View File

@ -1,3 +1,3 @@
#!/usr/bin/env bash #!/usr/bin/env bash
adb shell am broadcast -a im.vector.riotx.DEBUG_ACTION_ALTER_SCALAR_TOKEN adb shell am broadcast -a im.vector.app.DEBUG_ACTION_ALTER_SCALAR_TOKEN

2
tools/debug_dump_filesystem.sh
View File

@ -1,3 +1,3 @@
#!/usr/bin/env bash #!/usr/bin/env bash
adb shell am broadcast -a im.vector.riotx.DEBUG_ACTION_DUMP_FILESYSTEM adb shell am broadcast -a im.vector.app.DEBUG_ACTION_DUMP_FILESYSTEM

2
tools/debug_dump_prefs.sh
View File

@ -1,3 +1,3 @@
#!/usr/bin/env bash #!/usr/bin/env bash
adb shell am broadcast -a im.vector.riotx.DEBUG_ACTION_DUMP_PREFERENCES adb shell am broadcast -a im.vector.app.DEBUG_ACTION_DUMP_PREFERENCES

2
tools/templates/RiotXFeature/root/src/app_package/Action.kt.ftl
View File

@ -1,5 +1,5 @@
package ${escapeKotlinIdentifiers(packageName)} package ${escapeKotlinIdentifiers(packageName)}
import im.vector.riotx.core.platform.VectorViewModelAction import im.vector.app.core.platform.VectorViewModelAction
sealed class ${actionClass}: VectorViewModelAction sealed class ${actionClass}: VectorViewModelAction

8
tools/templates/RiotXFeature/root/src/app_package/Activity.kt.ftl
View File

@ -3,10 +3,10 @@ package ${escapeKotlinIdentifiers(packageName)}
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import androidx.appcompat.widget.Toolbar import androidx.appcompat.widget.Toolbar
import im.vector.riotx.R import im.vector.app.R
import im.vector.riotx.core.extensions.addFragment import im.vector.app.core.extensions.addFragment
import im.vector.riotx.core.platform.ToolbarConfigurable import im.vector.app.core.platform.ToolbarConfigurable
import im.vector.riotx.core.platform.VectorBaseActivity import im.vector.app.core.platform.VectorBaseActivity
//TODO: add this activity to manifest //TODO: add this activity to manifest
class ${activityClass} : VectorBaseActivity(), ToolbarConfigurable { class ${activityClass} : VectorBaseActivity(), ToolbarConfigurable {

4
tools/templates/RiotXFeature/root/src/app_package/Fragment.kt.ftl
View File

@ -9,8 +9,8 @@ import com.airbnb.mvrx.args
import android.view.View import android.view.View
import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.fragmentViewModel
import com.airbnb.mvrx.withState import com.airbnb.mvrx.withState
import im.vector.riotx.R import im.vector.app.R
import im.vector.riotx.core.platform.VectorBaseFragment import im.vector.app.core.platform.VectorBaseFragment
import javax.inject.Inject import javax.inject.Inject
<#if createFragmentArgs> <#if createFragmentArgs>

2
tools/templates/RiotXFeature/root/src/app_package/ViewEvents.kt.ftl
View File

@ -1,5 +1,5 @@
package ${escapeKotlinIdentifiers(packageName)} package ${escapeKotlinIdentifiers(packageName)}
import im.vector.riotx.core.platform.VectorViewEvents import im.vector.app.core.platform.VectorViewEvents
sealed class ${viewEventsClass} : VectorViewEvents sealed class ${viewEventsClass} : VectorViewEvents

6
tools/templates/RiotXFeature/root/src/app_package/ViewModel.kt.ftl
View File

@ -6,12 +6,12 @@ import com.airbnb.mvrx.MvRxViewModelFactory
import com.airbnb.mvrx.ViewModelContext import com.airbnb.mvrx.ViewModelContext
import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.Assisted
import com.squareup.inject.assisted.AssistedInject import com.squareup.inject.assisted.AssistedInject
import im.vector.riotx.core.extensions.exhaustive import im.vector.app.core.extensions.exhaustive
import im.vector.riotx.core.platform.VectorViewModel import im.vector.app.core.platform.VectorViewModel
<#if createViewEvents> <#if createViewEvents>
<#else> <#else>
import im.vector.riotx.core.platform.EmptyViewEvents import im.vector.app.core.platform.EmptyViewEvents
</#if> </#if>
class ${viewModelClass} @AssistedInject constructor(@Assisted initialState: ${viewStateClass}) class ${viewModelClass} @AssistedInject constructor(@Assisted initialState: ${viewStateClass})

4
tools/tests/app_standby_off.sh
View File

@ -6,5 +6,5 @@ echo "Standby OFF"
echo "adb shell dumpsys battery reset" echo "adb shell dumpsys battery reset"
adb shell dumpsys battery reset adb shell dumpsys battery reset
echo "adb shell am set-inactive im.vector.riotx false" echo "adb shell am set-inactive im.vector.app false"
adb shell am set-inactive im.vector.riotx false adb shell am set-inactive im.vector.app false

4
tools/tests/app_standby_on.sh
View File

@ -6,5 +6,5 @@ echo "Standby ON"
echo "adb shell dumpsys battery unplug" echo "adb shell dumpsys battery unplug"
adb shell dumpsys battery unplug adb shell dumpsys battery unplug
echo "adb shell am set-inactive im.vector.riotx true" echo "adb shell am set-inactive im.vector.app true"
adb shell am set-inactive im.vector.riotx true adb shell am set-inactive im.vector.app true

2
tools/workmanager/dumpsys_debug.sh
View File

@ -1,3 +1,3 @@
#!/usr/bin/env bash #!/usr/bin/env bash
adb shell dumpsys jobscheduler im.vector.riotx.debug adb shell dumpsys jobscheduler im.vector.app.debug

2
tools/workmanager/dumpsys_release.sh
View File

@ -1,3 +1,3 @@
#!/usr/bin/env bash #!/usr/bin/env bash
adb shell dumpsys jobscheduler im.vector.riotx adb shell dumpsys jobscheduler im.vector.app

2
vector/src/main/java/im/vector/app/core/glide/ElementToDecryptOption.kt
View File

@ -19,7 +19,7 @@ package im.vector.app.core.glide
import com.bumptech.glide.load.Option import com.bumptech.glide.load.Option
import im.vector.matrix.android.internal.crypto.attachments.ElementToDecrypt import im.vector.matrix.android.internal.crypto.attachments.ElementToDecrypt
const val ElementToDecryptOptionKey = "im.vector.riotx.core.glide.ElementToDecrypt" const val ElementToDecryptOptionKey = "im.vector.app.core.glide.ElementToDecrypt"
val ELEMENT_TO_DECRYPT = Option.memory( val ELEMENT_TO_DECRYPT = Option.memory(
ElementToDecryptOptionKey, ElementToDecrypt("", "", "")) ElementToDecryptOptionKey, ElementToDecrypt("", "", ""))

16
vector/src/main/java/im/vector/app/core/services/CallService.kt
View File

@ -260,14 +260,14 @@ class CallService : VectorService(), WiredHeadsetStateReceiver.HeadsetEventListe
companion object { companion object {
private const val NOTIFICATION_ID = 6480 private const val NOTIFICATION_ID = 6480
private const val ACTION_INCOMING_RINGING_CALL = "im.vector.riotx.core.services.CallService.ACTION_INCOMING_RINGING_CALL" private const val ACTION_INCOMING_RINGING_CALL = "im.vector.app.core.services.CallService.ACTION_INCOMING_RINGING_CALL"
private const val ACTION_OUTGOING_RINGING_CALL = "im.vector.riotx.core.services.CallService.ACTION_OUTGOING_RINGING_CALL" private const val ACTION_OUTGOING_RINGING_CALL = "im.vector.app.core.services.CallService.ACTION_OUTGOING_RINGING_CALL"
private const val ACTION_CALL_CONNECTING = "im.vector.riotx.core.services.CallService.ACTION_CALL_CONNECTING" private const val ACTION_CALL_CONNECTING = "im.vector.app.core.services.CallService.ACTION_CALL_CONNECTING"
private const val ACTION_ONGOING_CALL = "im.vector.riotx.core.services.CallService.ACTION_ONGOING_CALL" private const val ACTION_ONGOING_CALL = "im.vector.app.core.services.CallService.ACTION_ONGOING_CALL"
private const val ACTION_ONGOING_CALL_BG = "im.vector.riotx.core.services.CallService.ACTION_ONGOING_CALL_BG" private const val ACTION_ONGOING_CALL_BG = "im.vector.app.core.services.CallService.ACTION_ONGOING_CALL_BG"
private const val ACTION_NO_ACTIVE_CALL = "im.vector.riotx.core.services.CallService.NO_ACTIVE_CALL" private const val ACTION_NO_ACTIVE_CALL = "im.vector.app.core.services.CallService.NO_ACTIVE_CALL"
// private const val ACTION_ACTIVITY_VISIBLE = "im.vector.riotx.core.services.CallService.ACTION_ACTIVITY_VISIBLE" // private const val ACTION_ACTIVITY_VISIBLE = "im.vector.app.core.services.CallService.ACTION_ACTIVITY_VISIBLE"
// private const val ACTION_STOP_RINGING = "im.vector.riotx.core.services.CallService.ACTION_STOP_RINGING" // private const val ACTION_STOP_RINGING = "im.vector.app.core.services.CallService.ACTION_STOP_RINGING"
private const val EXTRA_IS_VIDEO = "EXTRA_IS_VIDEO" private const val EXTRA_IS_VIDEO = "EXTRA_IS_VIDEO"
private const val EXTRA_ROOM_NAME = "EXTRA_ROOM_NAME" private const val EXTRA_ROOM_NAME = "EXTRA_ROOM_NAME"

4
vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt
View File

@ -54,10 +54,10 @@ class VectorFileLogger @Inject constructor(val context: Context, private val vec
} }
} }
private val sLogger = Logger.getLogger("im.vector.riotx") private val sLogger = Logger.getLogger("im.vector.app")
private var sFileHandler: FileHandler? = null private var sFileHandler: FileHandler? = null
private var sCacheDirectory: File? = null private var sCacheDirectory: File? = null
private var sFileName = "riotxlogs" private var sFileName = "elementLogs"
private val prioPrefixes = mapOf( private val prioPrefixes = mapOf(
Log.VERBOSE to "V/ ", Log.VERBOSE to "V/ ",

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

@ -8,7 +8,7 @@
<androidx.fragment.app.FragmentContainerView <androidx.fragment.app.FragmentContainerView
android:id="@+id/emojiPickerWholeListFragmentContainer" android:id="@+id/emojiPickerWholeListFragmentContainer"
android:name="im.vector.riotx.features.reactions.EmojiChooserFragment" android:name="im.vector.app.features.reactions.EmojiChooserFragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" app:layout_behavior="@string/appbar_scrolling_view_behavior"
@ -16,7 +16,7 @@
<androidx.fragment.app.FragmentContainerView <androidx.fragment.app.FragmentContainerView
android:id="@+id/emojiPickerFilteredListFragmentContainer" android:id="@+id/emojiPickerFilteredListFragmentContainer"
android:name="im.vector.riotx.features.reactions.EmojiSearchResultFragment" android:name="im.vector.app.features.reactions.EmojiSearchResultFragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="gone" android:visibility="gone"

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

@ -160,7 +160,7 @@
tools:layout_height="40dp"> tools:layout_height="40dp">
<!-- ReactionButtons will be added here in the code --> <!-- ReactionButtons will be added here in the code -->
<!--im.vector.riotx.features.reactions.widget.ReactionButton <!--im.vector.app.features.reactions.widget.ReactionButton
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" /--> android:layout_height="wrap_content" /-->

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

@ -99,7 +99,7 @@
tools:layout_height="40dp"> tools:layout_height="40dp">
<!-- ReactionButtons will be added here in the code --> <!-- ReactionButtons will be added here in the code -->
<!--im.vector.riotx.features.reactions.widget.ReactionButton <!--im.vector.app.features.reactions.widget.ReactionButton
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" /--> android:layout_height="wrap_content" /-->

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

@ -57,12 +57,12 @@
<im.vector.app.core.preference.VectorPreference <im.vector.app.core.preference.VectorPreference
android:persistent="false" android:persistent="false"
android:title="@string/settings_notifications_targets" android:title="@string/settings_notifications_targets"
app:fragment="im.vector.riotx.features.settings.push.PushGatewaysFragment" /> app:fragment="im.vector.app.features.settings.push.PushGatewaysFragment" />
<im.vector.app.core.preference.VectorPreference <im.vector.app.core.preference.VectorPreference
android:persistent="false" android:persistent="false"
android:title="@string/settings_push_rules" android:title="@string/settings_push_rules"
app:fragment="im.vector.riotx.features.settings.push.PushRulesFragment" /> app:fragment="im.vector.app.features.settings.push.PushRulesFragment" />
</im.vector.app.core.preference.VectorPreferenceCategory> </im.vector.app.core.preference.VectorPreferenceCategory>
<im.vector.app.core.preference.VectorPreferenceCategory <im.vector.app.core.preference.VectorPreferenceCategory
@ -72,12 +72,12 @@
<im.vector.app.core.preference.VectorPreference <im.vector.app.core.preference.VectorPreference
android:persistent="false" android:persistent="false"
android:title="@string/settings_account_data" android:title="@string/settings_account_data"
app:fragment="im.vector.riotx.features.settings.devtools.AccountDataFragment" /> app:fragment="im.vector.app.features.settings.devtools.AccountDataFragment" />
<im.vector.app.core.preference.VectorPreference <im.vector.app.core.preference.VectorPreference
android:persistent="false" android:persistent="false"
android:title="@string/settings_key_requests" android:title="@string/settings_key_requests"
app:fragment="im.vector.riotx.features.settings.devtools.KeyRequestsFragment" /> app:fragment="im.vector.app.features.settings.devtools.KeyRequestsFragment" />
</im.vector.app.core.preference.VectorPreferenceCategory> </im.vector.app.core.preference.VectorPreferenceCategory>

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

@ -48,7 +48,7 @@
android:persistent="false" android:persistent="false"
android:summary="@string/settings_discovery_manage" android:summary="@string/settings_discovery_manage"
android:title="@string/settings_discovery_category" android:title="@string/settings_discovery_category"
app:fragment="im.vector.riotx.features.discovery.DiscoverySettingsFragment" /> app:fragment="im.vector.app.features.discovery.DiscoverySettingsFragment" />
</im.vector.app.core.preference.VectorPreferenceCategory> </im.vector.app.core.preference.VectorPreferenceCategory>
@ -103,7 +103,7 @@
<im.vector.app.core.preference.VectorPreference <im.vector.app.core.preference.VectorPreference
android:key="SETTINGS_IDENTITY_SERVER_PREFERENCE_KEY" android:key="SETTINGS_IDENTITY_SERVER_PREFERENCE_KEY"
android:title="@string/settings_identity_server" android:title="@string/settings_identity_server"
app:fragment="im.vector.riotx.features.discovery.DiscoverySettingsFragment" app:fragment="im.vector.app.features.discovery.DiscoverySettingsFragment"
tools:summary="https://identity.server.url" /> tools:summary="https://identity.server.url" />
<im.vector.app.core.preference.VectorPreference <im.vector.app.core.preference.VectorPreference
@ -130,7 +130,7 @@
android:key="SETTINGS_DEACTIVATE_ACCOUNT_KEY" android:key="SETTINGS_DEACTIVATE_ACCOUNT_KEY"
android:persistent="false" android:persistent="false"
android:title="@string/settings_deactivate_my_account" android:title="@string/settings_deactivate_my_account"
app:fragment="im.vector.riotx.features.settings.account.deactivation.DeactivateAccountFragment" /> app:fragment="im.vector.app.features.settings.account.deactivation.DeactivateAccountFragment" />
</im.vector.app.core.preference.VectorPreferenceCategory> </im.vector.app.core.preference.VectorPreferenceCategory>

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<!--<im.vector.riotx.core.preference.VectorPreferenceCategory--> <!--<im.vector.app.core.preference.VectorPreferenceCategory-->
<!--android:key="SETTINGS_LABS_PREFERENCE_KEY"--> <!--android:key="SETTINGS_LABS_PREFERENCE_KEY"-->
<!--android:title="@string/room_settings_labs_pref_title">--> <!--android:title="@string/room_settings_labs_pref_title">-->
@ -10,26 +10,26 @@
android:key="labs_warning" android:key="labs_warning"
android:summary="@string/room_settings_labs_warning_message" /> android:summary="@string/room_settings_labs_warning_message" />
<!--<im.vector.riotx.core.preference.VectorSwitchPreference--> <!--<im.vector.app.core.preference.VectorSwitchPreference-->
<!--android:key="SETTINGS_ROOM_SETTINGS_LABS_END_TO_END_PREFERENCE_KEY"--> <!--android:key="SETTINGS_ROOM_SETTINGS_LABS_END_TO_END_PREFERENCE_KEY"-->
<!--android:title="@string/room_settings_labs_end_to_end" />--> <!--android:title="@string/room_settings_labs_end_to_end" />-->
<!--<im.vector.riotx.core.preference.VectorPreference--> <!--<im.vector.app.core.preference.VectorPreference-->
<!--android:focusable="false"--> <!--android:focusable="false"-->
<!--android:key="SETTINGS_ROOM_SETTINGS_LABS_END_TO_END_IS_ACTIVE_PREFERENCE_KEY"--> <!--android:key="SETTINGS_ROOM_SETTINGS_LABS_END_TO_END_IS_ACTIVE_PREFERENCE_KEY"-->
<!--android:title="@string/room_settings_labs_end_to_end_is_active" />--> <!--android:title="@string/room_settings_labs_end_to_end_is_active" />-->
<!--<im.vector.riotx.core.preference.VectorSwitchPreference--> <!--<im.vector.app.core.preference.VectorSwitchPreference-->
<!--android:key="SETTINGS_DATA_SAVE_MODE_PREFERENCE_KEY"--> <!--android:key="SETTINGS_DATA_SAVE_MODE_PREFERENCE_KEY"-->
<!--android:summary="@string/settings_data_save_mode_summary"--> <!--android:summary="@string/settings_data_save_mode_summary"-->
<!--android:title="@string/settings_data_save_mode" />--> <!--android:title="@string/settings_data_save_mode" />-->
<!--<im.vector.riotx.core.preference.VectorSwitchPreference--> <!--<im.vector.app.core.preference.VectorSwitchPreference-->
<!--android:defaultValue="true"--> <!--android:defaultValue="true"-->
<!--android:key="SETTINGS_USE_JITSI_CONF_PREFERENCE_KEY"--> <!--android:key="SETTINGS_USE_JITSI_CONF_PREFERENCE_KEY"-->
<!--android:title="@string/settings_labs_create_conference_with_jitsi" />--> <!--android:title="@string/settings_labs_create_conference_with_jitsi" />-->
<!--<im.vector.riotx.core.preference.VectorSwitchPreference--> <!--<im.vector.app.core.preference.VectorSwitchPreference-->
<!--android:key="SETTINGS_ENABLE_SEND_VOICE_FEATURE_PREFERENCE_KEY"--> <!--android:key="SETTINGS_ENABLE_SEND_VOICE_FEATURE_PREFERENCE_KEY"-->
<!--android:summary="@string/settings_labs_enable_send_voice_summary"--> <!--android:summary="@string/settings_labs_enable_send_voice_summary"-->
<!--android:title="@string/settings_labs_enable_send_voice" />--> <!--android:title="@string/settings_labs_enable_send_voice" />-->
@ -50,6 +50,6 @@
android:defaultValue="false" android:defaultValue="false"
android:key="SETTINGS_LABS_UNREAD_NOTIFICATIONS_AS_TAB" android:key="SETTINGS_LABS_UNREAD_NOTIFICATIONS_AS_TAB"
android:title="@string/labs_show_unread_notifications_as_tab" /> android:title="@string/labs_show_unread_notifications_as_tab" />
<!--</im.vector.riotx.core.preference.VectorPreferenceCategory>--> <!--</im.vector.app.core.preference.VectorPreferenceCategory>-->
</androidx.preference.PreferenceScreen> </androidx.preference.PreferenceScreen>

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

@ -15,7 +15,7 @@
android:key="SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY" android:key="SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY"
android:title="@string/settings_enable_this_device" /> android:title="@string/settings_enable_this_device" />
<!--<im.vector.riotx.core.preference.VectorSwitchPreference--> <!--<im.vector.app.core.preference.VectorSwitchPreference-->
<!--android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"--> <!--android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"-->
<!--android:key="SETTINGS_TURN_SCREEN_ON_PREFERENCE_KEY"--> <!--android:key="SETTINGS_TURN_SCREEN_ON_PREFERENCE_KEY"-->
<!--android:title="@string/settings_turn_screen_on" />--> <!--android:title="@string/settings_turn_screen_on" />-->
@ -26,7 +26,7 @@
android:persistent="false" android:persistent="false"
android:summary="@string/settings_notification_advanced_summary_riotx" android:summary="@string/settings_notification_advanced_summary_riotx"
android:title="@string/settings_notification_advanced" android:title="@string/settings_notification_advanced"
app:fragment="im.vector.riotx.features.settings.VectorSettingsAdvancedNotificationPreferenceFragment" /> app:fragment="im.vector.app.features.settings.VectorSettingsAdvancedNotificationPreferenceFragment" />
</im.vector.app.core.preference.VectorPreferenceCategory> </im.vector.app.core.preference.VectorPreferenceCategory>
@ -67,38 +67,38 @@
<im.vector.app.core.preference.VectorPreference <im.vector.app.core.preference.VectorPreference
android:key="SETTINGS_NOTIFICATION_TROUBLESHOOT_PREFERENCE_KEY" android:key="SETTINGS_NOTIFICATION_TROUBLESHOOT_PREFERENCE_KEY"
android:title="@string/settings_notification_troubleshoot" android:title="@string/settings_notification_troubleshoot"
app:fragment="im.vector.riotx.features.settings.VectorSettingsNotificationsTroubleshootFragment" /> app:fragment="im.vector.app.features.settings.VectorSettingsNotificationsTroubleshootFragment" />
</im.vector.app.core.preference.VectorPreferenceCategory> </im.vector.app.core.preference.VectorPreferenceCategory>
<!--im.vector.riotx.core.preference.VectorPreferenceCategory <!--im.vector.app.core.preference.VectorPreferenceCategory
android:key="SETTINGS_BACKGROUND_SYNC_PREFERENCE_KEY" android:key="SETTINGS_BACKGROUND_SYNC_PREFERENCE_KEY"
android:title="@string/settings_background_sync"> android:title="@string/settings_background_sync">
<im.vector.riotx.core.preference.VectorSwitchPreference <im.vector.app.core.preference.VectorSwitchPreference
android:defaultValue="true" android:defaultValue="true"
android:key="SETTINGS_START_ON_BOOT_PREFERENCE_KEY" android:key="SETTINGS_START_ON_BOOT_PREFERENCE_KEY"
android:title="@string/settings_start_on_boot" /> android:title="@string/settings_start_on_boot" />
<im.vector.riotx.core.preference.VectorSwitchPreference <im.vector.app.core.preference.VectorSwitchPreference
android:key="SETTINGS_ENABLE_BACKGROUND_SYNC_PREFERENCE_KEY" android:key="SETTINGS_ENABLE_BACKGROUND_SYNC_PREFERENCE_KEY"
android:title="@string/settings_enable_background_sync" /> android:title="@string/settings_enable_background_sync" />
<im.vector.riotx.core.preference.VectorEditTextPreference <im.vector.app.core.preference.VectorEditTextPreference
android:dependency="SETTINGS_ENABLE_BACKGROUND_SYNC_PREFERENCE_KEY" android:dependency="SETTINGS_ENABLE_BACKGROUND_SYNC_PREFERENCE_KEY"
android:key="SETTINGS_SET_SYNC_TIMEOUT_PREFERENCE_KEY" android:key="SETTINGS_SET_SYNC_TIMEOUT_PREFERENCE_KEY"
android:numeric="integer" android:numeric="integer"
android:title="@string/settings_set_sync_timeout" /> android:title="@string/settings_set_sync_timeout" />
<im.vector.riotx.core.preference.VectorEditTextPreference <im.vector.app.core.preference.VectorEditTextPreference
android:dependency="SETTINGS_ENABLE_BACKGROUND_SYNC_PREFERENCE_KEY" android:dependency="SETTINGS_ENABLE_BACKGROUND_SYNC_PREFERENCE_KEY"
android:key="SETTINGS_SET_SYNC_DELAY_PREFERENCE_KEY" android:key="SETTINGS_SET_SYNC_DELAY_PREFERENCE_KEY"
android:numeric="integer" android:numeric="integer"
android:title="@string/settings_set_sync_delay" /> android:title="@string/settings_set_sync_delay" />
</im.vector.riotx.core.preference.VectorPreferenceCategory> </im.vector.app.core.preference.VectorPreferenceCategory>
<im.vector.riotx.core.preference.VectorPreferenceCategory <im.vector.app.core.preference.VectorPreferenceCategory
android:key="SETTINGS_NOTIFICATIONS_TARGETS_PREFERENCE_KEY" android:key="SETTINGS_NOTIFICATIONS_TARGETS_PREFERENCE_KEY"
android:title="@string/settings_notifications_targets" /--> android:title="@string/settings_notifications_targets" /-->

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

@ -10,7 +10,7 @@
android:key="SETTINGS_INTERFACE_LANGUAGE_PREFERENCE_KEY" android:key="SETTINGS_INTERFACE_LANGUAGE_PREFERENCE_KEY"
android:persistent="false" android:persistent="false"
android:title="@string/settings_interface_language" android:title="@string/settings_interface_language"
app:fragment="im.vector.riotx.features.settings.locale.LocalePickerFragment" /> app:fragment="im.vector.app.features.settings.locale.LocalePickerFragment" />
<im.vector.app.core.preference.VectorListPreference <im.vector.app.core.preference.VectorListPreference
android:defaultValue="light" android:defaultValue="light"

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

@ -5,63 +5,53 @@
<im.vector.app.core.preference.VectorPreference <im.vector.app.core.preference.VectorPreference
android:icon="@drawable/ic_settings_root_general" android:icon="@drawable/ic_settings_root_general"
android:title="@string/settings_general_title" android:title="@string/settings_general_title"
app:fragment="im.vector.riotx.features.settings.VectorSettingsGeneralFragment" /> app:fragment="im.vector.app.features.settings.VectorSettingsGeneralFragment" />
< <im.vector.app.core.preference.VectorPreference
<
<
<
<
<
< develop
<im.vector.riotx.core.preference.VectorPreference
=======
<im.vector.app.core.preference.VectorPreference android:enabled="@bool/false_not_implemented">>>>>>> Rename package `im.vector.riotx` to `im.vector.app`
(IDE)
android:icon="@drawable/ic_settings_root_flair" android:icon="@drawable/ic_settings_root_flair"
android:title="@string/settings_flair" android:title="@string/settings_flair"
app:fragment="im.vector.riotx.features.settings.VectorSettingsFlairFragment" app:fragment="im.vector.app.features.settings.VectorSettingsFlairFragment"
app:isPreferenceVisible="@bool/false_not_implemented" /> app:isPreferenceVisible="@bool/false_not_implemented" />
<im.vector.app.core.preference.VectorPreference <im.vector.app.core.preference.VectorPreference
android:icon="@drawable/ic_settings_root_notification" android:icon="@drawable/ic_settings_root_notification"
android:title="@string/settings_notifications" android:title="@string/settings_notifications"
app:fragment="im.vector.riotx.features.settings.VectorSettingsNotificationPreferenceFragment" /> app:fragment="im.vector.app.features.settings.VectorSettingsNotificationPreferenceFragment" />
<im.vector.app.core.preference.VectorPreference <im.vector.app.core.preference.VectorPreference
android:icon="@drawable/ic_settings_root_preferences" android:icon="@drawable/ic_settings_root_preferences"
android:title="@string/settings_preferences" android:title="@string/settings_preferences"
app:fragment="im.vector.riotx.features.settings.VectorSettingsPreferencesFragment" /> app:fragment="im.vector.app.features.settings.VectorSettingsPreferencesFragment" />
<im.vector.app.core.preference.VectorPreference <im.vector.app.core.preference.VectorPreference
android:icon="@drawable/ic_settings_root_call" android:icon="@drawable/ic_settings_root_call"
android:title="@string/preference_voice_and_video" android:title="@string/preference_voice_and_video"
app:fragment="im.vector.riotx.features.settings.VectorSettingsVoiceVideoFragment" app:fragment="im.vector.app.features.settings.VectorSettingsVoiceVideoFragment"
app:isPreferenceVisible="@bool/false_not_implemented" /> app:isPreferenceVisible="@bool/false_not_implemented" />
<im.vector.app.core.preference.VectorPreference <im.vector.app.core.preference.VectorPreference
android:icon="@drawable/ic_settings_root_ignored_users" android:icon="@drawable/ic_settings_root_ignored_users"
android:title="@string/settings_ignored_users" android:title="@string/settings_ignored_users"
app:fragment="im.vector.riotx.features.settings.ignored.VectorSettingsIgnoredUsersFragment" /> app:fragment="im.vector.app.features.settings.ignored.VectorSettingsIgnoredUsersFragment" />
<im.vector.app.core.preference.VectorPreference <im.vector.app.core.preference.VectorPreference
android:icon="@drawable/ic_settings_root_security_privacy" android:icon="@drawable/ic_settings_root_security_privacy"
android:title="@string/settings_security_and_privacy" android:title="@string/settings_security_and_privacy"
app:fragment="im.vector.riotx.features.settings.VectorSettingsSecurityPrivacyFragment" /> app:fragment="im.vector.app.features.settings.VectorSettingsSecurityPrivacyFragment" />
<im.vector.app.core.preference.VectorPreference <im.vector.app.core.preference.VectorPreference
android:icon="@drawable/ic_settings_root_labs" android:icon="@drawable/ic_settings_root_labs"
android:title="@string/room_settings_labs_pref_title" android:title="@string/room_settings_labs_pref_title"
app:fragment="im.vector.riotx.features.settings.VectorSettingsLabsFragment" /> app:fragment="im.vector.app.features.settings.VectorSettingsLabsFragment" />
<im.vector.app.core.preference.VectorPreference <im.vector.app.core.preference.VectorPreference
android:icon="@drawable/ic_settings_root_advanced" android:icon="@drawable/ic_settings_root_advanced"
android:title="@string/settings_advanced_settings" android:title="@string/settings_advanced_settings"
app:fragment="im.vector.riotx.features.settings.VectorSettingsAdvancedSettingsFragment" /> app:fragment="im.vector.app.features.settings.VectorSettingsAdvancedSettingsFragment" />
<im.vector.app.core.preference.VectorPreference <im.vector.app.core.preference.VectorPreference
android:icon="@drawable/ic_settings_root_help_about" android:icon="@drawable/ic_settings_root_help_about"
android:title="@string/preference_root_help_about" android:title="@string/preference_root_help_about"
app:fragment="im.vector.riotx.features.settings.VectorSettingsHelpAboutFragment" /> app:fragment="im.vector.app.features.settings.VectorSettingsHelpAboutFragment" />
</androidx.preference.PreferenceScreen> </androidx.preference.PreferenceScreen>

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

@ -21,20 +21,20 @@
android:key="SETTINGS_ENCRYPTION_CROSS_SIGNING_PREFERENCE_KEY" android:key="SETTINGS_ENCRYPTION_CROSS_SIGNING_PREFERENCE_KEY"
android:persistent="false" android:persistent="false"
android:title="@string/encryption_information_cross_signing_state" android:title="@string/encryption_information_cross_signing_state"
app:fragment="im.vector.riotx.features.settings.crosssigning.CrossSigningSettingsFragment" app:fragment="im.vector.app.features.settings.crosssigning.CrossSigningSettingsFragment"
tools:icon="@drawable/ic_shield_trusted" tools:icon="@drawable/ic_shield_trusted"
tools:summary="@string/encryption_information_dg_xsigning_complete" /> tools:summary="@string/encryption_information_dg_xsigning_complete" />
<!-- <im.vector.riotx.core.preference.VectorPreference--> <!-- <im.vector.app.core.preference.VectorPreference-->
<!-- android:key="SETTINGS_ENCRYPTION_INFORMATION_DEVICE_NAME_PREFERENCE_KEY"--> <!-- android:key="SETTINGS_ENCRYPTION_INFORMATION_DEVICE_NAME_PREFERENCE_KEY"-->
<!-- android:title="@string/encryption_information_device_name" />--> <!-- android:title="@string/encryption_information_device_name" />-->
<!-- <im.vector.riotx.core.preference.VectorPreference--> <!-- <im.vector.app.core.preference.VectorPreference-->
<!-- android:key="SETTINGS_ENCRYPTION_INFORMATION_DEVICE_ID_PREFERENCE_KEY"--> <!-- android:key="SETTINGS_ENCRYPTION_INFORMATION_DEVICE_ID_PREFERENCE_KEY"-->
<!-- android:title="@string/encryption_information_device_id" />--> <!-- android:title="@string/encryption_information_device_id" />-->
<!-- <im.vector.riotx.core.preference.VectorPreference--> <!-- <im.vector.app.core.preference.VectorPreference-->
<!-- android:key="SETTINGS_ENCRYPTION_INFORMATION_DEVICE_KEY_PREFERENCE_KEY"--> <!-- android:key="SETTINGS_ENCRYPTION_INFORMATION_DEVICE_KEY_PREFERENCE_KEY"-->
<!-- android:title="@string/encryption_information_device_key" />--> <!-- android:title="@string/encryption_information_device_key" />-->
@ -54,7 +54,7 @@
<im.vector.app.core.preference.VectorPreference <im.vector.app.core.preference.VectorPreference
android:key="SETTINGS_SHOW_DEVICES_LIST_PREFERENCE_KEY" android:key="SETTINGS_SHOW_DEVICES_LIST_PREFERENCE_KEY"
android:title="@string/settings_active_sessions_show_all" android:title="@string/settings_active_sessions_show_all"
app:fragment="im.vector.riotx.features.settings.devices.VectorSettingsDevicesFragment" /> app:fragment="im.vector.app.features.settings.devices.VectorSettingsDevicesFragment" />
</im.vector.app.core.preference.VectorPreferenceCategory> </im.vector.app.core.preference.VectorPreferenceCategory>