From 8931fd314d5f077ed354a35493b8c4c85fc3cb3e Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 3 Aug 2020 18:31:41 +0200 Subject: [PATCH] Rename package `im.vector.riotx` to `im.vector.app` (other manual changes) --- .../check/forbidden_strings_in_resources.txt | 4 +- tools/debug_alter_scalar_token.sh | 2 +- tools/debug_dump_filesystem.sh | 2 +- tools/debug_dump_prefs.sh | 2 +- .../root/src/app_package/Action.kt.ftl | 2 +- .../root/src/app_package/Activity.kt.ftl | 8 ++-- .../root/src/app_package/Fragment.kt.ftl | 4 +- .../root/src/app_package/ViewEvents.kt.ftl | 2 +- .../root/src/app_package/ViewModel.kt.ftl | 6 +-- tools/tests/app_standby_off.sh | 4 +- tools/tests/app_standby_on.sh | 4 +- tools/workmanager/dumpsys_debug.sh | 2 +- tools/workmanager/dumpsys_release.sh | 2 +- .../app/core/glide/ElementToDecryptOption.kt | 2 +- .../vector/app/core/services/CallService.kt | 16 ++++---- .../features/rageshake/VectorFileLogger.kt | 4 +- .../layout/activity_emoji_reaction_picker.xml | 4 +- .../res/layout/item_timeline_event_base.xml | 2 +- .../layout/item_timeline_event_base_state.xml | 2 +- .../xml/vector_settings_advanced_settings.xml | 8 ++-- .../main/res/xml/vector_settings_general.xml | 6 +-- .../src/main/res/xml/vector_settings_labs.xml | 14 +++---- .../res/xml/vector_settings_notifications.xml | 20 +++++----- .../res/xml/vector_settings_preferences.xml | 2 +- .../src/main/res/xml/vector_settings_root.xml | 38 +++++++------------ .../xml/vector_settings_security_privacy.xml | 10 ++--- 26 files changed, 81 insertions(+), 91 deletions(-) diff --git a/tools/check/forbidden_strings_in_resources.txt b/tools/check/forbidden_strings_in_resources.txt index 17ae015265..0bbe90b31f 100644 --- a/tools/check/forbidden_strings_in_resources.txt +++ b/tools/check/forbidden_strings_in_resources.txt @@ -73,10 +73,10 @@ layout_constraintLeft_ ### Use Preference from androidx library (androidx.preference.PreferenceScreen) diff --git a/tools/templates/RiotXFeature/root/src/app_package/ViewEvents.kt.ftl b/tools/templates/RiotXFeature/root/src/app_package/ViewEvents.kt.ftl index 4d7d2ee450..59b786ddf5 100644 --- a/tools/templates/RiotXFeature/root/src/app_package/ViewEvents.kt.ftl +++ b/tools/templates/RiotXFeature/root/src/app_package/ViewEvents.kt.ftl @@ -1,5 +1,5 @@ package ${escapeKotlinIdentifiers(packageName)} -import im.vector.riotx.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewEvents sealed class ${viewEventsClass} : VectorViewEvents \ No newline at end of file diff --git a/tools/templates/RiotXFeature/root/src/app_package/ViewModel.kt.ftl b/tools/templates/RiotXFeature/root/src/app_package/ViewModel.kt.ftl index 1d2ec0a069..d3c50c961c 100644 --- a/tools/templates/RiotXFeature/root/src/app_package/ViewModel.kt.ftl +++ b/tools/templates/RiotXFeature/root/src/app_package/ViewModel.kt.ftl @@ -6,12 +6,12 @@ import com.airbnb.mvrx.MvRxViewModelFactory import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorViewModel +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorViewModel <#if createViewEvents> <#else> -import im.vector.riotx.core.platform.EmptyViewEvents +import im.vector.app.core.platform.EmptyViewEvents class ${viewModelClass} @AssistedInject constructor(@Assisted initialState: ${viewStateClass}) diff --git a/tools/tests/app_standby_off.sh b/tools/tests/app_standby_off.sh index f285456bc5..24502cb7fe 100755 --- a/tools/tests/app_standby_off.sh +++ b/tools/tests/app_standby_off.sh @@ -6,5 +6,5 @@ echo "Standby OFF" echo "adb shell dumpsys battery reset" adb shell dumpsys battery reset -echo "adb shell am set-inactive im.vector.riotx false" -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.app false diff --git a/tools/tests/app_standby_on.sh b/tools/tests/app_standby_on.sh index c4c690b859..390efe064b 100755 --- a/tools/tests/app_standby_on.sh +++ b/tools/tests/app_standby_on.sh @@ -6,5 +6,5 @@ echo "Standby ON" echo "adb shell dumpsys battery unplug" adb shell dumpsys battery unplug -echo "adb shell am set-inactive im.vector.riotx true" -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.app true diff --git a/tools/workmanager/dumpsys_debug.sh b/tools/workmanager/dumpsys_debug.sh index 42009a27a0..8c4da9909e 100755 --- a/tools/workmanager/dumpsys_debug.sh +++ b/tools/workmanager/dumpsys_debug.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -adb shell dumpsys jobscheduler im.vector.riotx.debug +adb shell dumpsys jobscheduler im.vector.app.debug diff --git a/tools/workmanager/dumpsys_release.sh b/tools/workmanager/dumpsys_release.sh index 5eb7df2bc2..7826e1b3b8 100755 --- a/tools/workmanager/dumpsys_release.sh +++ b/tools/workmanager/dumpsys_release.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -adb shell dumpsys jobscheduler im.vector.riotx +adb shell dumpsys jobscheduler im.vector.app diff --git a/vector/src/main/java/im/vector/app/core/glide/ElementToDecryptOption.kt b/vector/src/main/java/im/vector/app/core/glide/ElementToDecryptOption.kt index c4b39f7f69..7c980c88dc 100644 --- a/vector/src/main/java/im/vector/app/core/glide/ElementToDecryptOption.kt +++ b/vector/src/main/java/im/vector/app/core/glide/ElementToDecryptOption.kt @@ -19,7 +19,7 @@ package im.vector.app.core.glide import com.bumptech.glide.load.Option 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( ElementToDecryptOptionKey, ElementToDecrypt("", "", "")) diff --git a/vector/src/main/java/im/vector/app/core/services/CallService.kt b/vector/src/main/java/im/vector/app/core/services/CallService.kt index 41e35e66df..bb7dccb91e 100644 --- a/vector/src/main/java/im/vector/app/core/services/CallService.kt +++ b/vector/src/main/java/im/vector/app/core/services/CallService.kt @@ -260,14 +260,14 @@ class CallService : VectorService(), WiredHeadsetStateReceiver.HeadsetEventListe companion object { 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_OUTGOING_RINGING_CALL = "im.vector.riotx.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_ONGOING_CALL = "im.vector.riotx.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_NO_ACTIVE_CALL = "im.vector.riotx.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_STOP_RINGING = "im.vector.riotx.core.services.CallService.ACTION_STOP_RINGING" + 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.app.core.services.CallService.ACTION_OUTGOING_RINGING_CALL" + private const val ACTION_CALL_CONNECTING = "im.vector.app.core.services.CallService.ACTION_CALL_CONNECTING" + private const val ACTION_ONGOING_CALL = "im.vector.app.core.services.CallService.ACTION_ONGOING_CALL" + 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.app.core.services.CallService.NO_ACTIVE_CALL" +// private const val ACTION_ACTIVITY_VISIBLE = "im.vector.app.core.services.CallService.ACTION_ACTIVITY_VISIBLE" +// 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_ROOM_NAME = "EXTRA_ROOM_NAME" diff --git a/vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt b/vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt index 777b6cd1ae..6f38ae0102 100644 --- a/vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt +++ b/vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt @@ -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 sCacheDirectory: File? = null - private var sFileName = "riotxlogs" + private var sFileName = "elementLogs" private val prioPrefixes = mapOf( Log.VERBOSE to "V/ ", diff --git a/vector/src/main/res/layout/activity_emoji_reaction_picker.xml b/vector/src/main/res/layout/activity_emoji_reaction_picker.xml index a11c7f706f..4139fd7aa1 100644 --- a/vector/src/main/res/layout/activity_emoji_reaction_picker.xml +++ b/vector/src/main/res/layout/activity_emoji_reaction_picker.xml @@ -8,7 +8,7 @@ - diff --git a/vector/src/main/res/layout/item_timeline_event_base_state.xml b/vector/src/main/res/layout/item_timeline_event_base_state.xml index d6bb1f8335..c7a5291338 100644 --- a/vector/src/main/res/layout/item_timeline_event_base_state.xml +++ b/vector/src/main/res/layout/item_timeline_event_base_state.xml @@ -99,7 +99,7 @@ tools:layout_height="40dp"> - diff --git a/vector/src/main/res/xml/vector_settings_advanced_settings.xml b/vector/src/main/res/xml/vector_settings_advanced_settings.xml index c3aa3de0a8..6d8de815d8 100644 --- a/vector/src/main/res/xml/vector_settings_advanced_settings.xml +++ b/vector/src/main/res/xml/vector_settings_advanced_settings.xml @@ -57,12 +57,12 @@ + app:fragment="im.vector.app.features.settings.push.PushGatewaysFragment" /> + app:fragment="im.vector.app.features.settings.push.PushRulesFragment" /> + app:fragment="im.vector.app.features.settings.devtools.AccountDataFragment" /> + app:fragment="im.vector.app.features.settings.devtools.KeyRequestsFragment" /> diff --git a/vector/src/main/res/xml/vector_settings_general.xml b/vector/src/main/res/xml/vector_settings_general.xml index d094c203fa..042ea5c77c 100644 --- a/vector/src/main/res/xml/vector_settings_general.xml +++ b/vector/src/main/res/xml/vector_settings_general.xml @@ -48,7 +48,7 @@ android:persistent="false" android:summary="@string/settings_discovery_manage" android:title="@string/settings_discovery_category" - app:fragment="im.vector.riotx.features.discovery.DiscoverySettingsFragment" /> + app:fragment="im.vector.app.features.discovery.DiscoverySettingsFragment" /> @@ -103,7 +103,7 @@ + app:fragment="im.vector.app.features.settings.account.deactivation.DeactivateAccountFragment" /> diff --git a/vector/src/main/res/xml/vector_settings_labs.xml b/vector/src/main/res/xml/vector_settings_labs.xml index f5bf4c4a79..736a0b90c3 100644 --- a/vector/src/main/res/xml/vector_settings_labs.xml +++ b/vector/src/main/res/xml/vector_settings_labs.xml @@ -1,7 +1,7 @@ - + @@ -10,26 +10,26 @@ android:key="labs_warning" android:summary="@string/room_settings_labs_warning_message" /> - + - + - + - + - + @@ -50,6 +50,6 @@ android:defaultValue="false" android:key="SETTINGS_LABS_UNREAD_NOTIFICATIONS_AS_TAB" android:title="@string/labs_show_unread_notifications_as_tab" /> - + \ No newline at end of file diff --git a/vector/src/main/res/xml/vector_settings_notifications.xml b/vector/src/main/res/xml/vector_settings_notifications.xml index 88ea78d3a9..b1e791e18a 100644 --- a/vector/src/main/res/xml/vector_settings_notifications.xml +++ b/vector/src/main/res/xml/vector_settings_notifications.xml @@ -15,7 +15,7 @@ android:key="SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY" android:title="@string/settings_enable_this_device" /> - + @@ -26,7 +26,7 @@ android:persistent="false" android:summary="@string/settings_notification_advanced_summary_riotx" android:title="@string/settings_notification_advanced" - app:fragment="im.vector.riotx.features.settings.VectorSettingsAdvancedNotificationPreferenceFragment" /> + app:fragment="im.vector.app.features.settings.VectorSettingsAdvancedNotificationPreferenceFragment" /> @@ -67,38 +67,38 @@ + app:fragment="im.vector.app.features.settings.VectorSettingsNotificationsTroubleshootFragment" /> - diff --git a/vector/src/main/res/xml/vector_settings_preferences.xml b/vector/src/main/res/xml/vector_settings_preferences.xml index ec121136bb..668aa9aa2b 100644 --- a/vector/src/main/res/xml/vector_settings_preferences.xml +++ b/vector/src/main/res/xml/vector_settings_preferences.xml @@ -10,7 +10,7 @@ android:key="SETTINGS_INTERFACE_LANGUAGE_PREFERENCE_KEY" android:persistent="false" android:title="@string/settings_interface_language" - app:fragment="im.vector.riotx.features.settings.locale.LocalePickerFragment" /> + app:fragment="im.vector.app.features.settings.locale.LocalePickerFragment" /> + app:fragment="im.vector.app.features.settings.VectorSettingsGeneralFragment" /> - < - < - < - < - < - < - < develop - >>>>>> Rename package `im.vector.riotx` to `im.vector.app` - (IDE) - android:icon="@drawable/ic_settings_root_flair" - android:title="@string/settings_flair" - app:fragment="im.vector.riotx.features.settings.VectorSettingsFlairFragment" - app:isPreferenceVisible="@bool/false_not_implemented" /> + + app:fragment="im.vector.app.features.settings.VectorSettingsNotificationPreferenceFragment" /> + app:fragment="im.vector.app.features.settings.VectorSettingsPreferencesFragment" /> + app:fragment="im.vector.app.features.settings.ignored.VectorSettingsIgnoredUsersFragment" /> + app:fragment="im.vector.app.features.settings.VectorSettingsSecurityPrivacyFragment" /> + app:fragment="im.vector.app.features.settings.VectorSettingsLabsFragment" /> + app:fragment="im.vector.app.features.settings.VectorSettingsAdvancedSettingsFragment" /> + app:fragment="im.vector.app.features.settings.VectorSettingsHelpAboutFragment" /> \ No newline at end of file diff --git a/vector/src/main/res/xml/vector_settings_security_privacy.xml b/vector/src/main/res/xml/vector_settings_security_privacy.xml index 429fc6bcc0..5cc40978b1 100644 --- a/vector/src/main/res/xml/vector_settings_security_privacy.xml +++ b/vector/src/main/res/xml/vector_settings_security_privacy.xml @@ -21,20 +21,20 @@ android:key="SETTINGS_ENCRYPTION_CROSS_SIGNING_PREFERENCE_KEY" android:persistent="false" 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:summary="@string/encryption_information_dg_xsigning_complete" /> - + - + - + @@ -54,7 +54,7 @@ + app:fragment="im.vector.app.features.settings.devices.VectorSettingsDevicesFragment" />