Merge pull request #263 from vector-im/feature/appId

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

tools/check/forbidden_strings_in_resources.txt

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

tools/debug_alter_scalar_token.sh

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

tools/debug_dump_filesystem.sh

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

tools/debug_dump_prefs.sh

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

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.riotredesign false"
-adb shell am set-inactive im.vector.riotredesign false
+echo "adb shell am set-inactive im.vector.riotx false"
+adb shell am set-inactive im.vector.riotx false

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.riotredesign true"
-adb shell am set-inactive im.vector.riotredesign true
+echo "adb shell am set-inactive im.vector.riotx true"
+adb shell am set-inactive im.vector.riotx true

vector/build.gradle

@@ -57,7 +57,7 @@ def buildNumber = System.getenv("BUILDKITE_BUILD_NUMBER") as Integer ?: 0
 android {
     compileSdkVersion 28
     defaultConfig {
-        applicationId "im.vector.riotredesign"
+        applicationId "im.vector.riotx"
         // Set to API 19 because motionLayout is min API 18.
         // In the future we may consider using an alternative of MotionLayout to support API 16. But for security reason, maybe not.
         minSdkVersion 19

vector/src/androidTest/java/im/vector/riotx/ExampleInstrumentedTest.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign
+package im.vector.riotx
 
 import androidx.test.InstrumentationRegistry
 import androidx.test.runner.AndroidJUnit4
@@ -35,6 +35,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getTargetContext()
-        assertEquals("im.vector.riotredesign", appContext.packageName)
+        assertEquals("im.vector.riotx", appContext.packageName)
     }
 }

vector/src/debug/AndroidManifest.xml

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="im.vector.riotx">
 
     <application>
-        <activity android:name="im.vector.riotredesign.features.debug.TestLinkifyActivity" />
+        <activity android:name=".features.debug.TestLinkifyActivity" />
         <activity
-            android:name="im.vector.riotredesign.features.debug.DebugMaterialThemeLightActivity"
+            android:name=".features.debug.DebugMaterialThemeLightActivity"
             android:theme="@style/VectorMaterialThemeDebugLight" />
         <activity
-            android:name="im.vector.riotredesign.features.debug.DebugMaterialThemeDarkActivity"
+            android:name=".features.debug.DebugMaterialThemeDarkActivity"
             android:theme="@style/VectorMaterialThemeDebugDark" />
     </application>
 

vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeActivity.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.debug
+package im.vector.riotx.features.debug
 
 import android.os.Bundle
 import android.view.Menu
@@ -22,8 +22,8 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.google.android.material.snackbar.Snackbar
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.utils.toast
+import im.vector.riotx.R
+import im.vector.riotx.core.utils.toast
 import kotlinx.android.synthetic.debug.activity_test_material_theme.*
 
 // Rendering is not the same with VectorBaseActivity

vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeDarkActivity.kt

@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.debug
+package im.vector.riotx.features.debug
 
 class DebugMaterialThemeDarkActivity : DebugMaterialThemeActivity()

vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeLightActivity.kt

@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.debug
+package im.vector.riotx.features.debug
 
 class DebugMaterialThemeLightActivity : DebugMaterialThemeActivity()

vector/src/debug/java/im/vector/riotx/features/debug/DebugMenuActivity.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.debug
+package im.vector.riotx.features.debug
 
 import android.app.NotificationChannel
 import android.app.NotificationManager
@@ -24,8 +24,8 @@ import android.os.Build
 import androidx.core.app.NotificationCompat
 import androidx.core.app.Person
 import butterknife.OnClick
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.platform.VectorBaseActivity
+import im.vector.riotx.R
+import im.vector.riotx.core.platform.VectorBaseActivity
 
 
 class DebugMenuActivity : VectorBaseActivity() {

vector/src/debug/java/im/vector/riotx/features/debug/TestLinkifyActivity.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.features.debug
+package im.vector.riotx.features.debug
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -25,7 +25,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import butterknife.BindView
 import butterknife.ButterKnife
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 
 class TestLinkifyActivity : AppCompatActivity() {

vector/src/debug/java/im/vector/riotx/receivers/DebugReceiver.kt

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.receivers
+package im.vector.riotx.receivers
 
 import android.content.*
 import android.preference.PreferenceManager
 import androidx.core.content.edit
-import im.vector.riotredesign.core.utils.lsFiles
+import im.vector.riotx.core.utils.lsFiles
 import timber.log.Timber
 
 /**

vector/src/debug/res/layout/activity_debug_menu.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="im.vector.riotredesign.features.debug.DebugMenuActivity"
+    tools:context="im.vector.riotx.features.debug.DebugMenuActivity"
     tools:ignore="HardcodedText">
 
     <ScrollView

vector/src/debug/res/layout/activity_test_linkify.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/riot_secondary_text_color_status"
-    tools:context="im.vector.riotredesign.features.debug.TestLinkifyActivity">
+    tools:context="im.vector.riotx.features.debug.TestLinkifyActivity">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"

vector/src/fdroid/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="im.vector.riotredesign">
+    package="im.vector.riotx">
 
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -8,7 +8,7 @@
 
     <application>
 
-        <receiver android:name="im.vector.riotredesign.fdroid.receiver.OnApplicationUpgradeOrRebootReceiver">
+        <receiver android:name=".fdroid.receiver.OnApplicationUpgradeOrRebootReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -16,7 +16,7 @@
         </receiver>
 
         <receiver
-            android:name="im.vector.riotredesign.fdroid.receiver.AlarmSyncBroadcastReceiver"
+            android:name=".fdroid.receiver.AlarmSyncBroadcastReceiver"
             android:enabled="true"
             android:exported="false" />
 

vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.fdroid.features.settings.troubleshoot
+package im.vector.riotx.fdroid.features.settings.troubleshoot
 
 import androidx.appcompat.app.AppCompatActivity
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.resources.StringProvider
-import im.vector.riotredesign.features.settings.PreferencesManager
-import im.vector.riotredesign.features.settings.troubleshoot.TroubleshootTest
+import im.vector.riotx.R
+import im.vector.riotx.core.resources.StringProvider
+import im.vector.riotx.features.settings.PreferencesManager
+import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest
 import javax.inject.Inject
 
 /**

vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt

@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.fdroid.features.settings.troubleshoot
+package im.vector.riotx.fdroid.features.settings.troubleshoot
 
 import android.content.Context
 import android.net.ConnectivityManager
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.net.ConnectivityManagerCompat
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.resources.StringProvider
-import im.vector.riotredesign.features.settings.troubleshoot.TroubleshootTest
+import im.vector.riotx.R
+import im.vector.riotx.core.resources.StringProvider
+import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest
 import javax.inject.Inject
 
 class TestBackgroundRestrictions @Inject constructor(private val context: AppCompatActivity,

vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.fdroid.features.settings.troubleshoot
+package im.vector.riotx.fdroid.features.settings.troubleshoot
 
 import androidx.fragment.app.Fragment
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.utils.isIgnoringBatteryOptimizations
-import im.vector.riotredesign.core.utils.requestDisablingBatteryOptimization
-import im.vector.riotredesign.features.settings.troubleshoot.NotificationTroubleshootTestManager
-import im.vector.riotredesign.features.settings.troubleshoot.TroubleshootTest
+import im.vector.riotx.R
+import im.vector.riotx.core.utils.isIgnoringBatteryOptimizations
+import im.vector.riotx.core.utils.requestDisablingBatteryOptimization
+import im.vector.riotx.features.settings.troubleshoot.NotificationTroubleshootTestManager
+import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest
 
 // Not used anymore
 class TestBatteryOptimization(val fragment: Fragment) : TroubleshootTest(R.string.settings_troubleshoot_test_battery_title) {

vector/src/fdroid/java/im/vector/riotx/fdroid/package-info.kt

@@ -17,4 +17,4 @@
 /**
  * Code exclusively used by the FDroid build and not referenced on the main source code
  */
-package im.vector.riotredesign.fdroid
+package im.vector.riotx.fdroid

vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/AlarmSyncBroadcastReceiver.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.fdroid.receiver
+package im.vector.riotx.fdroid.receiver
 
 import android.app.AlarmManager
 import android.app.PendingIntent
@@ -25,7 +25,7 @@ import android.os.Build
 import android.os.PowerManager
 import androidx.core.content.ContextCompat
 import im.vector.matrix.android.internal.session.sync.job.SyncService
-import im.vector.riotredesign.fdroid.service.VectorSyncService
+import im.vector.riotx.fdroid.service.VectorSyncService
 import timber.log.Timber
 
 class AlarmSyncBroadcastReceiver : BroadcastReceiver() {

vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt

@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.fdroid.receiver
+package im.vector.riotx.fdroid.receiver
 
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import im.vector.riotredesign.core.di.HasVectorInjector
+import im.vector.riotx.core.di.HasVectorInjector
 import timber.log.Timber
 
 class OnApplicationUpgradeOrRebootReceiver : BroadcastReceiver() {

vector/src/fdroid/java/im/vector/riotx/fdroid/service/VectorSyncService.kt

@@ -13,16 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.fdroid.service
+package im.vector.riotx.fdroid.service
 
 import android.app.NotificationManager
 import android.content.Context
 import android.content.Intent
 import android.os.Build
-import android.os.IBinder
 import im.vector.matrix.android.internal.session.sync.job.SyncService
-import im.vector.riotredesign.R
-import im.vector.riotredesign.features.notifications.NotificationUtils
+import im.vector.riotx.R
+import im.vector.riotx.features.notifications.NotificationUtils
 import timber.log.Timber
 
 class VectorSyncService : SyncService() {

vector/src/fdroid/java/im/vector/riotx/push/fcm/FcmHelper.kt

@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.push.fcm
+package im.vector.riotx.push.fcm
 
 import android.app.Activity
 import android.content.Context
-import im.vector.riotredesign.core.di.ActiveSessionHolder
-import im.vector.riotredesign.core.pushers.PushersManager
-import im.vector.riotredesign.fdroid.receiver.AlarmSyncBroadcastReceiver
-import im.vector.riotredesign.features.settings.PreferencesManager
+import im.vector.riotx.core.di.ActiveSessionHolder
+import im.vector.riotx.core.pushers.PushersManager
+import im.vector.riotx.fdroid.receiver.AlarmSyncBroadcastReceiver
+import im.vector.riotx.features.settings.PreferencesManager
 import timber.log.Timber
 
 /**

vector/src/fdroid/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.push.fcm
+package im.vector.riotx.push.fcm
 
 import androidx.fragment.app.Fragment
-import im.vector.riotredesign.fdroid.features.settings.troubleshoot.TestAutoStartBoot
-import im.vector.riotredesign.fdroid.features.settings.troubleshoot.TestBackgroundRestrictions
-import im.vector.riotredesign.features.settings.troubleshoot.*
+import im.vector.riotx.fdroid.features.settings.troubleshoot.TestAutoStartBoot
+import im.vector.riotx.fdroid.features.settings.troubleshoot.TestBackgroundRestrictions
+import im.vector.riotx.features.settings.troubleshoot.*
 import javax.inject.Inject
 
 class NotificationTroubleshootTestManagerFactory @Inject constructor(private val testSystemSettings: TestSystemSettings,

vector/src/gplay/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="im.vector.riotredesign">
+    package="im.vector.riotx">
 
     <application>
 

vector/src/gplay/google-services.json

@@ -8,96 +8,9 @@
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:912726360885:android:448c9b63161abc9c",
+        "mobilesdk_app_id": "1:912726360885:android:4ef8f3a0021e774d",
         "android_client_info": {
-          "package_name": "im.vector.alpha"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "912726360885-e87n3jva9uoj4vbidvijq78ebg02asv2.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAFZX8IhIfgzdOZvxDP_ISO5WYoU7jmQ5c"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "912726360885-rsae0i66rgqt6ivnudu1pv4tksg9i8b2.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:912726360885:android:3120c24f6ef22f2b",
-        "android_client_info": {
-          "package_name": "im.vector.app"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "912726360885-e87n3jva9uoj4vbidvijq78ebg02asv2.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAFZX8IhIfgzdOZvxDP_ISO5WYoU7jmQ5c"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "912726360885-rsae0i66rgqt6ivnudu1pv4tksg9i8b2.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:912726360885:android:25ef253beaff462e",
-        "android_client_info": {
-          "package_name": "im.vector.riotredesign"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "912726360885-e87n3jva9uoj4vbidvijq78ebg02asv2.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAFZX8IhIfgzdOZvxDP_ISO5WYoU7jmQ5c"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "912726360885-rsae0i66rgqt6ivnudu1pv4tksg9i8b2.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:912726360885:android:bb204b7a7b08a10b",
-        "android_client_info": {
-          "package_name": "im.veon"
+          "package_name": "im.vector.riotx"
         }
       },
       "oauth_client": [

vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestFirebaseToken.kt

@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.gplay.features.settings.troubleshoot
+package im.vector.riotx.gplay.features.settings.troubleshoot
 
 import androidx.appcompat.app.AppCompatActivity
 import com.google.firebase.iid.FirebaseInstanceId
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.resources.StringProvider
-import im.vector.riotredesign.core.utils.startAddGoogleAccountIntent
-import im.vector.riotredesign.features.settings.troubleshoot.NotificationTroubleshootTestManager
-import im.vector.riotredesign.features.settings.troubleshoot.TroubleshootTest
-import im.vector.riotredesign.push.fcm.FcmHelper
+import im.vector.riotx.R
+import im.vector.riotx.core.resources.StringProvider
+import im.vector.riotx.core.utils.startAddGoogleAccountIntent
+import im.vector.riotx.features.settings.troubleshoot.NotificationTroubleshootTestManager
+import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest
+import im.vector.riotx.push.fcm.FcmHelper
 import timber.log.Timber
 import javax.inject.Inject
 

vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestPlayServices.kt

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.gplay.features.settings.troubleshoot
+package im.vector.riotx.gplay.features.settings.troubleshoot
 
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.resources.StringProvider
-import im.vector.riotredesign.features.settings.troubleshoot.TroubleshootTest
+import im.vector.riotx.R
+import im.vector.riotx.core.resources.StringProvider
+import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest
 import timber.log.Timber
 import javax.inject.Inject
 

vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestTokenRegistration.kt

@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.gplay.features.settings.troubleshoot
+package im.vector.riotx.gplay.features.settings.troubleshoot
 
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.Observer
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import im.vector.matrix.android.api.session.pushers.PusherState
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ActiveSessionHolder
-import im.vector.riotredesign.core.pushers.PushersManager
-import im.vector.riotredesign.core.resources.StringProvider
-import im.vector.riotredesign.features.settings.troubleshoot.TroubleshootTest
-import im.vector.riotredesign.push.fcm.FcmHelper
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ActiveSessionHolder
+import im.vector.riotx.core.pushers.PushersManager
+import im.vector.riotx.core.resources.StringProvider
+import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest
+import im.vector.riotx.push.fcm.FcmHelper
 import javax.inject.Inject
 
 /**

vector/src/gplay/java/im/vector/riotx/gplay/package-info.kt

@@ -17,5 +17,5 @@
 /**
  * Code exclusively used by the GPlay build and not referenced on the main source code
  */
-package im.vector.riotredesign.gplay
+package im.vector.riotx.gplay
 

vector/src/gplay/java/im/vector/riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.gplay.push.fcm
+package im.vector.riotx.gplay.push.fcm
 
 import android.os.Handler
 import android.os.Looper
@@ -28,21 +28,20 @@ import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.riotredesign.BuildConfig
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ActiveSessionHolder
-import im.vector.riotredesign.core.extensions.vectorComponent
-import im.vector.riotredesign.core.preference.BingRule
-import im.vector.riotredesign.core.pushers.PushersManager
-import im.vector.riotredesign.features.badge.BadgeProxy
-import im.vector.riotredesign.features.notifications.NotifiableEventResolver
-import im.vector.riotredesign.features.notifications.NotifiableMessageEvent
-import im.vector.riotredesign.features.notifications.NotificationDrawerManager
-import im.vector.riotredesign.features.notifications.SimpleNotifiableEvent
-import im.vector.riotredesign.features.settings.PreferencesManager
-import im.vector.riotredesign.push.fcm.FcmHelper
+import im.vector.riotx.BuildConfig
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ActiveSessionHolder
+import im.vector.riotx.core.extensions.vectorComponent
+import im.vector.riotx.core.preference.BingRule
+import im.vector.riotx.core.pushers.PushersManager
+import im.vector.riotx.features.badge.BadgeProxy
+import im.vector.riotx.features.notifications.NotifiableEventResolver
+import im.vector.riotx.features.notifications.NotifiableMessageEvent
+import im.vector.riotx.features.notifications.NotificationDrawerManager
+import im.vector.riotx.features.notifications.SimpleNotifiableEvent
+import im.vector.riotx.features.settings.PreferencesManager
+import im.vector.riotx.push.fcm.FcmHelper
 import timber.log.Timber
-import javax.inject.Inject
 
 /**
  * Class extending FirebaseMessagingService.

vector/src/gplay/java/im/vector/riotx/push/fcm/FcmHelper.kt

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.push.fcm
+package im.vector.riotx.push.fcm
 
 import android.app.Activity
 import android.content.Context
@@ -24,9 +24,9 @@ import android.widget.Toast
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
 import com.google.firebase.iid.FirebaseInstanceId
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.di.ActiveSessionHolder
-import im.vector.riotredesign.core.pushers.PushersManager
+import im.vector.riotx.R
+import im.vector.riotx.core.di.ActiveSessionHolder
+import im.vector.riotx.core.pushers.PushersManager
 import timber.log.Timber
 
 /**

vector/src/gplay/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt

@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.push.fcm
+package im.vector.riotx.push.fcm
 
 import androidx.fragment.app.Fragment
-import im.vector.riotredesign.features.settings.troubleshoot.NotificationTroubleshootTestManager
-import im.vector.riotredesign.features.settings.troubleshoot.TestAccountSettings
-import im.vector.riotredesign.features.settings.troubleshoot.TestBingRulesSettings
-import im.vector.riotredesign.features.settings.troubleshoot.TestDeviceSettings
-import im.vector.riotredesign.features.settings.troubleshoot.TestSystemSettings
-import im.vector.riotredesign.gplay.features.settings.troubleshoot.TestFirebaseToken
-import im.vector.riotredesign.gplay.features.settings.troubleshoot.TestPlayServices
-import im.vector.riotredesign.gplay.features.settings.troubleshoot.TestTokenRegistration
+import im.vector.riotx.features.settings.troubleshoot.NotificationTroubleshootTestManager
+import im.vector.riotx.features.settings.troubleshoot.TestAccountSettings
+import im.vector.riotx.features.settings.troubleshoot.TestBingRulesSettings
+import im.vector.riotx.features.settings.troubleshoot.TestDeviceSettings
+import im.vector.riotx.features.settings.troubleshoot.TestSystemSettings
+import im.vector.riotx.gplay.features.settings.troubleshoot.TestFirebaseToken
+import im.vector.riotx.gplay.features.settings.troubleshoot.TestPlayServices
+import im.vector.riotx.gplay.features.settings.troubleshoot.TestTokenRegistration
 import javax.inject.Inject
 
 class NotificationTroubleshootTestManagerFactory @Inject constructor(private val testSystemSettings: TestSystemSettings,

vector/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="im.vector.riotredesign">
+    package="im.vector.riotx">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
@@ -46,13 +46,13 @@
             android:name=".features.crypto.verification.SASVerificationActivity"
             android:label="@string/title_activity_verify_device" />
         <activity
-            android:name="im.vector.riotredesign.features.crypto.keysbackup.restore.KeysBackupRestoreActivity"
+            android:name=".features.crypto.keysbackup.restore.KeysBackupRestoreActivity"
             android:label="@string/title_activity_keys_backup_setup" />
         <activity
-            android:name="im.vector.riotredesign.features.crypto.keysbackup.setup.KeysBackupSetupActivity"
+            android:name=".features.crypto.keysbackup.setup.KeysBackupSetupActivity"
             android:label="@string/title_activity_keys_backup_restore" />
         <activity
-            android:name="im.vector.riotredesign.features.crypto.keysbackup.settings.KeysBackupManageActivity"
+            android:name=".features.crypto.keysbackup.settings.KeysBackupManageActivity"
             android:label="@string/encryption_message_recovery" />
 
         <activity

vector/src/main/java/im/vector/riotx/EmojiCompatFontProvider.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign
+package im.vector.riotx
 
 import android.graphics.Typeface
 import androidx.core.provider.FontsContractCompat

vector/src/main/java/im/vector/riotx/VectorApplication.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign
+package im.vector.riotx
 
 import android.app.Application
 import android.content.Context
@@ -37,24 +37,24 @@ import com.jakewharton.threetenabp.AndroidThreeTen
 import im.vector.matrix.android.api.Matrix
 import im.vector.matrix.android.api.MatrixConfiguration
 import im.vector.matrix.android.api.auth.Authenticator
-import im.vector.riotredesign.core.di.ActiveSessionHolder
-import im.vector.riotredesign.core.di.DaggerVectorComponent
-import im.vector.riotredesign.core.di.HasVectorInjector
-import im.vector.riotredesign.core.di.VectorComponent
-import im.vector.riotredesign.core.extensions.configureAndStart
-import im.vector.riotredesign.features.configuration.VectorConfiguration
-import im.vector.riotredesign.features.lifecycle.VectorActivityLifecycleCallbacks
-import im.vector.riotredesign.features.notifications.NotificationDrawerManager
-import im.vector.riotredesign.features.notifications.NotificationUtils
-import im.vector.riotredesign.features.notifications.PushRuleTriggerListener
-import im.vector.riotredesign.features.rageshake.VectorFileLogger
-import im.vector.riotredesign.features.rageshake.VectorUncaughtExceptionHandler
-import im.vector.riotredesign.features.version.getVersion
-import im.vector.riotredesign.push.fcm.FcmHelper
+import im.vector.riotx.core.di.ActiveSessionHolder
+import im.vector.riotx.core.di.DaggerVectorComponent
+import im.vector.riotx.core.di.HasVectorInjector
+import im.vector.riotx.core.di.VectorComponent
+import im.vector.riotx.core.extensions.configureAndStart
+import im.vector.riotx.features.configuration.VectorConfiguration
+import im.vector.riotx.features.lifecycle.VectorActivityLifecycleCallbacks
+import im.vector.riotx.features.notifications.NotificationDrawerManager
+import im.vector.riotx.features.notifications.NotificationUtils
+import im.vector.riotx.features.notifications.PushRuleTriggerListener
+import im.vector.riotx.features.rageshake.VectorFileLogger
+import im.vector.riotx.features.rageshake.VectorUncaughtExceptionHandler
+import im.vector.riotx.features.version.getVersion
+import im.vector.riotx.push.fcm.FcmHelper
 import timber.log.Timber
 import java.text.SimpleDateFormat
 import java.util.*
-import im.vector.riotredesign.core.utils.initKnownEmojiHashSet
+import im.vector.riotx.core.utils.initKnownEmojiHashSet
 import javax.inject.Inject
 
 class VectorApplication : Application(), HasVectorInjector, MatrixConfiguration.Provider, androidx.work.Configuration.Provider {

vector/src/main/java/im/vector/riotx/core/animations/Constants.kt

@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.animations
+package im.vector.riotx.core.animations
 
 const val ANIMATION_DURATION_SHORT = 200L

vector/src/main/java/im/vector/riotx/core/animations/SimpleAnimatorListener.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.animations
+package im.vector.riotx.core.animations
 
 import android.animation.Animator
 

vector/src/main/java/im/vector/riotx/core/animations/SimpleTransitionListener.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.animations
+package im.vector.riotx.core.animations
 
 import androidx.transition.Transition
 

vector/src/main/java/im/vector/riotx/core/animations/VectorFullTransitionSet.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.animations
+package im.vector.riotx.core.animations
 
 import android.content.Context
 import android.util.AttributeSet

vector/src/main/java/im/vector/riotx/core/di/ActiveSessionHolder.kt

@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.di
+package im.vector.riotx.core.di
 
 import im.vector.matrix.android.api.auth.Authenticator
 import im.vector.matrix.android.api.auth.data.SessionParams
 import im.vector.matrix.android.api.session.Session
-import im.vector.matrix.android.api.session.sync.FilterService
 import java.lang.IllegalStateException
 import java.util.concurrent.atomic.AtomicReference
 import javax.inject.Inject

vector/src/main/java/im/vector/riotx/core/di/HasScreenInjector.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.di
+package im.vector.riotx.core.di
 
 interface HasScreenInjector {
 

vector/src/main/java/im/vector/riotx/core/di/HasVectorInjector.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.di
+package im.vector.riotx.core.di
 
 interface HasVectorInjector {
 

vector/src/main/java/im/vector/riotx/core/di/ScreenComponent.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.di
+package im.vector.riotx.core.di
 
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.ViewModelProvider
@@ -22,41 +22,41 @@ import dagger.BindsInstance
 import dagger.Component
 import im.vector.fragments.keysbackup.restore.KeysBackupRestoreFromPassphraseFragment
 import im.vector.matrix.android.api.session.Session
-import im.vector.riotredesign.core.preference.UserAvatarPreference
-import im.vector.riotredesign.features.MainActivity
-import im.vector.riotredesign.features.crypto.keysbackup.restore.KeysBackupRestoreFromKeyFragment
-import im.vector.riotredesign.features.crypto.keysbackup.restore.KeysBackupRestoreSuccessFragment
-import im.vector.riotredesign.features.crypto.keysbackup.settings.KeysBackupManageActivity
-import im.vector.riotredesign.features.crypto.keysbackup.settings.KeysBackupSettingsFragment
-import im.vector.riotredesign.features.crypto.keysbackup.setup.KeysBackupSetupStep1Fragment
-import im.vector.riotredesign.features.crypto.keysbackup.setup.KeysBackupSetupStep2Fragment
-import im.vector.riotredesign.features.crypto.keysbackup.setup.KeysBackupSetupStep3Fragment
-import im.vector.riotredesign.features.crypto.verification.SASVerificationIncomingFragment
-import im.vector.riotredesign.features.home.*
-import im.vector.riotredesign.features.home.group.GroupListFragment
-import im.vector.riotredesign.features.home.room.detail.RoomDetailFragment
-import im.vector.riotredesign.features.home.room.detail.timeline.action.MessageActionsBottomSheet
-import im.vector.riotredesign.features.home.room.detail.timeline.action.MessageMenuFragment
-import im.vector.riotredesign.features.home.room.detail.timeline.action.QuickReactionFragment
-import im.vector.riotredesign.features.home.room.detail.timeline.action.ViewReactionBottomSheet
-import im.vector.riotredesign.features.home.room.list.RoomListFragment
-import im.vector.riotredesign.features.invite.VectorInviteView
-import im.vector.riotredesign.features.login.LoginActivity
-import im.vector.riotredesign.features.media.ImageMediaViewerActivity
-import im.vector.riotredesign.features.media.VideoMediaViewerActivity
-import im.vector.riotredesign.features.rageshake.BugReportActivity
-import im.vector.riotredesign.features.rageshake.BugReporter
-import im.vector.riotredesign.features.rageshake.RageShake
-import im.vector.riotredesign.features.reactions.EmojiReactionPickerActivity
-import im.vector.riotredesign.features.roomdirectory.PublicRoomsFragment
-import im.vector.riotredesign.features.roomdirectory.RoomDirectoryActivity
-import im.vector.riotredesign.features.roomdirectory.createroom.CreateRoomFragment
-import im.vector.riotredesign.features.roomdirectory.picker.RoomDirectoryPickerFragment
-import im.vector.riotredesign.features.roomdirectory.roompreview.RoomPreviewNoPreviewFragment
-import im.vector.riotredesign.features.settings.VectorSettingsActivity
-import im.vector.riotredesign.features.settings.VectorSettingsNotificationPreferenceFragment
-import im.vector.riotredesign.features.settings.VectorSettingsNotificationsTroubleshootFragment
-import im.vector.riotredesign.features.settings.VectorSettingsPreferencesFragment
+import im.vector.riotx.core.preference.UserAvatarPreference
+import im.vector.riotx.features.MainActivity
+import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreFromKeyFragment
+import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreSuccessFragment
+import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupManageActivity
+import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupSettingsFragment
+import im.vector.riotx.features.crypto.keysbackup.setup.KeysBackupSetupStep1Fragment
+import im.vector.riotx.features.crypto.keysbackup.setup.KeysBackupSetupStep2Fragment
+import im.vector.riotx.features.crypto.keysbackup.setup.KeysBackupSetupStep3Fragment
+import im.vector.riotx.features.crypto.verification.SASVerificationIncomingFragment
+import im.vector.riotx.features.home.*
+import im.vector.riotx.features.home.group.GroupListFragment
+import im.vector.riotx.features.home.room.detail.RoomDetailFragment
+import im.vector.riotx.features.home.room.detail.timeline.action.MessageActionsBottomSheet
+import im.vector.riotx.features.home.room.detail.timeline.action.MessageMenuFragment
+import im.vector.riotx.features.home.room.detail.timeline.action.QuickReactionFragment
+import im.vector.riotx.features.home.room.detail.timeline.action.ViewReactionBottomSheet
+import im.vector.riotx.features.home.room.list.RoomListFragment
+import im.vector.riotx.features.invite.VectorInviteView
+import im.vector.riotx.features.login.LoginActivity
+import im.vector.riotx.features.media.ImageMediaViewerActivity
+import im.vector.riotx.features.media.VideoMediaViewerActivity
+import im.vector.riotx.features.rageshake.BugReportActivity
+import im.vector.riotx.features.rageshake.BugReporter
+import im.vector.riotx.features.rageshake.RageShake
+import im.vector.riotx.features.reactions.EmojiReactionPickerActivity
+import im.vector.riotx.features.roomdirectory.PublicRoomsFragment
+import im.vector.riotx.features.roomdirectory.RoomDirectoryActivity
+import im.vector.riotx.features.roomdirectory.createroom.CreateRoomFragment
+import im.vector.riotx.features.roomdirectory.picker.RoomDirectoryPickerFragment
+import im.vector.riotx.features.roomdirectory.roompreview.RoomPreviewNoPreviewFragment
+import im.vector.riotx.features.settings.VectorSettingsActivity
+import im.vector.riotx.features.settings.VectorSettingsNotificationPreferenceFragment
+import im.vector.riotx.features.settings.VectorSettingsNotificationsTroubleshootFragment
+import im.vector.riotx.features.settings.VectorSettingsPreferencesFragment
 
 @Component(dependencies = [VectorComponent::class], modules = [ViewModelModule::class, HomeModule::class])
 @ScreenScope

vector/src/main/java/im/vector/riotx/core/di/ScreenModule.kt

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.di
+package im.vector.riotx.core.di
 
 import androidx.appcompat.app.AppCompatActivity
 import dagger.Module
 import dagger.Provides
-import im.vector.riotredesign.core.glide.GlideApp
+import im.vector.riotx.core.glide.GlideApp
 
 @Module
 object ScreenModule {

vector/src/main/java/im/vector/riotx/core/di/ScreenScope.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.di;
+package im.vector.riotx.core.di;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;

vector/src/main/java/im/vector/riotx/core/di/VectorAssistedModule.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.di
+package im.vector.riotx.core.di
 
 /*
 @Module(includes = [AssistedInject_VectorAssistedModule::class])

vector/src/main/java/im/vector/riotx/core/di/VectorComponent.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.di
+package im.vector.riotx.core.di
 
 import android.content.Context
 import android.content.res.Resources
@@ -23,23 +23,23 @@ import dagger.Component
 import im.vector.matrix.android.api.Matrix
 import im.vector.matrix.android.api.auth.Authenticator
 import im.vector.matrix.android.api.session.Session
-import im.vector.riotredesign.EmojiCompatFontProvider
-import im.vector.riotredesign.VectorApplication
-import im.vector.riotredesign.core.pushers.PushersManager
-import im.vector.riotredesign.features.configuration.VectorConfiguration
-import im.vector.riotredesign.features.crypto.keysrequest.KeyRequestHandler
-import im.vector.riotredesign.features.crypto.verification.IncomingVerificationRequestHandler
-import im.vector.riotredesign.features.home.AvatarRenderer
-import im.vector.riotredesign.features.home.HomeNavigator
-import im.vector.riotredesign.features.home.HomeRoomListObservableStore
-import im.vector.riotredesign.features.home.group.SelectedGroupStore
-import im.vector.riotredesign.features.navigation.Navigator
-import im.vector.riotredesign.features.notifications.NotifiableEventResolver
-import im.vector.riotredesign.features.notifications.NotificationBroadcastReceiver
-import im.vector.riotredesign.features.notifications.NotificationDrawerManager
-import im.vector.riotredesign.features.notifications.PushRuleTriggerListener
-import im.vector.riotredesign.features.rageshake.BugReporter
-import im.vector.riotredesign.features.rageshake.VectorUncaughtExceptionHandler
+import im.vector.riotx.EmojiCompatFontProvider
+import im.vector.riotx.VectorApplication
+import im.vector.riotx.core.pushers.PushersManager
+import im.vector.riotx.features.configuration.VectorConfiguration
+import im.vector.riotx.features.crypto.keysrequest.KeyRequestHandler
+import im.vector.riotx.features.crypto.verification.IncomingVerificationRequestHandler
+import im.vector.riotx.features.home.AvatarRenderer
+import im.vector.riotx.features.home.HomeNavigator
+import im.vector.riotx.features.home.HomeRoomListObservableStore
+import im.vector.riotx.features.home.group.SelectedGroupStore
+import im.vector.riotx.features.navigation.Navigator
+import im.vector.riotx.features.notifications.NotifiableEventResolver
+import im.vector.riotx.features.notifications.NotificationBroadcastReceiver
+import im.vector.riotx.features.notifications.NotificationDrawerManager
+import im.vector.riotx.features.notifications.PushRuleTriggerListener
+import im.vector.riotx.features.rageshake.BugReporter
+import im.vector.riotx.features.rageshake.VectorUncaughtExceptionHandler
 import javax.inject.Singleton
 
 @Component(modules = [VectorModule::class])

vector/src/main/java/im/vector/riotx/core/di/VectorModule.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.di
+package im.vector.riotx.core.di
 
 import android.content.Context
 import android.content.Context.MODE_PRIVATE
@@ -26,8 +26,8 @@ import dagger.Provides
 import im.vector.matrix.android.api.Matrix
 import im.vector.matrix.android.api.auth.Authenticator
 import im.vector.matrix.android.api.session.Session
-import im.vector.riotredesign.features.navigation.DefaultNavigator
-import im.vector.riotredesign.features.navigation.Navigator
+import im.vector.riotx.features.navigation.DefaultNavigator
+import im.vector.riotx.features.navigation.Navigator
 
 @Module
 abstract class VectorModule {

vector/src/main/java/im/vector/riotx/core/di/VectorViewModelFactory.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.di
+package im.vector.riotx.core.di
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider

vector/src/main/java/im/vector/riotx/core/di/ViewModelKey.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.di
+package im.vector.riotx.core.di
 
 import androidx.lifecycle.ViewModel
 import dagger.MapKey

vector/src/main/java/im/vector/riotx/core/di/ViewModelModule.kt

@@ -14,46 +14,46 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.di
+package im.vector.riotx.core.di
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import dagger.Binds
 import dagger.Module
 import dagger.multibindings.IntoMap
-import im.vector.riotredesign.core.platform.ConfigurationViewModel
-import im.vector.riotredesign.features.crypto.keysbackup.restore.KeysBackupRestoreFromKeyViewModel
-import im.vector.riotredesign.features.crypto.keysbackup.restore.KeysBackupRestoreFromPassphraseViewModel
-import im.vector.riotredesign.features.crypto.keysbackup.restore.KeysBackupRestoreSharedViewModel
-import im.vector.riotredesign.features.crypto.keysbackup.settings.KeysBackupSettingsViewModel
-import im.vector.riotredesign.features.crypto.keysbackup.settings.KeysBackupSettingsViewModel_AssistedFactory
-import im.vector.riotredesign.features.crypto.keysbackup.setup.KeysBackupSetupSharedViewModel
-import im.vector.riotredesign.features.crypto.verification.SasVerificationViewModel
-import im.vector.riotredesign.features.home.HomeActivityViewModel
-import im.vector.riotredesign.features.home.HomeActivityViewModel_AssistedFactory
-import im.vector.riotredesign.features.home.HomeDetailViewModel
-import im.vector.riotredesign.features.home.HomeDetailViewModel_AssistedFactory
-import im.vector.riotredesign.features.home.HomeNavigationViewModel
-import im.vector.riotredesign.features.home.group.GroupListViewModel
-import im.vector.riotredesign.features.home.group.GroupListViewModel_AssistedFactory
-import im.vector.riotredesign.features.home.room.detail.RoomDetailViewModel
-import im.vector.riotredesign.features.home.room.detail.RoomDetailViewModel_AssistedFactory
-import im.vector.riotredesign.features.home.room.detail.composer.TextComposerViewModel
-import im.vector.riotredesign.features.home.room.detail.composer.TextComposerViewModel_AssistedFactory
-import im.vector.riotredesign.features.home.room.detail.timeline.action.*
-import im.vector.riotredesign.features.home.room.list.RoomListViewModel
-import im.vector.riotredesign.features.home.room.list.RoomListViewModel_AssistedFactory
-import im.vector.riotredesign.features.reactions.EmojiChooserViewModel
-import im.vector.riotredesign.features.roomdirectory.RoomDirectoryNavigationViewModel
-import im.vector.riotredesign.features.roomdirectory.RoomDirectoryViewModel
-import im.vector.riotredesign.features.roomdirectory.RoomDirectoryViewModel_AssistedFactory
-import im.vector.riotredesign.features.roomdirectory.createroom.CreateRoomViewModel
-import im.vector.riotredesign.features.roomdirectory.createroom.CreateRoomViewModel_AssistedFactory
-import im.vector.riotredesign.features.roomdirectory.picker.RoomDirectoryPickerViewModel
-import im.vector.riotredesign.features.roomdirectory.picker.RoomDirectoryPickerViewModel_AssistedFactory
-import im.vector.riotredesign.features.roomdirectory.roompreview.RoomPreviewViewModel
-import im.vector.riotredesign.features.roomdirectory.roompreview.RoomPreviewViewModel_AssistedFactory
-import im.vector.riotredesign.features.workers.signout.SignOutViewModel
+import im.vector.riotx.core.platform.ConfigurationViewModel
+import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreFromKeyViewModel
+import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreFromPassphraseViewModel
+import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreSharedViewModel
+import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupSettingsViewModel
+import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupSettingsViewModel_AssistedFactory
+import im.vector.riotx.features.crypto.keysbackup.setup.KeysBackupSetupSharedViewModel
+import im.vector.riotx.features.crypto.verification.SasVerificationViewModel
+import im.vector.riotx.features.home.HomeActivityViewModel
+import im.vector.riotx.features.home.HomeActivityViewModel_AssistedFactory
+import im.vector.riotx.features.home.HomeDetailViewModel
+import im.vector.riotx.features.home.HomeDetailViewModel_AssistedFactory
+import im.vector.riotx.features.home.HomeNavigationViewModel
+import im.vector.riotx.features.home.group.GroupListViewModel
+import im.vector.riotx.features.home.group.GroupListViewModel_AssistedFactory
+import im.vector.riotx.features.home.room.detail.RoomDetailViewModel
+import im.vector.riotx.features.home.room.detail.RoomDetailViewModel_AssistedFactory
+import im.vector.riotx.features.home.room.detail.composer.TextComposerViewModel
+import im.vector.riotx.features.home.room.detail.composer.TextComposerViewModel_AssistedFactory
+import im.vector.riotx.features.home.room.detail.timeline.action.*
+import im.vector.riotx.features.home.room.list.RoomListViewModel
+import im.vector.riotx.features.home.room.list.RoomListViewModel_AssistedFactory
+import im.vector.riotx.features.reactions.EmojiChooserViewModel
+import im.vector.riotx.features.roomdirectory.RoomDirectoryNavigationViewModel
+import im.vector.riotx.features.roomdirectory.RoomDirectoryViewModel
+import im.vector.riotx.features.roomdirectory.RoomDirectoryViewModel_AssistedFactory
+import im.vector.riotx.features.roomdirectory.createroom.CreateRoomViewModel
+import im.vector.riotx.features.roomdirectory.createroom.CreateRoomViewModel_AssistedFactory
+import im.vector.riotx.features.roomdirectory.picker.RoomDirectoryPickerViewModel
+import im.vector.riotx.features.roomdirectory.picker.RoomDirectoryPickerViewModel_AssistedFactory
+import im.vector.riotx.features.roomdirectory.roompreview.RoomPreviewViewModel
+import im.vector.riotx.features.roomdirectory.roompreview.RoomPreviewViewModel_AssistedFactory
+import im.vector.riotx.features.workers.signout.SignOutViewModel
 
 @Module
 interface ViewModelModule {

vector/src/main/java/im/vector/riotx/core/dialogs/DialogAdapter.kt

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.dialogs
+package im.vector.riotx.core.dialogs
 
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ArrayAdapter
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 internal abstract class DialogAdapter(context: Context) : ArrayAdapter<DialogListItem>(context, R.layout.item_dialog) {
 

vector/src/main/java/im/vector/riotx/core/dialogs/DialogCallAdapter.kt

@@ -14,11 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.dialogs
+package im.vector.riotx.core.dialogs
 
 import android.content.Context
-import im.vector.riotredesign.core.dialogs.DialogAdapter
-import im.vector.riotredesign.core.dialogs.DialogListItem
 
 internal class DialogCallAdapter(context: Context) : DialogAdapter(context) {
 

vector/src/main/java/im/vector/riotx/core/dialogs/DialogListItem.kt

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.dialogs
+package im.vector.riotx.core.dialogs
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 internal sealed class DialogListItem(@DrawableRes val iconRes: Int,
                                      @StringRes val titleRes: Int) {

vector/src/main/java/im/vector/riotx/core/dialogs/DialogListItemHolder.kt

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.dialogs
+package im.vector.riotx.core.dialogs
 
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
 import butterknife.BindView
 import butterknife.ButterKnife
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 class DialogListItemHolder(view: View) {
 

vector/src/main/java/im/vector/riotx/core/dialogs/DialogLocker.kt

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.dialogs
+package im.vector.riotx.core.dialogs
 
 import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
-import im.vector.riotredesign.core.platform.Restorable
+import im.vector.riotx.core.platform.Restorable
 import timber.log.Timber
 
 private const val KEY_DIALOG_IS_DISPLAYED = "DialogLocker.KEY_DIALOG_IS_DISPLAYED"

vector/src/main/java/im/vector/riotx/core/dialogs/DialogSendItemAdapter.kt

@@ -14,11 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.dialogs
+package im.vector.riotx.core.dialogs
 
 import android.content.Context
-import im.vector.riotredesign.core.dialogs.DialogAdapter
-import im.vector.riotredesign.core.dialogs.DialogListItem
 
 internal class DialogSendItemAdapter(context: Context, items: MutableList<DialogListItem>) : DialogAdapter(context) {
 

vector/src/main/java/im/vector/riotx/core/dialogs/ExportKeysDialog.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.dialogs
+package im.vector.riotx.core.dialogs
 
 import android.app.Activity
 import android.text.Editable
@@ -24,9 +24,9 @@ import android.widget.ImageView
 import androidx.appcompat.app.AlertDialog
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.extensions.showPassword
-import im.vector.riotredesign.core.platform.SimpleTextWatcher
+import im.vector.riotx.R
+import im.vector.riotx.core.extensions.showPassword
+import im.vector.riotx.core.platform.SimpleTextWatcher
 
 class ExportKeysDialog {
 

vector/src/main/java/im/vector/riotx/core/epoxy/EmptyItem.kt

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.epoxy
+package im.vector.riotx.core.epoxy
 
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 @EpoxyModelClass(layout = R.layout.item_empty)
 abstract class EmptyItem : VectorEpoxyModel<EmptyItem.Holder>() {

vector/src/main/java/im/vector/riotx/core/epoxy/ErrorWithRetryItem.kt

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.epoxy
+package im.vector.riotx.core.epoxy
 
 import android.widget.Button
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 @EpoxyModelClass(layout = R.layout.item_error_retry)
 abstract class ErrorWithRetryItem : VectorEpoxyModel<ErrorWithRetryItem.Holder>() {

vector/src/main/java/im/vector/riotx/core/epoxy/LayoutManagerStateRestorer.kt

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.epoxy
+package im.vector.riotx.core.epoxy
 
 import android.os.Bundle
 import android.os.Parcelable
 import androidx.recyclerview.widget.RecyclerView
-import im.vector.riotredesign.core.platform.DefaultListUpdateCallback
-import im.vector.riotredesign.core.platform.Restorable
+import im.vector.riotx.core.platform.DefaultListUpdateCallback
+import im.vector.riotx.core.platform.Restorable
 import java.util.concurrent.atomic.AtomicReference
 
 private const val LAYOUT_MANAGER_STATE = "LAYOUT_MANAGER_STATE"

vector/src/main/java/im/vector/riotx/core/epoxy/LoadingItem.kt

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.epoxy
+package im.vector.riotx.core.epoxy
 
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.extensions.setTextOrHide
+import im.vector.riotx.R
+import im.vector.riotx.core.extensions.setTextOrHide
 
 @EpoxyModelClass(layout = R.layout.item_loading)
 abstract class LoadingItem : VectorEpoxyModel<LoadingItem.Holder>() {

vector/src/main/java/im/vector/riotx/core/epoxy/NoResultItem.kt

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.epoxy
+package im.vector.riotx.core.epoxy
 
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 @EpoxyModelClass(layout = R.layout.item_no_result)
 abstract class NoResultItem : VectorEpoxyModel<NoResultItem.Holder>() {

vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyHolder.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.epoxy
+package im.vector.riotx.core.epoxy
 
 import android.view.View
 import com.airbnb.epoxy.EpoxyHolder

vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyModel.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.epoxy
+package im.vector.riotx.core.epoxy
 
 import com.airbnb.epoxy.EpoxyModelWithHolder
 import com.airbnb.epoxy.VisibilityState

vector/src/main/java/im/vector/riotx/core/error/ErrorFormatter.kt

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.error
+package im.vector.riotx.core.error
 
 import im.vector.matrix.android.api.failure.Failure
-import im.vector.riotredesign.R
-import im.vector.riotredesign.core.resources.StringProvider
+import im.vector.riotx.R
+import im.vector.riotx.core.resources.StringProvider
 import javax.inject.Inject
 
 class ErrorFormatter @Inject constructor(val stringProvider: StringProvider) {

vector/src/main/java/im/vector/riotx/core/extensions/Activity.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.extensions
+package im.vector.riotx.core.extensions
 
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment

vector/src/main/java/im/vector/riotx/core/extensions/BasicExtensions.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.extensions
+package im.vector.riotx.core.extensions
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment

vector/src/main/java/im/vector/riotx/core/extensions/Context.kt

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.extensions
+package im.vector.riotx.core.extensions
 
 import android.content.Context
-import im.vector.riotredesign.core.di.HasVectorInjector
-import im.vector.riotredesign.core.di.VectorComponent
+import im.vector.riotx.core.di.HasVectorInjector
+import im.vector.riotx.core.di.VectorComponent
 
 fun Context.vectorComponent(): VectorComponent {
     val appContext = applicationContext

vector/src/main/java/im/vector/riotx/core/extensions/EditText.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.extensions
+package im.vector.riotx.core.extensions
 
 import android.text.Editable
 import android.text.InputType
@@ -23,7 +23,7 @@ import android.view.MotionEvent
 import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.widget.EditText
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 fun EditText.setupAsSearch() {
     addTextChangedListener(object : TextWatcher {

vector/src/main/java/im/vector/riotx/core/extensions/Event.kt

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.extensions
+package im.vector.riotx.core.extensions
 
 import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.riotredesign.core.resources.DateProvider
+import im.vector.riotx.core.resources.DateProvider
 import org.threeten.bp.LocalDateTime
 
 fun Event.localDateTime(): LocalDateTime {

vector/src/main/java/im/vector/riotx/core/extensions/Fragment.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.extensions
+package im.vector.riotx.core.extensions
 
 import androidx.fragment.app.Fragment
 

vector/src/main/java/im/vector/riotx/core/extensions/FragmentManager.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.extensions
+package im.vector.riotx.core.extensions
 
 import androidx.fragment.app.FragmentTransaction
 

vector/src/main/java/im/vector/riotx/core/extensions/Iterable.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.extensions
+package im.vector.riotx.core.extensions
 
 /**
  * Returns the last element yielding the smallest value of the given function or `null` if there are no elements.

vector/src/main/java/im/vector/riotx/core/extensions/LiveData.kt

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.extensions
+package im.vector.riotx.core.extensions
 
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
-import im.vector.riotredesign.core.utils.Debouncer
-import im.vector.riotredesign.core.utils.EventObserver
-import im.vector.riotredesign.core.utils.LiveEvent
+import im.vector.riotx.core.utils.Debouncer
+import im.vector.riotx.core.utils.EventObserver
+import im.vector.riotx.core.utils.LiveEvent
 
 inline fun <T> LiveData<T>.observeK(owner: LifecycleOwner, crossinline observer: (T?) -> Unit) {
     this.observe(owner, Observer { observer(it) })

vector/src/main/java/im/vector/riotx/core/extensions/Session.kt

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.extensions
+package im.vector.riotx.core.extensions
 
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.sync.FilterService
-import im.vector.riotredesign.features.notifications.PushRuleTriggerListener
+import im.vector.riotx.features.notifications.PushRuleTriggerListener
 
 fun Session.configureAndStart(pushRuleTriggerListener: PushRuleTriggerListener) {
     open()

vector/src/main/java/im/vector/riotx/core/extensions/TextView.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.extensions
+package im.vector.riotx.core.extensions
 
 import android.text.Spannable
 import android.text.SpannableString
@@ -23,7 +23,7 @@ import android.widget.TextView
 import androidx.annotation.AttrRes
 import androidx.annotation.StringRes
 import androidx.core.view.isVisible
-import im.vector.riotredesign.features.themes.ThemeUtils
+import im.vector.riotx.features.themes.ThemeUtils
 
 
 /**

vector/src/main/java/im/vector/riotx/core/extensions/UrlExtensions.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.extensions
+package im.vector.riotx.core.extensions
 
 import java.net.URLEncoder
 

vector/src/main/java/im/vector/riotx/core/extensions/View.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.extensions
+package im.vector.riotx.core.extensions
 
 import android.content.Context
 import android.view.View

vector/src/main/java/im/vector/riotx/core/extensions/ViewExtensions.kt

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.extensions
+package im.vector.riotx.core.extensions
 
 import android.text.InputType
 import android.view.View
 import android.view.ViewGroup
 import android.widget.EditText
 import androidx.appcompat.widget.SearchView
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 
 /**
  * Remove left margin of a SearchView

vector/src/main/java/im/vector/riotx/core/files/FileSaver.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.files
+package im.vector.riotx.core.files
 
 import android.app.DownloadManager
 import android.content.Context

vector/src/main/java/im/vector/riotx/core/glide/ElementToDecryptOption.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.glide
+package im.vector.riotx.core.glide
 
 import com.bumptech.glide.load.Option
 import im.vector.matrix.android.internal.crypto.attachments.ElementToDecrypt

vector/src/main/java/im/vector/riotx/core/glide/MyAppGlideModule.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.glide
+package im.vector.riotx.core.glide
 
 import android.content.Context
 import android.util.Log
@@ -24,8 +24,8 @@ import com.bumptech.glide.GlideBuilder
 import com.bumptech.glide.Registry
 import com.bumptech.glide.annotation.GlideModule
 import com.bumptech.glide.module.AppGlideModule
-import im.vector.riotredesign.core.extensions.vectorComponent
-import im.vector.riotredesign.features.media.ImageContentRenderer
+import im.vector.riotx.core.extensions.vectorComponent
+import im.vector.riotx.features.media.ImageContentRenderer
 import java.io.InputStream
 
 @GlideModule

vector/src/main/java/im/vector/riotx/core/glide/VectorGlideModelLoader.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.glide
+package im.vector.riotx.core.glide
 
 import com.bumptech.glide.Priority
 import com.bumptech.glide.load.DataSource
@@ -25,8 +25,8 @@ import com.bumptech.glide.load.model.ModelLoaderFactory
 import com.bumptech.glide.load.model.MultiModelLoaderFactory
 import com.bumptech.glide.signature.ObjectKey
 import im.vector.matrix.android.internal.crypto.attachments.MXEncryptedAttachments
-import im.vector.riotredesign.core.di.ActiveSessionHolder
-import im.vector.riotredesign.features.media.ImageContentRenderer
+import im.vector.riotx.core.di.ActiveSessionHolder
+import im.vector.riotx.features.media.ImageContentRenderer
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import timber.log.Timber

vector/src/main/java/im/vector/riotx/core/intent/ExternalIntentAnalyser.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.intent
+package im.vector.riotx.core.intent
 
 import android.content.ClipData
 import android.content.ClipDescription

vector/src/main/java/im/vector/riotx/core/intent/Filename.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.intent
+package im.vector.riotx.core.intent
 
 import android.content.Context
 import android.database.Cursor

vector/src/main/java/im/vector/riotx/core/intent/VectorMimeType.kt

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.intent
+package im.vector.riotx.core.intent
 
 import android.content.Context
 import android.net.Uri
 import android.webkit.MimeTypeMap
-import im.vector.riotredesign.core.utils.getFileExtension
+import im.vector.riotx.core.utils.getFileExtension
 import timber.log.Timber
 
 /**

vector/src/main/java/im/vector/riotx/core/linkify/VectorAutoLinkPatterns.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.core.linkify
+package im.vector.riotx.core.linkify
 
 import java.util.regex.Pattern
 

vector/src/main/java/im/vector/riotx/core/linkify/VectorLinkify.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package im.vector.riotredesign.core.linkify
+package im.vector.riotx.core.linkify
 
 import android.text.Spannable
 import android.text.style.URLSpan

vector/src/main/java/im/vector/riotx/core/mvrx/NavigationViewModel.kt

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.mvrx
+package im.vector.riotx.core.mvrx
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import im.vector.riotredesign.core.utils.LiveEvent
+import im.vector.riotx.core.utils.LiveEvent
 
 abstract class NavigationViewModel<NavigationClass> : ViewModel() {
 

vector/src/main/java/im/vector/riotx/core/platform/ButtonStateView.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.platform
+package im.vector.riotx.core.platform
 
 import android.content.Context
 import android.util.AttributeSet
@@ -24,7 +24,7 @@ import android.widget.Button
 import android.widget.FrameLayout
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
-import im.vector.riotredesign.R
+import im.vector.riotx.R
 import kotlinx.android.synthetic.main.view_button_state.view.*
 
 class ButtonStateView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0)

vector/src/main/java/im/vector/riotx/core/platform/CheckableConstraintLayout.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.platform
+package im.vector.riotx.core.platform
 
 import android.content.Context
 import android.util.AttributeSet

vector/src/main/java/im/vector/riotx/core/platform/CheckableFrameLayout.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.platform
+package im.vector.riotx.core.platform
 
 import android.content.Context
 import android.util.AttributeSet

vector/src/main/java/im/vector/riotx/core/platform/CheckableView.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.platform
+package im.vector.riotx.core.platform
 
 import android.content.Context
 import android.util.AttributeSet

vector/src/main/java/im/vector/riotx/core/platform/ConfigurationViewModel.kt

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.platform
+package im.vector.riotx.core.platform
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import im.vector.riotredesign.core.utils.LiveEvent
-import im.vector.riotredesign.features.configuration.VectorConfiguration
+import im.vector.riotx.core.utils.LiveEvent
+import im.vector.riotx.features.configuration.VectorConfiguration
 import timber.log.Timber
 import javax.inject.Inject
 

vector/src/main/java/im/vector/riotx/core/platform/DefaultListUpdateCallback.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotredesign.core.platform
+package im.vector.riotx.core.platform
 
 import androidx.recyclerview.widget.ListUpdateCallback