diff --git a/tools/check/forbidden_strings_in_resources.txt b/tools/check/forbidden_strings_in_resources.txt index 120438ef..435a81e3 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/vector/src/debug/java/im/vector/riotredesign/features/debug/DebugMaterialThemeActivity.kt b/vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeActivity.kt similarity index 94% rename from vector/src/debug/java/im/vector/riotredesign/features/debug/DebugMaterialThemeActivity.kt rename to vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeActivity.kt index 475427fe..ab6b8680 100644 --- a/vector/src/debug/java/im/vector/riotredesign/features/debug/DebugMaterialThemeActivity.kt +++ b/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 diff --git a/vector/src/debug/java/im/vector/riotredesign/features/debug/DebugMaterialThemeDarkActivity.kt b/vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeDarkActivity.kt similarity index 93% rename from vector/src/debug/java/im/vector/riotredesign/features/debug/DebugMaterialThemeDarkActivity.kt rename to vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeDarkActivity.kt index bab21417..83c3266c 100644 --- a/vector/src/debug/java/im/vector/riotredesign/features/debug/DebugMaterialThemeDarkActivity.kt +++ b/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() \ No newline at end of file diff --git a/vector/src/debug/java/im/vector/riotredesign/features/debug/DebugMaterialThemeLightActivity.kt b/vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeLightActivity.kt similarity index 93% rename from vector/src/debug/java/im/vector/riotredesign/features/debug/DebugMaterialThemeLightActivity.kt rename to vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeLightActivity.kt index 039d7c07..d7e6fd1f 100644 --- a/vector/src/debug/java/im/vector/riotredesign/features/debug/DebugMaterialThemeLightActivity.kt +++ b/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() \ No newline at end of file diff --git a/vector/src/debug/java/im/vector/riotredesign/features/debug/DebugMenuActivity.kt b/vector/src/debug/java/im/vector/riotx/features/debug/DebugMenuActivity.kt similarity index 97% rename from vector/src/debug/java/im/vector/riotredesign/features/debug/DebugMenuActivity.kt rename to vector/src/debug/java/im/vector/riotx/features/debug/DebugMenuActivity.kt index add4e2da..dc81d566 100644 --- a/vector/src/debug/java/im/vector/riotredesign/features/debug/DebugMenuActivity.kt +++ b/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() { diff --git a/vector/src/debug/java/im/vector/riotredesign/features/debug/TestLinkifyActivity.kt b/vector/src/debug/java/im/vector/riotx/features/debug/TestLinkifyActivity.kt similarity index 98% rename from vector/src/debug/java/im/vector/riotredesign/features/debug/TestLinkifyActivity.kt rename to vector/src/debug/java/im/vector/riotx/features/debug/TestLinkifyActivity.kt index 7e37c319..b91f5db7 100644 --- a/vector/src/debug/java/im/vector/riotredesign/features/debug/TestLinkifyActivity.kt +++ b/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() { diff --git a/vector/src/debug/java/im/vector/riotredesign/receivers/DebugReceiver.kt b/vector/src/debug/java/im/vector/riotx/receivers/DebugReceiver.kt similarity index 96% rename from vector/src/debug/java/im/vector/riotredesign/receivers/DebugReceiver.kt rename to vector/src/debug/java/im/vector/riotx/receivers/DebugReceiver.kt index bdafeedc..933ee3fb 100644 --- a/vector/src/debug/java/im/vector/riotredesign/receivers/DebugReceiver.kt +++ b/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 /** diff --git a/vector/src/debug/res/layout/activity_debug_menu.xml b/vector/src/debug/res/layout/activity_debug_menu.xml index d1e85019..af5362e8 100644 --- a/vector/src/debug/res/layout/activity_debug_menu.xml +++ b/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"> + tools:context="im.vector.riotx.features.debug.TestLinkifyActivity"> + package="im.vector.riotx"> @@ -8,7 +8,7 @@ - + @@ -16,7 +16,7 @@ diff --git a/vector/src/fdroid/java/im/vector/riotredesign/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt b/vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt similarity index 84% rename from vector/src/fdroid/java/im/vector/riotredesign/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt rename to vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt index adc2d00c..47e87aa4 100644 --- a/vector/src/fdroid/java/im/vector/riotredesign/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt +++ b/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 /** diff --git a/vector/src/fdroid/java/im/vector/riotredesign/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt b/vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt similarity index 93% rename from vector/src/fdroid/java/im/vector/riotredesign/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt rename to vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt index c124864a..ce9066c2 100644 --- a/vector/src/fdroid/java/im/vector/riotredesign/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt +++ b/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, diff --git a/vector/src/fdroid/java/im/vector/riotredesign/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt b/vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt similarity index 79% rename from vector/src/fdroid/java/im/vector/riotredesign/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt rename to vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt index 4cfd762f..041f392c 100644 --- a/vector/src/fdroid/java/im/vector/riotredesign/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt +++ b/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) { diff --git a/vector/src/fdroid/java/im/vector/riotredesign/fdroid/package-info.kt b/vector/src/fdroid/java/im/vector/riotx/fdroid/package-info.kt similarity index 94% rename from vector/src/fdroid/java/im/vector/riotredesign/fdroid/package-info.kt rename to vector/src/fdroid/java/im/vector/riotx/fdroid/package-info.kt index 9873a280..7e0e1123 100644 --- a/vector/src/fdroid/java/im/vector/riotredesign/fdroid/package-info.kt +++ b/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 \ No newline at end of file +package im.vector.riotx.fdroid \ No newline at end of file diff --git a/vector/src/fdroid/java/im/vector/riotredesign/fdroid/receiver/AlarmSyncBroadcastReceiver.kt b/vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/AlarmSyncBroadcastReceiver.kt similarity index 96% rename from vector/src/fdroid/java/im/vector/riotredesign/fdroid/receiver/AlarmSyncBroadcastReceiver.kt rename to vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/AlarmSyncBroadcastReceiver.kt index 5d335c54..2c0738c2 100644 --- a/vector/src/fdroid/java/im/vector/riotredesign/fdroid/receiver/AlarmSyncBroadcastReceiver.kt +++ b/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() { diff --git a/vector/src/fdroid/java/im/vector/riotredesign/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt b/vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt similarity index 92% rename from vector/src/fdroid/java/im/vector/riotredesign/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt rename to vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt index ca19d0d2..207776b5 100644 --- a/vector/src/fdroid/java/im/vector/riotredesign/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt +++ b/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() { diff --git a/vector/src/fdroid/java/im/vector/riotredesign/fdroid/service/VectorSyncService.kt b/vector/src/fdroid/java/im/vector/riotx/fdroid/service/VectorSyncService.kt similarity index 91% rename from vector/src/fdroid/java/im/vector/riotredesign/fdroid/service/VectorSyncService.kt rename to vector/src/fdroid/java/im/vector/riotx/fdroid/service/VectorSyncService.kt index 0c3b3c5c..a3f999a0 100644 --- a/vector/src/fdroid/java/im/vector/riotredesign/fdroid/service/VectorSyncService.kt +++ b/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() { diff --git a/vector/src/fdroid/java/im/vector/riotredesign/push/fcm/FcmHelper.kt b/vector/src/fdroid/java/im/vector/riotx/push/fcm/FcmHelper.kt similarity index 87% rename from vector/src/fdroid/java/im/vector/riotredesign/push/fcm/FcmHelper.kt rename to vector/src/fdroid/java/im/vector/riotx/push/fcm/FcmHelper.kt index fb3c00de..5293c59b 100755 --- a/vector/src/fdroid/java/im/vector/riotredesign/push/fcm/FcmHelper.kt +++ b/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 /** diff --git a/vector/src/fdroid/java/im/vector/riotredesign/push/fcm/NotificationTroubleshootTestManagerFactory.kt b/vector/src/fdroid/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt similarity index 86% rename from vector/src/fdroid/java/im/vector/riotredesign/push/fcm/NotificationTroubleshootTestManagerFactory.kt rename to vector/src/fdroid/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt index f55d9b8e..e90ef5aa 100644 --- a/vector/src/fdroid/java/im/vector/riotredesign/push/fcm/NotificationTroubleshootTestManagerFactory.kt +++ b/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, diff --git a/vector/src/gplay/AndroidManifest.xml b/vector/src/gplay/AndroidManifest.xml index 8f6a1cef..db30f21f 100755 --- a/vector/src/gplay/AndroidManifest.xml +++ b/vector/src/gplay/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="im.vector.riotx"> diff --git a/vector/src/gplay/google-services.json b/vector/src/gplay/google-services.json index 187c727a..7ee7277e 100644 --- a/vector/src/gplay/google-services.json +++ b/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": [ diff --git a/vector/src/gplay/java/im/vector/riotredesign/gplay/features/settings/troubleshoot/TestFirebaseToken.kt b/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestFirebaseToken.kt similarity index 89% rename from vector/src/gplay/java/im/vector/riotredesign/gplay/features/settings/troubleshoot/TestFirebaseToken.kt rename to vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestFirebaseToken.kt index 78b4e4df..4d35c904 100644 --- a/vector/src/gplay/java/im/vector/riotredesign/gplay/features/settings/troubleshoot/TestFirebaseToken.kt +++ b/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 diff --git a/vector/src/gplay/java/im/vector/riotredesign/gplay/features/settings/troubleshoot/TestPlayServices.kt b/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestPlayServices.kt similarity index 90% rename from vector/src/gplay/java/im/vector/riotredesign/gplay/features/settings/troubleshoot/TestPlayServices.kt rename to vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestPlayServices.kt index f99787c6..e97f3cea 100644 --- a/vector/src/gplay/java/im/vector/riotredesign/gplay/features/settings/troubleshoot/TestPlayServices.kt +++ b/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 diff --git a/vector/src/gplay/java/im/vector/riotredesign/gplay/features/settings/troubleshoot/TestTokenRegistration.kt b/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestTokenRegistration.kt similarity index 88% rename from vector/src/gplay/java/im/vector/riotredesign/gplay/features/settings/troubleshoot/TestTokenRegistration.kt rename to vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestTokenRegistration.kt index 8e4c923d..b7b49940 100644 --- a/vector/src/gplay/java/im/vector/riotredesign/gplay/features/settings/troubleshoot/TestTokenRegistration.kt +++ b/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 /** diff --git a/vector/src/gplay/java/im/vector/riotredesign/gplay/package-info.kt b/vector/src/gplay/java/im/vector/riotx/gplay/package-info.kt similarity index 94% rename from vector/src/gplay/java/im/vector/riotredesign/gplay/package-info.kt rename to vector/src/gplay/java/im/vector/riotx/gplay/package-info.kt index 60938525..177fb56f 100644 --- a/vector/src/gplay/java/im/vector/riotredesign/gplay/package-info.kt +++ b/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 diff --git a/vector/src/gplay/java/im/vector/riotredesign/gplay/push/fcm/VectorFirebaseMessagingService.kt b/vector/src/gplay/java/im/vector/riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt similarity index 92% rename from vector/src/gplay/java/im/vector/riotredesign/gplay/push/fcm/VectorFirebaseMessagingService.kt rename to vector/src/gplay/java/im/vector/riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt index 177b2346..0be66b17 100755 --- a/vector/src/gplay/java/im/vector/riotredesign/gplay/push/fcm/VectorFirebaseMessagingService.kt +++ b/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. diff --git a/vector/src/gplay/java/im/vector/riotredesign/push/fcm/FcmHelper.kt b/vector/src/gplay/java/im/vector/riotx/push/fcm/FcmHelper.kt similarity index 95% rename from vector/src/gplay/java/im/vector/riotredesign/push/fcm/FcmHelper.kt rename to vector/src/gplay/java/im/vector/riotx/push/fcm/FcmHelper.kt index ca807f36..c19aa561 100755 --- a/vector/src/gplay/java/im/vector/riotredesign/push/fcm/FcmHelper.kt +++ b/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 /** diff --git a/vector/src/gplay/java/im/vector/riotredesign/push/fcm/NotificationTroubleshootTestManagerFactory.kt b/vector/src/gplay/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt similarity index 73% rename from vector/src/gplay/java/im/vector/riotredesign/push/fcm/NotificationTroubleshootTestManagerFactory.kt rename to vector/src/gplay/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt index d7459b7e..3d2e45fe 100644 --- a/vector/src/gplay/java/im/vector/riotredesign/push/fcm/NotificationTroubleshootTestManagerFactory.kt +++ b/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, diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml index 8fa24217..7e5242ab 100644 --- a/vector/src/main/AndroidManifest.xml +++ b/vector/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="im.vector.riotx"> @@ -46,13 +46,13 @@ android:name=".features.crypto.verification.SASVerificationActivity" android:label="@string/title_activity_verify_device" /> (context, R.layout.item_dialog) { diff --git a/vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogCallAdapter.kt b/vector/src/main/java/im/vector/riotx/core/dialogs/DialogCallAdapter.kt similarity index 83% rename from vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogCallAdapter.kt rename to vector/src/main/java/im/vector/riotx/core/dialogs/DialogCallAdapter.kt index 5f0a954d..0b0499a6 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogCallAdapter.kt +++ b/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) { diff --git a/vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogListItem.kt b/vector/src/main/java/im/vector/riotx/core/dialogs/DialogListItem.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogListItem.kt rename to vector/src/main/java/im/vector/riotx/core/dialogs/DialogListItem.kt index d070b526..1486e870 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogListItem.kt +++ b/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) { diff --git a/vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogListItemHolder.kt b/vector/src/main/java/im/vector/riotx/core/dialogs/DialogListItemHolder.kt similarity index 92% rename from vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogListItemHolder.kt rename to vector/src/main/java/im/vector/riotx/core/dialogs/DialogListItemHolder.kt index f6ec5522..af8456ba 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogListItemHolder.kt +++ b/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) { diff --git a/vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogLocker.kt b/vector/src/main/java/im/vector/riotx/core/dialogs/DialogLocker.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogLocker.kt rename to vector/src/main/java/im/vector/riotx/core/dialogs/DialogLocker.kt index 19e75ce0..5418e227 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogLocker.kt +++ b/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" diff --git a/vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogSendItemAdapter.kt b/vector/src/main/java/im/vector/riotx/core/dialogs/DialogSendItemAdapter.kt similarity index 83% rename from vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogSendItemAdapter.kt rename to vector/src/main/java/im/vector/riotx/core/dialogs/DialogSendItemAdapter.kt index e1acddea..8689168e 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/dialogs/DialogSendItemAdapter.kt +++ b/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) : DialogAdapter(context) { diff --git a/vector/src/main/java/im/vector/riotredesign/core/dialogs/ExportKeysDialog.kt b/vector/src/main/java/im/vector/riotx/core/dialogs/ExportKeysDialog.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/core/dialogs/ExportKeysDialog.kt rename to vector/src/main/java/im/vector/riotx/core/dialogs/ExportKeysDialog.kt index 22ec2f90..25b2bb10 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/dialogs/ExportKeysDialog.kt +++ b/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 { diff --git a/vector/src/main/java/im/vector/riotredesign/core/epoxy/EmptyItem.kt b/vector/src/main/java/im/vector/riotx/core/epoxy/EmptyItem.kt similarity index 91% rename from vector/src/main/java/im/vector/riotredesign/core/epoxy/EmptyItem.kt rename to vector/src/main/java/im/vector/riotx/core/epoxy/EmptyItem.kt index 6ed5026b..32d7183c 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/epoxy/EmptyItem.kt +++ b/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() { diff --git a/vector/src/main/java/im/vector/riotredesign/core/epoxy/ErrorWithRetryItem.kt b/vector/src/main/java/im/vector/riotx/core/epoxy/ErrorWithRetryItem.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/core/epoxy/ErrorWithRetryItem.kt rename to vector/src/main/java/im/vector/riotx/core/epoxy/ErrorWithRetryItem.kt index f3902856..857de071 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/epoxy/ErrorWithRetryItem.kt +++ b/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() { diff --git a/vector/src/main/java/im/vector/riotredesign/core/epoxy/LayoutManagerStateRestorer.kt b/vector/src/main/java/im/vector/riotx/core/epoxy/LayoutManagerStateRestorer.kt similarity index 90% rename from vector/src/main/java/im/vector/riotredesign/core/epoxy/LayoutManagerStateRestorer.kt rename to vector/src/main/java/im/vector/riotx/core/epoxy/LayoutManagerStateRestorer.kt index b4b9f181..d6e149cd 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/epoxy/LayoutManagerStateRestorer.kt +++ b/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" diff --git a/vector/src/main/java/im/vector/riotredesign/core/epoxy/LoadingItem.kt b/vector/src/main/java/im/vector/riotx/core/epoxy/LoadingItem.kt similarity index 89% rename from vector/src/main/java/im/vector/riotredesign/core/epoxy/LoadingItem.kt rename to vector/src/main/java/im/vector/riotx/core/epoxy/LoadingItem.kt index 2ee016ef..332025b5 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/epoxy/LoadingItem.kt +++ b/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() { diff --git a/vector/src/main/java/im/vector/riotredesign/core/epoxy/NoResultItem.kt b/vector/src/main/java/im/vector/riotx/core/epoxy/NoResultItem.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/core/epoxy/NoResultItem.kt rename to vector/src/main/java/im/vector/riotx/core/epoxy/NoResultItem.kt index 036ed36b..d373d5c6 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/epoxy/NoResultItem.kt +++ b/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() { diff --git a/vector/src/main/java/im/vector/riotredesign/core/epoxy/VectorEpoxyHolder.kt b/vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyHolder.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/core/epoxy/VectorEpoxyHolder.kt rename to vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyHolder.kt index 7c6f200b..e9d21977 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/epoxy/VectorEpoxyHolder.kt +++ b/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 diff --git a/vector/src/main/java/im/vector/riotredesign/core/epoxy/VectorEpoxyModel.kt b/vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyModel.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/core/epoxy/VectorEpoxyModel.kt rename to vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyModel.kt index 16c2401d..83dce44d 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/epoxy/VectorEpoxyModel.kt +++ b/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 diff --git a/vector/src/main/java/im/vector/riotredesign/core/error/ErrorFormatter.kt b/vector/src/main/java/im/vector/riotx/core/error/ErrorFormatter.kt similarity index 89% rename from vector/src/main/java/im/vector/riotredesign/core/error/ErrorFormatter.kt rename to vector/src/main/java/im/vector/riotx/core/error/ErrorFormatter.kt index 284bd192..7619d433 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/error/ErrorFormatter.kt +++ b/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) { diff --git a/vector/src/main/java/im/vector/riotredesign/core/extensions/Activity.kt b/vector/src/main/java/im/vector/riotx/core/extensions/Activity.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/core/extensions/Activity.kt rename to vector/src/main/java/im/vector/riotx/core/extensions/Activity.kt index 78796d5e..75817779 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/extensions/Activity.kt +++ b/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 diff --git a/vector/src/main/java/im/vector/riotredesign/core/extensions/BasicExtensions.kt b/vector/src/main/java/im/vector/riotx/core/extensions/BasicExtensions.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/core/extensions/BasicExtensions.kt rename to vector/src/main/java/im/vector/riotx/core/extensions/BasicExtensions.kt index 50c9b4d4..4de2cc00 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/extensions/BasicExtensions.kt +++ b/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 diff --git a/vector/src/main/java/im/vector/riotredesign/core/extensions/Context.kt b/vector/src/main/java/im/vector/riotx/core/extensions/Context.kt similarity index 85% rename from vector/src/main/java/im/vector/riotredesign/core/extensions/Context.kt rename to vector/src/main/java/im/vector/riotx/core/extensions/Context.kt index f9b30a47..e78acf09 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/extensions/Context.kt +++ b/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 diff --git a/vector/src/main/java/im/vector/riotredesign/core/extensions/EditText.kt b/vector/src/main/java/im/vector/riotx/core/extensions/EditText.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/core/extensions/EditText.kt rename to vector/src/main/java/im/vector/riotx/core/extensions/EditText.kt index e4069020..ecc7795a 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/extensions/EditText.kt +++ b/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 { diff --git a/vector/src/main/java/im/vector/riotredesign/core/extensions/Event.kt b/vector/src/main/java/im/vector/riotx/core/extensions/Event.kt similarity index 88% rename from vector/src/main/java/im/vector/riotredesign/core/extensions/Event.kt rename to vector/src/main/java/im/vector/riotx/core/extensions/Event.kt index d93877a6..e9c3703b 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/extensions/Event.kt +++ b/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 { diff --git a/vector/src/main/java/im/vector/riotredesign/core/extensions/Fragment.kt b/vector/src/main/java/im/vector/riotx/core/extensions/Fragment.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/core/extensions/Fragment.kt rename to vector/src/main/java/im/vector/riotx/core/extensions/Fragment.kt index e0eb4bac..65f8fb2a 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/extensions/Fragment.kt +++ b/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 diff --git a/vector/src/main/java/im/vector/riotredesign/core/extensions/FragmentManager.kt b/vector/src/main/java/im/vector/riotx/core/extensions/FragmentManager.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/core/extensions/FragmentManager.kt rename to vector/src/main/java/im/vector/riotx/core/extensions/FragmentManager.kt index 9d0134e5..d7db53d7 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/extensions/FragmentManager.kt +++ b/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 diff --git a/vector/src/main/java/im/vector/riotredesign/core/extensions/Iterable.kt b/vector/src/main/java/im/vector/riotx/core/extensions/Iterable.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/core/extensions/Iterable.kt rename to vector/src/main/java/im/vector/riotx/core/extensions/Iterable.kt index 8a3d63fc..a69b0ed8 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/extensions/Iterable.kt +++ b/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. diff --git a/vector/src/main/java/im/vector/riotredesign/core/extensions/LiveData.kt b/vector/src/main/java/im/vector/riotx/core/extensions/LiveData.kt similarity index 88% rename from vector/src/main/java/im/vector/riotredesign/core/extensions/LiveData.kt rename to vector/src/main/java/im/vector/riotx/core/extensions/LiveData.kt index 2bd40162..a6ab57fe 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/extensions/LiveData.kt +++ b/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 LiveData.observeK(owner: LifecycleOwner, crossinline observer: (T?) -> Unit) { this.observe(owner, Observer { observer(it) }) diff --git a/vector/src/main/java/im/vector/riotredesign/core/extensions/Session.kt b/vector/src/main/java/im/vector/riotx/core/extensions/Session.kt similarity index 90% rename from vector/src/main/java/im/vector/riotredesign/core/extensions/Session.kt rename to vector/src/main/java/im/vector/riotx/core/extensions/Session.kt index 65987a25..b03686d4 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/extensions/Session.kt +++ b/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() diff --git a/vector/src/main/java/im/vector/riotredesign/core/extensions/TextView.kt b/vector/src/main/java/im/vector/riotx/core/extensions/TextView.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/core/extensions/TextView.kt rename to vector/src/main/java/im/vector/riotx/core/extensions/TextView.kt index 0edcab46..3bece712 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/extensions/TextView.kt +++ b/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 /** diff --git a/vector/src/main/java/im/vector/riotredesign/core/extensions/UrlExtensions.kt b/vector/src/main/java/im/vector/riotx/core/extensions/UrlExtensions.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/core/extensions/UrlExtensions.kt rename to vector/src/main/java/im/vector/riotx/core/extensions/UrlExtensions.kt index e087c3fd..f9595e79 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/extensions/UrlExtensions.kt +++ b/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 diff --git a/vector/src/main/java/im/vector/riotredesign/core/extensions/View.kt b/vector/src/main/java/im/vector/riotx/core/extensions/View.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/core/extensions/View.kt rename to vector/src/main/java/im/vector/riotx/core/extensions/View.kt index d8799b3a..a5ce4d9f 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/extensions/View.kt +++ b/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 diff --git a/vector/src/main/java/im/vector/riotredesign/core/extensions/ViewExtensions.kt b/vector/src/main/java/im/vector/riotx/core/extensions/ViewExtensions.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/core/extensions/ViewExtensions.kt rename to vector/src/main/java/im/vector/riotx/core/extensions/ViewExtensions.kt index 99af0a38..c84f0992 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/extensions/ViewExtensions.kt +++ b/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 diff --git a/vector/src/main/java/im/vector/riotredesign/core/files/FileSaver.kt b/vector/src/main/java/im/vector/riotx/core/files/FileSaver.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/core/files/FileSaver.kt rename to vector/src/main/java/im/vector/riotx/core/files/FileSaver.kt index faefe014..23798587 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/files/FileSaver.kt +++ b/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 diff --git a/vector/src/main/java/im/vector/riotredesign/core/glide/ElementToDecryptOption.kt b/vector/src/main/java/im/vector/riotx/core/glide/ElementToDecryptOption.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/core/glide/ElementToDecryptOption.kt rename to vector/src/main/java/im/vector/riotx/core/glide/ElementToDecryptOption.kt index 79805029..abab8aec 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/glide/ElementToDecryptOption.kt +++ b/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 diff --git a/vector/src/main/java/im/vector/riotredesign/core/glide/MyAppGlideModule.kt b/vector/src/main/java/im/vector/riotx/core/glide/MyAppGlideModule.kt similarity index 88% rename from vector/src/main/java/im/vector/riotredesign/core/glide/MyAppGlideModule.kt rename to vector/src/main/java/im/vector/riotx/core/glide/MyAppGlideModule.kt index 54d3104c..09998347 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/glide/MyAppGlideModule.kt +++ b/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 diff --git a/vector/src/main/java/im/vector/riotredesign/core/glide/VectorGlideModelLoader.kt b/vector/src/main/java/im/vector/riotx/core/glide/VectorGlideModelLoader.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/core/glide/VectorGlideModelLoader.kt rename to vector/src/main/java/im/vector/riotx/core/glide/VectorGlideModelLoader.kt index dd62cedc..e2a3f3fd 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/glide/VectorGlideModelLoader.kt +++ b/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 diff --git a/vector/src/main/java/im/vector/riotredesign/core/intent/ExternalIntentAnalyser.kt b/vector/src/main/java/im/vector/riotx/core/intent/ExternalIntentAnalyser.kt similarity index 99% rename from vector/src/main/java/im/vector/riotredesign/core/intent/ExternalIntentAnalyser.kt rename to vector/src/main/java/im/vector/riotx/core/intent/ExternalIntentAnalyser.kt index 916662e3..b9bade2a 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/intent/ExternalIntentAnalyser.kt +++ b/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 diff --git a/vector/src/main/java/im/vector/riotredesign/core/intent/Filename.kt b/vector/src/main/java/im/vector/riotx/core/intent/Filename.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/core/intent/Filename.kt rename to vector/src/main/java/im/vector/riotx/core/intent/Filename.kt index 78a04716..2b8421f6 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/intent/Filename.kt +++ b/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 diff --git a/vector/src/main/java/im/vector/riotredesign/core/intent/VectorMimeType.kt b/vector/src/main/java/im/vector/riotx/core/intent/VectorMimeType.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/core/intent/VectorMimeType.kt rename to vector/src/main/java/im/vector/riotx/core/intent/VectorMimeType.kt index b801d2c2..110a89cc 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/intent/VectorMimeType.kt +++ b/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 /** diff --git a/vector/src/main/java/im/vector/riotredesign/core/linkify/VectorAutoLinkPatterns.kt b/vector/src/main/java/im/vector/riotx/core/linkify/VectorAutoLinkPatterns.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/core/linkify/VectorAutoLinkPatterns.kt rename to vector/src/main/java/im/vector/riotx/core/linkify/VectorAutoLinkPatterns.kt index af200a3f..ff083d4b 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/linkify/VectorAutoLinkPatterns.kt +++ b/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 diff --git a/vector/src/main/java/im/vector/riotredesign/core/linkify/VectorLinkify.kt b/vector/src/main/java/im/vector/riotx/core/linkify/VectorLinkify.kt similarity index 99% rename from vector/src/main/java/im/vector/riotredesign/core/linkify/VectorLinkify.kt rename to vector/src/main/java/im/vector/riotx/core/linkify/VectorLinkify.kt index 243c069c..8ff885eb 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/linkify/VectorLinkify.kt +++ b/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 diff --git a/vector/src/main/java/im/vector/riotredesign/core/mvrx/NavigationViewModel.kt b/vector/src/main/java/im/vector/riotx/core/mvrx/NavigationViewModel.kt similarity index 91% rename from vector/src/main/java/im/vector/riotredesign/core/mvrx/NavigationViewModel.kt rename to vector/src/main/java/im/vector/riotx/core/mvrx/NavigationViewModel.kt index 87b09c37..ab3ce7c8 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/mvrx/NavigationViewModel.kt +++ b/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 : ViewModel() { diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/ButtonStateView.kt b/vector/src/main/java/im/vector/riotx/core/platform/ButtonStateView.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/core/platform/ButtonStateView.kt rename to vector/src/main/java/im/vector/riotx/core/platform/ButtonStateView.kt index f9aaf0d0..9753b266 100755 --- a/vector/src/main/java/im/vector/riotredesign/core/platform/ButtonStateView.kt +++ b/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) diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/CheckableConstraintLayout.kt b/vector/src/main/java/im/vector/riotx/core/platform/CheckableConstraintLayout.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/core/platform/CheckableConstraintLayout.kt rename to vector/src/main/java/im/vector/riotx/core/platform/CheckableConstraintLayout.kt index 3ecc707d..72ccf997 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/platform/CheckableConstraintLayout.kt +++ b/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 diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/CheckableFrameLayout.kt b/vector/src/main/java/im/vector/riotx/core/platform/CheckableFrameLayout.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/core/platform/CheckableFrameLayout.kt rename to vector/src/main/java/im/vector/riotx/core/platform/CheckableFrameLayout.kt index efc56fd2..1c0329b9 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/platform/CheckableFrameLayout.kt +++ b/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 diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/CheckableView.kt b/vector/src/main/java/im/vector/riotx/core/platform/CheckableView.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/core/platform/CheckableView.kt rename to vector/src/main/java/im/vector/riotx/core/platform/CheckableView.kt index a590dda5..0f81f7e4 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/platform/CheckableView.kt +++ b/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 diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/ConfigurationViewModel.kt b/vector/src/main/java/im/vector/riotx/core/platform/ConfigurationViewModel.kt similarity index 91% rename from vector/src/main/java/im/vector/riotredesign/core/platform/ConfigurationViewModel.kt rename to vector/src/main/java/im/vector/riotx/core/platform/ConfigurationViewModel.kt index 24fa889b..bb2db5cb 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/platform/ConfigurationViewModel.kt +++ b/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 diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/DefaultListUpdateCallback.kt b/vector/src/main/java/im/vector/riotx/core/platform/DefaultListUpdateCallback.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/core/platform/DefaultListUpdateCallback.kt rename to vector/src/main/java/im/vector/riotx/core/platform/DefaultListUpdateCallback.kt index c5a4be92..c61cd108 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/platform/DefaultListUpdateCallback.kt +++ b/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 diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/OnBackPressed.kt b/vector/src/main/java/im/vector/riotx/core/platform/OnBackPressed.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/core/platform/OnBackPressed.kt rename to vector/src/main/java/im/vector/riotx/core/platform/OnBackPressed.kt index 46f51be7..1226ed3e 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/platform/OnBackPressed.kt +++ b/vector/src/main/java/im/vector/riotx/core/platform/OnBackPressed.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.core.platform +package im.vector.riotx.core.platform interface OnBackPressed { diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/Restorable.kt b/vector/src/main/java/im/vector/riotx/core/platform/Restorable.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/core/platform/Restorable.kt rename to vector/src/main/java/im/vector/riotx/core/platform/Restorable.kt index 683fed73..3d720f69 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/platform/Restorable.kt +++ b/vector/src/main/java/im/vector/riotx/core/platform/Restorable.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.core.platform +package im.vector.riotx.core.platform import android.os.Bundle diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/SimpleFragmentActivity.kt b/vector/src/main/java/im/vector/riotx/core/platform/SimpleFragmentActivity.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/core/platform/SimpleFragmentActivity.kt rename to vector/src/main/java/im/vector/riotx/core/platform/SimpleFragmentActivity.kt index b02b2cb8..546937da 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/platform/SimpleFragmentActivity.kt +++ b/vector/src/main/java/im/vector/riotx/core/platform/SimpleFragmentActivity.kt @@ -13,9 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.core.platform +package im.vector.riotx.core.platform -import android.os.Bundle import android.view.View import android.widget.ProgressBar import android.widget.TextView @@ -23,9 +22,9 @@ import androidx.core.view.isGone import androidx.core.view.isVisible import butterknife.BindView import im.vector.matrix.android.api.session.Session -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.extensions.hideKeyboard +import im.vector.riotx.R +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.extensions.hideKeyboard import kotlinx.android.synthetic.main.activity.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/SimpleTextWatcher.kt b/vector/src/main/java/im/vector/riotx/core/platform/SimpleTextWatcher.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/core/platform/SimpleTextWatcher.kt rename to vector/src/main/java/im/vector/riotx/core/platform/SimpleTextWatcher.kt index d2229542..e54a6d29 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/platform/SimpleTextWatcher.kt +++ b/vector/src/main/java/im/vector/riotx/core/platform/SimpleTextWatcher.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.core.platform +package im.vector.riotx.core.platform import android.text.Editable import android.text.TextWatcher diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/StateView.kt b/vector/src/main/java/im/vector/riotx/core/platform/StateView.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/core/platform/StateView.kt rename to vector/src/main/java/im/vector/riotx/core/platform/StateView.kt index cdffd22c..c818f709 100755 --- a/vector/src/main/java/im/vector/riotredesign/core/platform/StateView.kt +++ b/vector/src/main/java/im/vector/riotx/core/platform/StateView.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotredesign.core.platform +package im.vector.riotx.core.platform import android.content.Context import android.graphics.drawable.Drawable import android.util.AttributeSet import android.view.View import android.widget.FrameLayout -import im.vector.riotredesign.R +import im.vector.riotx.R import kotlinx.android.synthetic.main.view_state.view.* class StateView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0) diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/ToolbarConfigurable.kt b/vector/src/main/java/im/vector/riotx/core/platform/ToolbarConfigurable.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/core/platform/ToolbarConfigurable.kt rename to vector/src/main/java/im/vector/riotx/core/platform/ToolbarConfigurable.kt index 2b417242..dc356620 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/platform/ToolbarConfigurable.kt +++ b/vector/src/main/java/im/vector/riotx/core/platform/ToolbarConfigurable.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.core.platform +package im.vector.riotx.core.platform import androidx.appcompat.widget.Toolbar diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseActivity.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseActivity.kt rename to vector/src/main/java/im/vector/riotx/core/platform/VectorBaseActivity.kt index d07c2632..74bff9e5 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseActivity.kt +++ b/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseActivity.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.content.res.Configuration @@ -40,17 +40,17 @@ import butterknife.Unbinder import com.airbnb.mvrx.BaseMvRxActivity import com.bumptech.glide.util.Util import com.google.android.material.snackbar.Snackbar -import im.vector.riotredesign.BuildConfig -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.* -import im.vector.riotredesign.core.utils.toast -import im.vector.riotredesign.features.configuration.VectorConfiguration -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.themes.ActivityOtherThemes -import im.vector.riotredesign.features.themes.ThemeUtils -import im.vector.riotredesign.receivers.DebugReceiver +import im.vector.riotx.BuildConfig +import im.vector.riotx.R +import im.vector.riotx.core.di.* +import im.vector.riotx.core.utils.toast +import im.vector.riotx.features.configuration.VectorConfiguration +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.themes.ActivityOtherThemes +import im.vector.riotx.features.themes.ThemeUtils +import im.vector.riotx.receivers.DebugReceiver import io.reactivex.disposables.CompositeDisposable import io.reactivex.disposables.Disposable import timber.log.Timber diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseFragment.kt b/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseFragment.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseFragment.kt rename to vector/src/main/java/im/vector/riotx/core/platform/VectorBaseFragment.kt index 39b26741..ec5e419d 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseFragment.kt +++ b/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseFragment.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.os.Bundle @@ -34,10 +34,10 @@ import butterknife.Unbinder import com.airbnb.mvrx.BaseMvRxFragment import com.airbnb.mvrx.MvRx import com.bumptech.glide.util.Util.assertMainThread -import im.vector.riotredesign.core.di.DaggerScreenComponent -import im.vector.riotredesign.core.di.HasScreenInjector -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.features.navigation.Navigator +import im.vector.riotx.core.di.DaggerScreenComponent +import im.vector.riotx.core.di.HasScreenInjector +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.features.navigation.Navigator import io.reactivex.disposables.CompositeDisposable import io.reactivex.disposables.Disposable import timber.log.Timber diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/VectorPreferenceFragment.kt b/vector/src/main/java/im/vector/riotx/core/platform/VectorPreferenceFragment.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/core/platform/VectorPreferenceFragment.kt rename to vector/src/main/java/im/vector/riotx/core/platform/VectorPreferenceFragment.kt index ddd90809..b543a983 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/platform/VectorPreferenceFragment.kt +++ b/vector/src/main/java/im/vector/riotx/core/platform/VectorPreferenceFragment.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotredesign.core.platform +package im.vector.riotx.core.platform import androidx.annotation.CallSuper import androidx.preference.PreferenceFragmentCompat -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 timber.log.Timber abstract class VectorPreferenceFragment : PreferenceFragmentCompat() { diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/VectorViewModel.kt b/vector/src/main/java/im/vector/riotx/core/platform/VectorViewModel.kt similarity index 90% rename from vector/src/main/java/im/vector/riotredesign/core/platform/VectorViewModel.kt rename to vector/src/main/java/im/vector/riotx/core/platform/VectorViewModel.kt index a74ab33c..0bd823d2 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/platform/VectorViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/core/platform/VectorViewModel.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package im.vector.riotredesign.core.platform +package im.vector.riotx.core.platform import com.airbnb.mvrx.BaseMvRxViewModel import com.airbnb.mvrx.MvRxState -import im.vector.riotredesign.BuildConfig +import im.vector.riotx.BuildConfig abstract class VectorViewModel(initialState: S) : BaseMvRxViewModel(initialState, debugMode = BuildConfig.DEBUG) \ No newline at end of file diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/WaitingViewData.kt b/vector/src/main/java/im/vector/riotx/core/platform/WaitingViewData.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/core/platform/WaitingViewData.kt rename to vector/src/main/java/im/vector/riotx/core/platform/WaitingViewData.kt index 00191007..9a079a6c 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/platform/WaitingViewData.kt +++ b/vector/src/main/java/im/vector/riotx/core/platform/WaitingViewData.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.core.platform +package im.vector.riotx.core.platform /** * Model to display a Waiting View diff --git a/vector/src/main/java/im/vector/riotredesign/core/preference/AddressPreference.kt b/vector/src/main/java/im/vector/riotx/core/preference/AddressPreference.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/core/preference/AddressPreference.kt rename to vector/src/main/java/im/vector/riotx/core/preference/AddressPreference.kt index e3fb1a07..2516bbfa 100755 --- a/vector/src/main/java/im/vector/riotredesign/core/preference/AddressPreference.kt +++ b/vector/src/main/java/im/vector/riotx/core/preference/AddressPreference.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotredesign.core.preference +package im.vector.riotx.core.preference import android.content.Context import android.util.AttributeSet import android.view.View import android.widget.ImageView import androidx.preference.PreferenceViewHolder -import im.vector.riotredesign.R +import im.vector.riotx.R /** * Preference used in Room setting for Room aliases diff --git a/vector/src/main/java/im/vector/riotredesign/core/preference/BingRulePreference.kt b/vector/src/main/java/im/vector/riotx/core/preference/BingRulePreference.kt similarity index 99% rename from vector/src/main/java/im/vector/riotredesign/core/preference/BingRulePreference.kt rename to vector/src/main/java/im/vector/riotx/core/preference/BingRulePreference.kt index 9a17390b..a0478169 100755 --- a/vector/src/main/java/im/vector/riotredesign/core/preference/BingRulePreference.kt +++ b/vector/src/main/java/im/vector/riotx/core/preference/BingRulePreference.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.core.preference +package im.vector.riotx.core.preference import android.content.Context import android.text.TextUtils @@ -23,7 +23,7 @@ import android.view.View import android.widget.RadioGroup import android.widget.TextView import androidx.preference.PreferenceViewHolder -import im.vector.riotredesign.R +import im.vector.riotx.R // TODO Replace by real Bingrule class, then delete class BingRule(rule: BingRule) { diff --git a/vector/src/main/java/im/vector/riotredesign/core/preference/ProgressBarPreference.kt b/vector/src/main/java/im/vector/riotx/core/preference/ProgressBarPreference.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/core/preference/ProgressBarPreference.kt rename to vector/src/main/java/im/vector/riotx/core/preference/ProgressBarPreference.kt index de36106c..fe79afe3 100755 --- a/vector/src/main/java/im/vector/riotredesign/core/preference/ProgressBarPreference.kt +++ b/vector/src/main/java/im/vector/riotx/core/preference/ProgressBarPreference.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotredesign.core.preference +package im.vector.riotx.core.preference import android.content.Context import android.util.AttributeSet import androidx.preference.Preference -import im.vector.riotredesign.R +import im.vector.riotx.R class ProgressBarPreference : Preference { diff --git a/vector/src/main/java/im/vector/riotredesign/core/preference/RoomAvatarPreference.kt b/vector/src/main/java/im/vector/riotx/core/preference/RoomAvatarPreference.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/core/preference/RoomAvatarPreference.kt rename to vector/src/main/java/im/vector/riotx/core/preference/RoomAvatarPreference.kt index ca17794e..c0e4dfab 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/preference/RoomAvatarPreference.kt +++ b/vector/src/main/java/im/vector/riotx/core/preference/RoomAvatarPreference.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.core.preference +package im.vector.riotx.core.preference import android.content.Context import android.util.AttributeSet diff --git a/vector/src/main/java/im/vector/riotredesign/core/preference/UserAvatarPreference.kt b/vector/src/main/java/im/vector/riotx/core/preference/UserAvatarPreference.kt similarity index 92% rename from vector/src/main/java/im/vector/riotredesign/core/preference/UserAvatarPreference.kt rename to vector/src/main/java/im/vector/riotx/core/preference/UserAvatarPreference.kt index 4acd8265..e5e84514 100755 --- a/vector/src/main/java/im/vector/riotredesign/core/preference/UserAvatarPreference.kt +++ b/vector/src/main/java/im/vector/riotx/core/preference/UserAvatarPreference.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.core.preference +package im.vector.riotx.core.preference import android.content.Context import android.util.AttributeSet @@ -23,9 +23,9 @@ import android.widget.ProgressBar import androidx.preference.Preference import androidx.preference.PreferenceViewHolder import im.vector.matrix.android.api.session.Session -import im.vector.riotredesign.R -import im.vector.riotredesign.core.extensions.vectorComponent -import im.vector.riotredesign.features.home.AvatarRenderer +import im.vector.riotx.R +import im.vector.riotx.core.extensions.vectorComponent +import im.vector.riotx.features.home.AvatarRenderer open class UserAvatarPreference : Preference { diff --git a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorEditTextPreference.kt b/vector/src/main/java/im/vector/riotx/core/preference/VectorEditTextPreference.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/core/preference/VectorEditTextPreference.kt rename to vector/src/main/java/im/vector/riotx/core/preference/VectorEditTextPreference.kt index 2d7453ef..1d1e1936 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorEditTextPreference.kt +++ b/vector/src/main/java/im/vector/riotx/core/preference/VectorEditTextPreference.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotredesign.core.preference +package im.vector.riotx.core.preference import android.content.Context import android.util.AttributeSet import android.widget.TextView import androidx.preference.EditTextPreference import androidx.preference.PreferenceViewHolder -import im.vector.riotredesign.R +import im.vector.riotx.R import timber.log.Timber /** diff --git a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorGroupPreference.kt b/vector/src/main/java/im/vector/riotx/core/preference/VectorGroupPreference.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/core/preference/VectorGroupPreference.kt rename to vector/src/main/java/im/vector/riotx/core/preference/VectorGroupPreference.kt index 1189b99e..779903a8 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorGroupPreference.kt +++ b/vector/src/main/java/im/vector/riotx/core/preference/VectorGroupPreference.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.core.preference +package im.vector.riotx.core.preference import android.content.Context import android.util.AttributeSet @@ -28,7 +28,7 @@ import androidx.preference.PreferenceViewHolder import androidx.preference.SwitchPreference import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.group.Group -import im.vector.riotredesign.R +import im.vector.riotx.R class VectorGroupPreference : SwitchPreference { diff --git a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorListPreference.kt b/vector/src/main/java/im/vector/riotx/core/preference/VectorListPreference.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/core/preference/VectorListPreference.kt rename to vector/src/main/java/im/vector/riotx/core/preference/VectorListPreference.kt index 2eced250..2e52a1b9 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorListPreference.kt +++ b/vector/src/main/java/im/vector/riotx/core/preference/VectorListPreference.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.core.preference +package im.vector.riotx.core.preference import android.content.Context import android.util.AttributeSet @@ -22,7 +22,7 @@ import android.view.View import androidx.preference.ListPreference import androidx.preference.Preference import androidx.preference.PreferenceViewHolder -import im.vector.riotredesign.R +import im.vector.riotx.R /** * Customize ListPreference class to add a warning icon to the right side of the list. diff --git a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorPreference.kt b/vector/src/main/java/im/vector/riotx/core/preference/VectorPreference.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/core/preference/VectorPreference.kt rename to vector/src/main/java/im/vector/riotx/core/preference/VectorPreference.kt index 0bd5e7db..2654bc29 100755 --- a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorPreference.kt +++ b/vector/src/main/java/im/vector/riotx/core/preference/VectorPreference.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.core.preference +package im.vector.riotx.core.preference import android.animation.Animator import android.animation.ArgbEvaluator @@ -28,8 +28,8 @@ import android.widget.TextView import androidx.core.animation.doOnEnd import androidx.preference.Preference import androidx.preference.PreferenceViewHolder -import im.vector.riotredesign.R -import im.vector.riotredesign.features.themes.ThemeUtils +import im.vector.riotx.R +import im.vector.riotx.features.themes.ThemeUtils import timber.log.Timber diff --git a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorPreferenceCategory.kt b/vector/src/main/java/im/vector/riotx/core/preference/VectorPreferenceCategory.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/core/preference/VectorPreferenceCategory.kt rename to vector/src/main/java/im/vector/riotx/core/preference/VectorPreferenceCategory.kt index 0b0b5016..4c4ca7dd 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorPreferenceCategory.kt +++ b/vector/src/main/java/im/vector/riotx/core/preference/VectorPreferenceCategory.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.core.preference +package im.vector.riotx.core.preference import android.content.Context import android.graphics.Typeface diff --git a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorPreferenceDivider.kt b/vector/src/main/java/im/vector/riotx/core/preference/VectorPreferenceDivider.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/core/preference/VectorPreferenceDivider.kt rename to vector/src/main/java/im/vector/riotx/core/preference/VectorPreferenceDivider.kt index 7cb1ec4c..83ff88ba 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorPreferenceDivider.kt +++ b/vector/src/main/java/im/vector/riotx/core/preference/VectorPreferenceDivider.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotredesign.core.preference +package im.vector.riotx.core.preference import android.content.Context import android.util.AttributeSet import androidx.preference.Preference -import im.vector.riotredesign.R +import im.vector.riotx.R /** * Divider for Preference screen diff --git a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorSwitchPreference.kt b/vector/src/main/java/im/vector/riotx/core/preference/VectorSwitchPreference.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/core/preference/VectorSwitchPreference.kt rename to vector/src/main/java/im/vector/riotx/core/preference/VectorSwitchPreference.kt index 7693480c..e6292d10 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/preference/VectorSwitchPreference.kt +++ b/vector/src/main/java/im/vector/riotx/core/preference/VectorSwitchPreference.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.core.preference +package im.vector.riotx.core.preference import android.content.Context import android.util.AttributeSet diff --git a/vector/src/main/java/im/vector/riotredesign/core/pushers/PushersManager.kt b/vector/src/main/java/im/vector/riotx/core/pushers/PushersManager.kt similarity index 86% rename from vector/src/main/java/im/vector/riotredesign/core/pushers/PushersManager.kt rename to vector/src/main/java/im/vector/riotx/core/pushers/PushersManager.kt index 94e517d3..482adc0f 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/pushers/PushersManager.kt +++ b/vector/src/main/java/im/vector/riotx/core/pushers/PushersManager.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotredesign.core.pushers +package im.vector.riotx.core.pushers import im.vector.matrix.android.api.MatrixCallback -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ActiveSessionHolder -import im.vector.riotredesign.core.resources.AppNameProvider -import im.vector.riotredesign.core.resources.LocaleProvider -import im.vector.riotredesign.core.resources.StringProvider +import im.vector.riotx.R +import im.vector.riotx.core.di.ActiveSessionHolder +import im.vector.riotx.core.resources.AppNameProvider +import im.vector.riotx.core.resources.LocaleProvider +import im.vector.riotx.core.resources.StringProvider import java.util.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/core/resources/AppNameProvider.kt b/vector/src/main/java/im/vector/riotx/core/resources/AppNameProvider.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/core/resources/AppNameProvider.kt rename to vector/src/main/java/im/vector/riotx/core/resources/AppNameProvider.kt index 355d175e..9927a0ec 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/resources/AppNameProvider.kt +++ b/vector/src/main/java/im/vector/riotx/core/resources/AppNameProvider.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.core.resources +package im.vector.riotx.core.resources import android.content.Context import timber.log.Timber diff --git a/vector/src/main/java/im/vector/riotredesign/core/resources/ColorProvider.kt b/vector/src/main/java/im/vector/riotx/core/resources/ColorProvider.kt similarity index 92% rename from vector/src/main/java/im/vector/riotredesign/core/resources/ColorProvider.kt rename to vector/src/main/java/im/vector/riotx/core/resources/ColorProvider.kt index fc82265c..8930557d 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/resources/ColorProvider.kt +++ b/vector/src/main/java/im/vector/riotx/core/resources/ColorProvider.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotredesign.core.resources +package im.vector.riotx.core.resources import androidx.annotation.AttrRes import androidx.annotation.ColorInt import androidx.annotation.ColorRes import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat -import im.vector.riotredesign.features.themes.ThemeUtils +import im.vector.riotx.features.themes.ThemeUtils import javax.inject.Inject class ColorProvider @Inject constructor(private val context: AppCompatActivity) { diff --git a/vector/src/main/java/im/vector/riotredesign/core/resources/DateProvider.kt b/vector/src/main/java/im/vector/riotx/core/resources/DateProvider.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/core/resources/DateProvider.kt rename to vector/src/main/java/im/vector/riotx/core/resources/DateProvider.kt index 8c485b1b..726dd39a 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/resources/DateProvider.kt +++ b/vector/src/main/java/im/vector/riotx/core/resources/DateProvider.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.core.resources +package im.vector.riotx.core.resources import org.threeten.bp.Instant import org.threeten.bp.LocalDateTime diff --git a/vector/src/main/java/im/vector/riotredesign/core/resources/LocaleProvider.kt b/vector/src/main/java/im/vector/riotx/core/resources/LocaleProvider.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/core/resources/LocaleProvider.kt rename to vector/src/main/java/im/vector/riotx/core/resources/LocaleProvider.kt index 17df3d96..ad44884a 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/resources/LocaleProvider.kt +++ b/vector/src/main/java/im/vector/riotx/core/resources/LocaleProvider.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.core.resources +package im.vector.riotx.core.resources import android.content.res.Resources import androidx.core.os.ConfigurationCompat diff --git a/vector/src/main/java/im/vector/riotredesign/core/resources/ResourceUtils.kt b/vector/src/main/java/im/vector/riotx/core/resources/ResourceUtils.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/core/resources/ResourceUtils.kt rename to vector/src/main/java/im/vector/riotx/core/resources/ResourceUtils.kt index 1f1fbd9b..d841700d 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/resources/ResourceUtils.kt +++ b/vector/src/main/java/im/vector/riotx/core/resources/ResourceUtils.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package im.vector.riotredesign.core.resources +package im.vector.riotx.core.resources import android.content.Context import android.net.Uri import android.text.TextUtils import android.webkit.MimeTypeMap -import im.vector.riotredesign.core.utils.getFileExtension +import im.vector.riotx.core.utils.getFileExtension import timber.log.Timber import java.io.InputStream diff --git a/vector/src/main/java/im/vector/riotredesign/core/resources/StringArrayProvider.kt b/vector/src/main/java/im/vector/riotx/core/resources/StringArrayProvider.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/core/resources/StringArrayProvider.kt rename to vector/src/main/java/im/vector/riotx/core/resources/StringArrayProvider.kt index fe058ca3..4373143d 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/resources/StringArrayProvider.kt +++ b/vector/src/main/java/im/vector/riotx/core/resources/StringArrayProvider.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.core.resources +package im.vector.riotx.core.resources import android.content.res.Resources import androidx.annotation.ArrayRes diff --git a/vector/src/main/java/im/vector/riotredesign/core/resources/StringProvider.kt b/vector/src/main/java/im/vector/riotx/core/resources/StringProvider.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/core/resources/StringProvider.kt rename to vector/src/main/java/im/vector/riotx/core/resources/StringProvider.kt index f575f354..6c674587 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/resources/StringProvider.kt +++ b/vector/src/main/java/im/vector/riotx/core/resources/StringProvider.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.core.resources +package im.vector.riotx.core.resources import android.content.res.Resources import androidx.annotation.NonNull diff --git a/vector/src/main/java/im/vector/riotredesign/core/resources/UserPreferencesProvider.kt b/vector/src/main/java/im/vector/riotx/core/resources/UserPreferencesProvider.kt similarity index 88% rename from vector/src/main/java/im/vector/riotredesign/core/resources/UserPreferencesProvider.kt rename to vector/src/main/java/im/vector/riotx/core/resources/UserPreferencesProvider.kt index 05a4fc1b..ddbe1536 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/resources/UserPreferencesProvider.kt +++ b/vector/src/main/java/im/vector/riotx/core/resources/UserPreferencesProvider.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotredesign.core.resources +package im.vector.riotx.core.resources import android.content.Context -import im.vector.riotredesign.features.settings.PreferencesManager +import im.vector.riotx.features.settings.PreferencesManager import javax.inject.Inject class UserPreferencesProvider @Inject constructor(private val context: Context) { diff --git a/vector/src/main/java/im/vector/riotredesign/core/services/CallService.kt b/vector/src/main/java/im/vector/riotx/core/services/CallService.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/core/services/CallService.kt rename to vector/src/main/java/im/vector/riotx/core/services/CallService.kt index 88d99a5c..92e9e40a 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/services/CallService.kt +++ b/vector/src/main/java/im/vector/riotx/core/services/CallService.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotredesign.core.services +package im.vector.riotx.core.services import android.content.Context import android.content.Intent import androidx.core.content.ContextCompat -import im.vector.riotredesign.features.notifications.NotificationUtils +import im.vector.riotx.features.notifications.NotificationUtils import timber.log.Timber /** @@ -147,9 +147,9 @@ class CallService : VectorService() { companion object { private const val NOTIFICATION_ID = 6480 - private const val ACTION_INCOMING_CALL = "im.vector.riotredesign.core.services.CallService.INCOMING_CALL" - private const val ACTION_PENDING_CALL = "im.vector.riotredesign.core.services.CallService.PENDING_CALL" - private const val ACTION_NO_ACTIVE_CALL = "im.vector.riotredesign.core.services.CallService.NO_ACTIVE_CALL" + private const val ACTION_INCOMING_CALL = "im.vector.riotx.core.services.CallService.INCOMING_CALL" + private const val ACTION_PENDING_CALL = "im.vector.riotx.core.services.CallService.PENDING_CALL" + private const val ACTION_NO_ACTIVE_CALL = "im.vector.riotx.core.services.CallService.NO_ACTIVE_CALL" 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/riotredesign/core/services/VectorService.kt b/vector/src/main/java/im/vector/riotx/core/services/VectorService.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/core/services/VectorService.kt rename to vector/src/main/java/im/vector/riotx/core/services/VectorService.kt index 4b4c500d..abf77f06 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/services/VectorService.kt +++ b/vector/src/main/java/im/vector/riotx/core/services/VectorService.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.core.services +package im.vector.riotx.core.services import android.app.Service import android.content.Intent diff --git a/vector/src/main/java/im/vector/riotredesign/core/ui/list/GenericFooterItem.kt b/vector/src/main/java/im/vector/riotx/core/ui/list/GenericFooterItem.kt similarity index 87% rename from vector/src/main/java/im/vector/riotredesign/core/ui/list/GenericFooterItem.kt rename to vector/src/main/java/im/vector/riotx/core/ui/list/GenericFooterItem.kt index 30cd69a4..b171fb50 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/ui/list/GenericFooterItem.kt +++ b/vector/src/main/java/im/vector/riotx/core/ui/list/GenericFooterItem.kt @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.core.ui.list +package im.vector.riotx.core.ui.list import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder -import im.vector.riotredesign.core.epoxy.VectorEpoxyModel -import im.vector.riotredesign.core.extensions.setTextOrHide +import im.vector.riotx.R +import im.vector.riotx.core.epoxy.VectorEpoxyHolder +import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.riotx.core.extensions.setTextOrHide /** * A generic list item. diff --git a/vector/src/main/java/im/vector/riotredesign/core/ui/list/GenericItem.kt b/vector/src/main/java/im/vector/riotx/core/ui/list/GenericItem.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/core/ui/list/GenericItem.kt rename to vector/src/main/java/im/vector/riotx/core/ui/list/GenericItem.kt index 2f223294..ebaeb2d3 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/ui/list/GenericItem.kt +++ b/vector/src/main/java/im/vector/riotx/core/ui/list/GenericItem.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.core.ui.list +package im.vector.riotx.core.ui.list import android.view.View import android.widget.Button @@ -24,10 +24,10 @@ import androidx.annotation.DrawableRes import androidx.core.view.isVisible import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder -import im.vector.riotredesign.core.epoxy.VectorEpoxyModel -import im.vector.riotredesign.core.extensions.setTextOrHide +import im.vector.riotx.R +import im.vector.riotx.core.epoxy.VectorEpoxyHolder +import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.riotx.core.extensions.setTextOrHide /** * A generic list item. diff --git a/vector/src/main/java/im/vector/riotredesign/core/ui/views/KeysBackupBanner.kt b/vector/src/main/java/im/vector/riotx/core/ui/views/KeysBackupBanner.kt similarity index 99% rename from vector/src/main/java/im/vector/riotredesign/core/ui/views/KeysBackupBanner.kt rename to vector/src/main/java/im/vector/riotx/core/ui/views/KeysBackupBanner.kt index 98b24211..1f35ca25 100755 --- a/vector/src/main/java/im/vector/riotredesign/core/ui/views/KeysBackupBanner.kt +++ b/vector/src/main/java/im/vector/riotx/core/ui/views/KeysBackupBanner.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.core.ui.views +package im.vector.riotx.core.ui.views import android.content.Context import android.preference.PreferenceManager @@ -30,7 +30,7 @@ import androidx.transition.TransitionManager import butterknife.BindView import butterknife.ButterKnife import butterknife.OnClick -import im.vector.riotredesign.R +import im.vector.riotx.R import timber.log.Timber /** diff --git a/vector/src/main/java/im/vector/riotredesign/core/ui/views/PasswordStrengthBar.kt b/vector/src/main/java/im/vector/riotx/core/ui/views/PasswordStrengthBar.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/core/ui/views/PasswordStrengthBar.kt rename to vector/src/main/java/im/vector/riotx/core/ui/views/PasswordStrengthBar.kt index 1d53593d..999b391d 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/ui/views/PasswordStrengthBar.kt +++ b/vector/src/main/java/im/vector/riotx/core/ui/views/PasswordStrengthBar.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.core.ui.views +package im.vector.riotx.core.ui.views import android.content.Context import android.util.AttributeSet @@ -24,7 +24,7 @@ import androidx.annotation.IntRange import butterknife.BindColor import butterknife.BindView import butterknife.ButterKnife -import im.vector.riotredesign.R +import im.vector.riotx.R /** * A password strength bar custom widget diff --git a/vector/src/main/java/im/vector/riotredesign/core/utils/DebouncedClickListener.kt b/vector/src/main/java/im/vector/riotx/core/utils/DebouncedClickListener.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/core/utils/DebouncedClickListener.kt rename to vector/src/main/java/im/vector/riotx/core/utils/DebouncedClickListener.kt index dd16b89b..9625757b 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/utils/DebouncedClickListener.kt +++ b/vector/src/main/java/im/vector/riotx/core/utils/DebouncedClickListener.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.core.utils +package im.vector.riotx.core.utils import android.view.View import java.util.* diff --git a/vector/src/main/java/im/vector/riotredesign/core/utils/Debouncer.kt b/vector/src/main/java/im/vector/riotx/core/utils/Debouncer.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/core/utils/Debouncer.kt rename to vector/src/main/java/im/vector/riotx/core/utils/Debouncer.kt index da8532ff..60e51ad2 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/utils/Debouncer.kt +++ b/vector/src/main/java/im/vector/riotx/core/utils/Debouncer.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.core.utils +package im.vector.riotx.core.utils /** diff --git a/vector/src/main/java/im/vector/riotredesign/core/utils/Dialogs.kt b/vector/src/main/java/im/vector/riotx/core/utils/Dialogs.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/core/utils/Dialogs.kt rename to vector/src/main/java/im/vector/riotx/core/utils/Dialogs.kt index fa98574f..9d73493e 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/utils/Dialogs.kt +++ b/vector/src/main/java/im/vector/riotx/core/utils/Dialogs.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.core.utils +package im.vector.riotx.core.utils import android.content.Context import android.webkit.WebView diff --git a/vector/src/main/java/im/vector/riotredesign/core/utils/DimensionUtils.kt b/vector/src/main/java/im/vector/riotx/core/utils/DimensionUtils.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/core/utils/DimensionUtils.kt rename to vector/src/main/java/im/vector/riotx/core/utils/DimensionUtils.kt index 44659da6..15257f9c 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/utils/DimensionUtils.kt +++ b/vector/src/main/java/im/vector/riotx/core/utils/DimensionUtils.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.core.utils +package im.vector.riotx.core.utils import android.content.Context import android.util.TypedValue diff --git a/vector/src/main/java/im/vector/riotredesign/core/utils/Emoji.kt b/vector/src/main/java/im/vector/riotx/core/utils/Emoji.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/core/utils/Emoji.kt rename to vector/src/main/java/im/vector/riotx/core/utils/Emoji.kt index 5c572384..60a458e9 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/utils/Emoji.kt +++ b/vector/src/main/java/im/vector/riotx/core/utils/Emoji.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotredesign.core.utils +package im.vector.riotx.core.utils import android.content.Context import com.squareup.moshi.Moshi -import im.vector.riotredesign.R -import im.vector.riotredesign.features.reactions.EmojiDataSource +import im.vector.riotx.R +import im.vector.riotx.features.reactions.EmojiDataSource import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import timber.log.Timber diff --git a/vector/src/main/java/im/vector/riotredesign/core/utils/ExternalApplicationsUtil.kt b/vector/src/main/java/im/vector/riotx/core/utils/ExternalApplicationsUtil.kt similarity index 98% rename from vector/src/main/java/im/vector/riotredesign/core/utils/ExternalApplicationsUtil.kt rename to vector/src/main/java/im/vector/riotx/core/utils/ExternalApplicationsUtil.kt index 245fe311..a8ed3c30 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/utils/ExternalApplicationsUtil.kt +++ b/vector/src/main/java/im/vector/riotx/core/utils/ExternalApplicationsUtil.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.core.utils +package im.vector.riotx.core.utils import android.app.Activity import android.content.ActivityNotFoundException @@ -27,8 +27,8 @@ import android.provider.Browser import android.provider.MediaStore import androidx.core.content.FileProvider import androidx.fragment.app.Fragment -import im.vector.riotredesign.BuildConfig -import im.vector.riotredesign.R +import im.vector.riotx.BuildConfig +import im.vector.riotx.R import timber.log.Timber import java.io.File import java.text.SimpleDateFormat diff --git a/vector/src/main/java/im/vector/riotredesign/core/utils/FileUtils.kt b/vector/src/main/java/im/vector/riotx/core/utils/FileUtils.kt similarity index 98% rename from vector/src/main/java/im/vector/riotredesign/core/utils/FileUtils.kt rename to vector/src/main/java/im/vector/riotx/core/utils/FileUtils.kt index 8d08ca85..3c39362a 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/utils/FileUtils.kt +++ b/vector/src/main/java/im/vector/riotx/core/utils/FileUtils.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.core.utils +package im.vector.riotx.core.utils import android.content.Context import android.text.TextUtils diff --git a/vector/src/main/java/im/vector/riotredesign/core/utils/LiveEvent.kt b/vector/src/main/java/im/vector/riotx/core/utils/LiveEvent.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/core/utils/LiveEvent.kt rename to vector/src/main/java/im/vector/riotx/core/utils/LiveEvent.kt index 178a0377..63dabbd9 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/utils/LiveEvent.kt +++ b/vector/src/main/java/im/vector/riotx/core/utils/LiveEvent.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.core.utils +package im.vector.riotx.core.utils import androidx.lifecycle.Observer diff --git a/vector/src/main/java/im/vector/riotredesign/core/utils/PermissionsTools.kt b/vector/src/main/java/im/vector/riotx/core/utils/PermissionsTools.kt similarity index 99% rename from vector/src/main/java/im/vector/riotredesign/core/utils/PermissionsTools.kt rename to vector/src/main/java/im/vector/riotx/core/utils/PermissionsTools.kt index d0fd0aca..01ca16bf 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/utils/PermissionsTools.kt +++ b/vector/src/main/java/im/vector/riotx/core/utils/PermissionsTools.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.core.utils +package im.vector.riotx.core.utils import android.Manifest import android.app.Activity @@ -27,7 +27,7 @@ import androidx.appcompat.app.AlertDialog import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment -import im.vector.riotredesign.R +import im.vector.riotx.R import timber.log.Timber import java.util.* diff --git a/vector/src/main/java/im/vector/riotredesign/core/utils/RingtoneUtils.kt b/vector/src/main/java/im/vector/riotx/core/utils/RingtoneUtils.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/core/utils/RingtoneUtils.kt rename to vector/src/main/java/im/vector/riotx/core/utils/RingtoneUtils.kt index 89c800d4..e4da72aa 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/utils/RingtoneUtils.kt +++ b/vector/src/main/java/im/vector/riotx/core/utils/RingtoneUtils.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.core.utils +package im.vector.riotx.core.utils import android.content.Context import android.media.Ringtone @@ -22,7 +22,7 @@ import android.media.RingtoneManager import android.net.Uri import android.preference.PreferenceManager import androidx.core.content.edit -import im.vector.riotredesign.features.settings.PreferencesManager +import im.vector.riotx.features.settings.PreferencesManager /** * This file manages the sound ringtone for calls. diff --git a/vector/src/main/java/im/vector/riotredesign/core/utils/RxStore.kt b/vector/src/main/java/im/vector/riotx/core/utils/RxStore.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/core/utils/RxStore.kt rename to vector/src/main/java/im/vector/riotx/core/utils/RxStore.kt index cbf96a32..bf359973 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/utils/RxStore.kt +++ b/vector/src/main/java/im/vector/riotx/core/utils/RxStore.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.core.utils +package im.vector.riotx.core.utils import com.jakewharton.rxrelay2.BehaviorRelay import io.reactivex.Observable diff --git a/vector/src/main/java/im/vector/riotredesign/core/utils/SystemUtils.kt b/vector/src/main/java/im/vector/riotx/core/utils/SystemUtils.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/core/utils/SystemUtils.kt rename to vector/src/main/java/im/vector/riotx/core/utils/SystemUtils.kt index c24ae28c..f387b296 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/utils/SystemUtils.kt +++ b/vector/src/main/java/im/vector/riotx/core/utils/SystemUtils.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.core.utils +package im.vector.riotx.core.utils import android.annotation.TargetApi import android.app.Activity @@ -30,9 +30,9 @@ import android.provider.Settings import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment -import im.vector.riotredesign.R -import im.vector.riotredesign.features.notifications.supportNotificationChannels -import im.vector.riotredesign.features.settings.VectorLocale +import im.vector.riotx.R +import im.vector.riotx.features.notifications.supportNotificationChannels +import im.vector.riotx.features.settings.VectorLocale import timber.log.Timber import java.util.* diff --git a/vector/src/main/java/im/vector/riotredesign/core/utils/TextUtils.kt b/vector/src/main/java/im/vector/riotx/core/utils/TextUtils.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/core/utils/TextUtils.kt rename to vector/src/main/java/im/vector/riotx/core/utils/TextUtils.kt index a6587883..9d980e7f 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/utils/TextUtils.kt +++ b/vector/src/main/java/im/vector/riotx/core/utils/TextUtils.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.core.utils +package im.vector.riotx.core.utils import java.util.* diff --git a/vector/src/main/java/im/vector/riotredesign/features/MainActivity.kt b/vector/src/main/java/im/vector/riotx/features/MainActivity.kt similarity index 90% rename from vector/src/main/java/im/vector/riotredesign/features/MainActivity.kt rename to vector/src/main/java/im/vector/riotx/features/MainActivity.kt index f67663ac..f8610c29 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/MainActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/MainActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features +package im.vector.riotx.features import android.app.Activity import android.content.Intent @@ -22,11 +22,11 @@ import android.os.Bundle import im.vector.matrix.android.api.Matrix import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.auth.Authenticator -import im.vector.riotredesign.core.di.ActiveSessionHolder -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.platform.VectorBaseActivity -import im.vector.riotredesign.features.home.HomeActivity -import im.vector.riotredesign.features.login.LoginActivity +import im.vector.riotx.core.di.ActiveSessionHolder +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.platform.VectorBaseActivity +import im.vector.riotx.features.home.HomeActivity +import im.vector.riotx.features.login.LoginActivity import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/AutocompleteClickListener.kt b/vector/src/main/java/im/vector/riotx/features/autocomplete/AutocompleteClickListener.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/features/autocomplete/AutocompleteClickListener.kt rename to vector/src/main/java/im/vector/riotx/features/autocomplete/AutocompleteClickListener.kt index aa2226d5..800753d9 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/AutocompleteClickListener.kt +++ b/vector/src/main/java/im/vector/riotx/features/autocomplete/AutocompleteClickListener.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.autocomplete +package im.vector.riotx.features.autocomplete /** * Simple generic listener interface diff --git a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/EpoxyAutocompletePresenter.kt b/vector/src/main/java/im/vector/riotx/features/autocomplete/EpoxyAutocompletePresenter.kt similarity index 98% rename from vector/src/main/java/im/vector/riotredesign/features/autocomplete/EpoxyAutocompletePresenter.kt rename to vector/src/main/java/im/vector/riotx/features/autocomplete/EpoxyAutocompletePresenter.kt index ebdee91b..1c9e4f77 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/EpoxyAutocompletePresenter.kt +++ b/vector/src/main/java/im/vector/riotx/features/autocomplete/EpoxyAutocompletePresenter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.autocomplete +package im.vector.riotx.features.autocomplete import android.content.Context import android.database.DataSetObserver diff --git a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/command/AutocompleteCommandController.kt b/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandController.kt similarity index 84% rename from vector/src/main/java/im/vector/riotredesign/features/autocomplete/command/AutocompleteCommandController.kt rename to vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandController.kt index 484ee2ce..2e833451 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/command/AutocompleteCommandController.kt +++ b/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandController.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotredesign.features.autocomplete.command +package im.vector.riotx.features.autocomplete.command import com.airbnb.epoxy.TypedEpoxyController -import im.vector.riotredesign.core.resources.StringProvider -import im.vector.riotredesign.features.autocomplete.AutocompleteClickListener -import im.vector.riotredesign.features.command.Command +import im.vector.riotx.core.resources.StringProvider +import im.vector.riotx.features.autocomplete.AutocompleteClickListener +import im.vector.riotx.features.command.Command import javax.inject.Inject class AutocompleteCommandController @Inject constructor(private val stringProvider: StringProvider) : TypedEpoxyController>() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/command/AutocompleteCommandItem.kt b/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandItem.kt similarity index 88% rename from vector/src/main/java/im/vector/riotredesign/features/autocomplete/command/AutocompleteCommandItem.kt rename to vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandItem.kt index cd6a0ff0..2fca2190 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/command/AutocompleteCommandItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandItem.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotredesign.features.autocomplete.command +package im.vector.riotx.features.autocomplete.command import android.view.View import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder -import im.vector.riotredesign.core.epoxy.VectorEpoxyModel +import im.vector.riotx.R +import im.vector.riotx.core.epoxy.VectorEpoxyHolder +import im.vector.riotx.core.epoxy.VectorEpoxyModel @EpoxyModelClass(layout = R.layout.item_autocomplete_command) abstract class AutocompleteCommandItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/command/AutocompleteCommandPresenter.kt b/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandPresenter.kt similarity index 87% rename from vector/src/main/java/im/vector/riotredesign/features/autocomplete/command/AutocompleteCommandPresenter.kt rename to vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandPresenter.kt index 4449d2ed..866a68f5 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/command/AutocompleteCommandPresenter.kt +++ b/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandPresenter.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotredesign.features.autocomplete.command +package im.vector.riotx.features.autocomplete.command import android.content.Context import com.airbnb.epoxy.EpoxyController -import im.vector.riotredesign.features.autocomplete.EpoxyAutocompletePresenter -import im.vector.riotredesign.features.command.Command +import im.vector.riotx.features.autocomplete.EpoxyAutocompletePresenter +import im.vector.riotx.features.command.Command import javax.inject.Inject class AutocompleteCommandPresenter @Inject constructor(context: Context, diff --git a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/command/CommandAutocompletePolicy.kt b/vector/src/main/java/im/vector/riotx/features/autocomplete/command/CommandAutocompletePolicy.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/features/autocomplete/command/CommandAutocompletePolicy.kt rename to vector/src/main/java/im/vector/riotx/features/autocomplete/command/CommandAutocompletePolicy.kt index a6f9aa72..db3c0113 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/command/CommandAutocompletePolicy.kt +++ b/vector/src/main/java/im/vector/riotx/features/autocomplete/command/CommandAutocompletePolicy.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.autocomplete.command +package im.vector.riotx.features.autocomplete.command import android.text.Spannable import com.otaliastudios.autocomplete.AutocompletePolicy diff --git a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/user/AutocompleteUserController.kt b/vector/src/main/java/im/vector/riotx/features/autocomplete/user/AutocompleteUserController.kt similarity index 88% rename from vector/src/main/java/im/vector/riotredesign/features/autocomplete/user/AutocompleteUserController.kt rename to vector/src/main/java/im/vector/riotx/features/autocomplete/user/AutocompleteUserController.kt index dcf2817a..cdf04497 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/user/AutocompleteUserController.kt +++ b/vector/src/main/java/im/vector/riotx/features/autocomplete/user/AutocompleteUserController.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotredesign.features.autocomplete.user +package im.vector.riotx.features.autocomplete.user import com.airbnb.epoxy.TypedEpoxyController import im.vector.matrix.android.api.session.user.model.User -import im.vector.riotredesign.features.autocomplete.AutocompleteClickListener -import im.vector.riotredesign.features.home.AvatarRenderer +import im.vector.riotx.features.autocomplete.AutocompleteClickListener +import im.vector.riotx.features.home.AvatarRenderer import javax.inject.Inject class AutocompleteUserController @Inject constructor(): TypedEpoxyController>() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/user/AutocompleteUserItem.kt b/vector/src/main/java/im/vector/riotx/features/autocomplete/user/AutocompleteUserItem.kt similarity index 85% rename from vector/src/main/java/im/vector/riotredesign/features/autocomplete/user/AutocompleteUserItem.kt rename to vector/src/main/java/im/vector/riotx/features/autocomplete/user/AutocompleteUserItem.kt index 17cbde66..82ba9a41 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/user/AutocompleteUserItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/autocomplete/user/AutocompleteUserItem.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotredesign.features.autocomplete.user +package im.vector.riotx.features.autocomplete.user import android.view.View import android.widget.ImageView import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder -import im.vector.riotredesign.core.epoxy.VectorEpoxyModel -import im.vector.riotredesign.features.home.AvatarRenderer +import im.vector.riotx.R +import im.vector.riotx.core.epoxy.VectorEpoxyHolder +import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.riotx.features.home.AvatarRenderer @EpoxyModelClass(layout = R.layout.item_autocomplete_user) abstract class AutocompleteUserItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/user/AutocompleteUserPresenter.kt b/vector/src/main/java/im/vector/riotx/features/autocomplete/user/AutocompleteUserPresenter.kt similarity index 91% rename from vector/src/main/java/im/vector/riotredesign/features/autocomplete/user/AutocompleteUserPresenter.kt rename to vector/src/main/java/im/vector/riotx/features/autocomplete/user/AutocompleteUserPresenter.kt index b525cfac..800e8e77 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/autocomplete/user/AutocompleteUserPresenter.kt +++ b/vector/src/main/java/im/vector/riotx/features/autocomplete/user/AutocompleteUserPresenter.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotredesign.features.autocomplete.user +package im.vector.riotx.features.autocomplete.user import android.content.Context import com.airbnb.epoxy.EpoxyController import com.airbnb.mvrx.Async import com.airbnb.mvrx.Success import im.vector.matrix.android.api.session.user.model.User -import im.vector.riotredesign.features.autocomplete.EpoxyAutocompletePresenter +import im.vector.riotx.features.autocomplete.EpoxyAutocompletePresenter import javax.inject.Inject class AutocompleteUserPresenter @Inject constructor(context: Context, diff --git a/vector/src/main/java/im/vector/riotredesign/features/badge/BadgeProxy.kt b/vector/src/main/java/im/vector/riotx/features/badge/BadgeProxy.kt similarity index 98% rename from vector/src/main/java/im/vector/riotredesign/features/badge/BadgeProxy.kt rename to vector/src/main/java/im/vector/riotx/features/badge/BadgeProxy.kt index d0b7623c..e3e3cca1 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/badge/BadgeProxy.kt +++ b/vector/src/main/java/im/vector/riotx/features/badge/BadgeProxy.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.badge +package im.vector.riotx.features.badge import android.content.Context import android.os.Build diff --git a/vector/src/main/java/im/vector/riotredesign/features/command/Command.kt b/vector/src/main/java/im/vector/riotx/features/command/Command.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/features/command/Command.kt rename to vector/src/main/java/im/vector/riotx/features/command/Command.kt index a41a3afd..a9825b05 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/command/Command.kt +++ b/vector/src/main/java/im/vector/riotx/features/command/Command.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotredesign.features.command +package im.vector.riotx.features.command import androidx.annotation.StringRes -import im.vector.riotredesign.R +import im.vector.riotx.R /** * Defines the command line operations diff --git a/vector/src/main/java/im/vector/riotredesign/features/command/CommandParser.kt b/vector/src/main/java/im/vector/riotx/features/command/CommandParser.kt similarity index 99% rename from vector/src/main/java/im/vector/riotredesign/features/command/CommandParser.kt rename to vector/src/main/java/im/vector/riotx/features/command/CommandParser.kt index 3715c017..2ef9fe0d 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/command/CommandParser.kt +++ b/vector/src/main/java/im/vector/riotx/features/command/CommandParser.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.command +package im.vector.riotx.features.command import im.vector.matrix.android.api.MatrixPatterns import timber.log.Timber diff --git a/vector/src/main/java/im/vector/riotredesign/features/command/ParsedCommand.kt b/vector/src/main/java/im/vector/riotx/features/command/ParsedCommand.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/features/command/ParsedCommand.kt rename to vector/src/main/java/im/vector/riotx/features/command/ParsedCommand.kt index 350423b1..1786e597 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/command/ParsedCommand.kt +++ b/vector/src/main/java/im/vector/riotx/features/command/ParsedCommand.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.command +package im.vector.riotx.features.command /** * Represent a parsed command diff --git a/vector/src/main/java/im/vector/riotredesign/features/configuration/VectorConfiguration.kt b/vector/src/main/java/im/vector/riotx/features/configuration/VectorConfiguration.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/features/configuration/VectorConfiguration.kt rename to vector/src/main/java/im/vector/riotx/features/configuration/VectorConfiguration.kt index 3790661a..cb96d50d 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/configuration/VectorConfiguration.kt +++ b/vector/src/main/java/im/vector/riotx/features/configuration/VectorConfiguration.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotredesign.features.configuration +package im.vector.riotx.features.configuration import android.annotation.SuppressLint import android.content.Context import android.content.res.Configuration import android.os.Build -import im.vector.riotredesign.features.settings.FontScale -import im.vector.riotredesign.features.settings.VectorLocale -import im.vector.riotredesign.features.themes.ThemeUtils +import im.vector.riotx.features.settings.FontScale +import im.vector.riotx.features.settings.VectorLocale +import im.vector.riotx.features.themes.ThemeUtils import timber.log.Timber import java.util.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keys/KeysExporter.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysExporter.kt similarity index 92% rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keys/KeysExporter.kt rename to vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysExporter.kt index 6527c263..396723ea 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keys/KeysExporter.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysExporter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.crypto.keys +package im.vector.riotx.features.crypto.keys import android.content.Context import android.os.Environment @@ -22,8 +22,8 @@ import arrow.core.Try import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.internal.extensions.foldToCallback -import im.vector.riotredesign.core.files.addEntryToDownloadManager -import im.vector.riotredesign.core.files.writeToFile +import im.vector.riotx.core.files.addEntryToDownloadManager +import im.vector.riotx.core.files.writeToFile import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keys/KeysImporter.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysImporter.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keys/KeysImporter.kt rename to vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysImporter.kt index e4ed46f6..041306c4 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keys/KeysImporter.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysImporter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.crypto.keys +package im.vector.riotx.features.crypto.keys import android.content.Context import android.net.Uri @@ -22,8 +22,8 @@ import arrow.core.Try import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult -import im.vector.riotredesign.core.intent.getMimeTypeFromUri -import im.vector.riotredesign.core.resources.openResource +import im.vector.riotx.core.intent.getMimeTypeFromUri +import im.vector.riotx.core.resources.openResource import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt index 333342e1..74cf0225 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.crypto.keysbackup.restore +package im.vector.riotx.features.crypto.keysbackup.restore import android.app.Activity import android.content.Context @@ -23,9 +23,9 @@ import androidx.fragment.app.FragmentManager import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProviders import im.vector.fragments.keysbackup.restore.KeysBackupRestoreFromPassphraseFragment -import im.vector.riotredesign.R -import im.vector.riotredesign.core.extensions.observeEvent -import im.vector.riotredesign.core.platform.SimpleFragmentActivity +import im.vector.riotx.R +import im.vector.riotx.core.extensions.observeEvent +import im.vector.riotx.core.platform.SimpleFragmentActivity class KeysBackupRestoreActivity : SimpleFragmentActivity() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt index 0c2eb788..b11a08b9 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.crypto.keysbackup.restore +package im.vector.riotx.features.crypto.keysbackup.restore import android.app.Activity import android.content.Intent @@ -27,10 +27,10 @@ import butterknife.BindView import butterknife.OnClick import butterknife.OnTextChanged import com.google.android.material.textfield.TextInputLayout -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.platform.VectorBaseFragment -import im.vector.riotredesign.core.utils.startImportTextFromFileIntent +import im.vector.riotx.R +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.riotx.core.utils.startImportTextFromFileIntent import timber.log.Timber class KeysBackupRestoreFromKeyFragment : VectorBaseFragment() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt index 99a36f30..c4da3038 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.crypto.keysbackup.restore +package im.vector.riotx.features.crypto.keysbackup.restore import android.content.Context import androidx.lifecycle.MutableLiveData @@ -23,9 +23,9 @@ import im.vector.matrix.android.api.listeners.StepProgressListener import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupService import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersionResult -import im.vector.riotredesign.R -import im.vector.riotredesign.core.platform.WaitingViewData -import im.vector.riotredesign.core.ui.views.KeysBackupBanner +import im.vector.riotx.R +import im.vector.riotx.core.platform.WaitingViewData +import im.vector.riotx.core.ui.views.KeysBackupBanner import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt similarity index 92% rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt index a0da69fb..c7b349c8 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt @@ -32,12 +32,12 @@ import butterknife.BindView import butterknife.OnClick import butterknife.OnTextChanged import com.google.android.material.textfield.TextInputLayout -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.extensions.showPassword -import im.vector.riotredesign.core.platform.VectorBaseFragment -import im.vector.riotredesign.features.crypto.keysbackup.restore.KeysBackupRestoreFromPassphraseViewModel -import im.vector.riotredesign.features.crypto.keysbackup.restore.KeysBackupRestoreSharedViewModel +import im.vector.riotx.R +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.extensions.showPassword +import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreFromPassphraseViewModel +import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreSharedViewModel class KeysBackupRestoreFromPassphraseFragment : VectorBaseFragment() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt index bdbfd23b..3a4a9528 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.crypto.keysbackup.restore +package im.vector.riotx.features.crypto.keysbackup.restore import android.content.Context import androidx.lifecycle.MutableLiveData @@ -23,9 +23,9 @@ import im.vector.matrix.android.api.listeners.StepProgressListener import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupService import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersionResult -import im.vector.riotredesign.R -import im.vector.riotredesign.core.platform.WaitingViewData -import im.vector.riotredesign.core.ui.views.KeysBackupBanner +import im.vector.riotx.R +import im.vector.riotx.core.platform.WaitingViewData +import im.vector.riotx.core.ui.views.KeysBackupBanner import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt index d6c618ba..5eadbb70 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.crypto.keysbackup.restore +package im.vector.riotx.features.crypto.keysbackup.restore import android.content.Context import androidx.lifecycle.LiveData @@ -23,9 +23,9 @@ import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersionResult import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult -import im.vector.riotredesign.R -import im.vector.riotredesign.core.platform.WaitingViewData -import im.vector.riotredesign.core.utils.LiveEvent +import im.vector.riotx.R +import im.vector.riotx.core.platform.WaitingViewData +import im.vector.riotx.core.utils.LiveEvent import javax.inject.Inject class KeysBackupRestoreSharedViewModel @Inject constructor() : ViewModel() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt similarity index 90% rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt index def561ac..b743f88e 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.crypto.keysbackup.restore +package im.vector.riotx.features.crypto.keysbackup.restore import android.os.Bundle import android.widget.TextView import androidx.lifecycle.ViewModelProviders import butterknife.BindView import butterknife.OnClick -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.platform.VectorBaseFragment -import im.vector.riotredesign.core.utils.LiveEvent +import im.vector.riotx.R +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.riotx.core.utils.LiveEvent class KeysBackupRestoreSuccessFragment : VectorBaseFragment() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt similarity index 90% rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt index 273b32aa..32e08597 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt @@ -13,19 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.crypto.keysbackup.settings +package im.vector.riotx.features.crypto.keysbackup.settings import android.content.Context import android.content.Intent -import android.os.Bundle import androidx.appcompat.app.AlertDialog import com.airbnb.mvrx.Fail import com.airbnb.mvrx.Loading import com.airbnb.mvrx.viewModel -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.platform.SimpleFragmentActivity -import im.vector.riotredesign.core.platform.WaitingViewData +import im.vector.riotx.R +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.platform.SimpleFragmentActivity +import im.vector.riotx.core.platform.WaitingViewData import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt similarity index 85% rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt index b04949fd..52883004 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotredesign.features.crypto.keysbackup.settings +package im.vector.riotx.features.crypto.keysbackup.settings import android.view.View 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.riotredesign.core.epoxy.VectorEpoxyHolder -import im.vector.riotredesign.core.epoxy.VectorEpoxyModel -import im.vector.riotredesign.core.extensions.setTextOrHide +import im.vector.riotx.R +import im.vector.riotx.core.epoxy.VectorEpoxyHolder +import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.riotx.core.extensions.setTextOrHide @EpoxyModelClass(layout = R.layout.item_keys_backup_settings_button_footer) abstract class KeysBackupSettingFooterItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt index 0b7244b7..4800701e 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.crypto.keysbackup.settings +package im.vector.riotx.features.crypto.keysbackup.settings import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt similarity index 88% rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt index 72a97f37..c5c0d9d6 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.crypto.keysbackup.settings +package im.vector.riotx.features.crypto.keysbackup.settings import android.os.Bundle import android.view.View import androidx.appcompat.app.AlertDialog import com.airbnb.mvrx.activityViewModel import com.airbnb.mvrx.withState -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.platform.VectorBaseFragment -import im.vector.riotredesign.features.crypto.keysbackup.restore.KeysBackupRestoreActivity -import im.vector.riotredesign.features.crypto.keysbackup.setup.KeysBackupSetupActivity +import im.vector.riotx.R +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreActivity +import im.vector.riotx.features.crypto.keysbackup.setup.KeysBackupSetupActivity import kotlinx.android.synthetic.main.fragment_keys_backup_settings.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt index 6e555b58..95e59007 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.crypto.keysbackup.settings +package im.vector.riotx.features.crypto.keysbackup.settings import android.view.View import com.airbnb.epoxy.TypedEpoxyController @@ -25,12 +25,12 @@ import com.airbnb.mvrx.Uninitialized import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState import im.vector.matrix.android.internal.crypto.keysbackup.model.KeysBackupVersionTrust -import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.errorWithRetryItem -import im.vector.riotredesign.core.epoxy.loadingItem -import im.vector.riotredesign.core.resources.StringProvider -import im.vector.riotredesign.core.ui.list.GenericItem -import im.vector.riotredesign.core.ui.list.genericItem +import im.vector.riotx.R +import im.vector.riotx.core.epoxy.errorWithRetryItem +import im.vector.riotx.core.epoxy.loadingItem +import im.vector.riotx.core.resources.StringProvider +import im.vector.riotx.core.ui.list.GenericItem +import im.vector.riotx.core.ui.list.genericItem import java.util.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt index d656d90c..5ce1ab98 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.crypto.keysbackup.settings +package im.vector.riotx.features.crypto.keysbackup.settings import com.airbnb.mvrx.ActivityViewModelContext import com.airbnb.mvrx.Fail @@ -30,7 +30,7 @@ import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupService import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupStateListener import im.vector.matrix.android.internal.crypto.keysbackup.model.KeysBackupVersionTrust -import im.vector.riotredesign.core.platform.VectorViewModel +import im.vector.riotx.core.platform.VectorViewModel class KeysBackupSettingsViewModel @AssistedInject constructor(@Assisted initialState: KeysBackupSettingViewState, diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt index c5e479fc..77780016 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.crypto.keysbackup.setup +package im.vector.riotx.features.crypto.keysbackup.setup import android.content.Context import android.content.Intent @@ -23,12 +23,12 @@ import androidx.fragment.app.FragmentManager import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProviders import im.vector.matrix.android.api.MatrixCallback -import im.vector.riotredesign.R -import im.vector.riotredesign.core.dialogs.ExportKeysDialog -import im.vector.riotredesign.core.extensions.observeEvent -import im.vector.riotredesign.core.platform.SimpleFragmentActivity -import im.vector.riotredesign.core.utils.toast -import im.vector.riotredesign.features.crypto.keys.KeysExporter +import im.vector.riotx.R +import im.vector.riotx.core.dialogs.ExportKeysDialog +import im.vector.riotx.core.extensions.observeEvent +import im.vector.riotx.core.platform.SimpleFragmentActivity +import im.vector.riotx.core.utils.toast +import im.vector.riotx.features.crypto.keys.KeysExporter class KeysBackupSetupActivity : SimpleFragmentActivity() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt index 1381b922..c5cf9100 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.crypto.keysbackup.setup +package im.vector.riotx.features.crypto.keysbackup.setup import android.content.Context import androidx.lifecycle.MutableLiveData @@ -27,9 +27,9 @@ import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupService import im.vector.matrix.android.internal.crypto.keysbackup.model.MegolmBackupCreationInfo import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersion import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersionResult -import im.vector.riotredesign.R -import im.vector.riotredesign.core.platform.WaitingViewData -import im.vector.riotredesign.core.utils.LiveEvent +import im.vector.riotx.R +import im.vector.riotx.core.platform.WaitingViewData +import im.vector.riotx.core.utils.LiveEvent import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt similarity index 90% rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt index d1fe142a..75c1a638 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.crypto.keysbackup.setup +package im.vector.riotx.features.crypto.keysbackup.setup import android.os.Bundle import android.view.View @@ -24,10 +24,10 @@ import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProviders import butterknife.BindView import butterknife.OnClick -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.platform.VectorBaseFragment -import im.vector.riotredesign.core.utils.LiveEvent +import im.vector.riotx.R +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.riotx.core.utils.LiveEvent class KeysBackupSetupStep1Fragment : VectorBaseFragment() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt index 7d0ca797..b31fe2a2 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.crypto.keysbackup.setup +package im.vector.riotx.features.crypto.keysbackup.setup import android.os.AsyncTask import android.os.Bundle @@ -30,12 +30,12 @@ import butterknife.OnClick import butterknife.OnTextChanged import com.google.android.material.textfield.TextInputLayout import com.nulabinc.zxcvbn.Zxcvbn -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.extensions.showPassword -import im.vector.riotredesign.core.platform.VectorBaseFragment -import im.vector.riotredesign.core.ui.views.PasswordStrengthBar -import im.vector.riotredesign.features.settings.VectorLocale +import im.vector.riotx.R +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.extensions.showPassword +import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.riotx.core.ui.views.PasswordStrengthBar +import im.vector.riotx.features.settings.VectorLocale class KeysBackupSetupStep2Fragment : VectorBaseFragment() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt rename to vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt index dd937770..db400e5b 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.crypto.keysbackup.setup +package im.vector.riotx.features.crypto.keysbackup.setup import android.os.Bundle import android.os.Environment @@ -29,12 +29,12 @@ import arrow.core.Try import butterknife.BindView import butterknife.OnClick import com.google.android.material.bottomsheet.BottomSheetDialog -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.files.addEntryToDownloadManager -import im.vector.riotredesign.core.files.writeToFile -import im.vector.riotredesign.core.platform.VectorBaseFragment -import im.vector.riotredesign.core.utils.* +import im.vector.riotx.R +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.files.addEntryToDownloadManager +import im.vector.riotx.core.files.writeToFile +import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.riotx.core.utils.* import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysrequest/KeyRequestHandler.kt b/vector/src/main/java/im/vector/riotx/features/crypto/keysrequest/KeyRequestHandler.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/features/crypto/keysrequest/KeyRequestHandler.kt rename to vector/src/main/java/im/vector/riotx/features/crypto/keysrequest/KeyRequestHandler.kt index a583760a..1bbd8b38 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/crypto/keysrequest/KeyRequestHandler.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/keysrequest/KeyRequestHandler.kt @@ -17,7 +17,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.crypto.keysrequest +package im.vector.riotx.features.crypto.keysrequest import android.content.Context import android.text.TextUtils @@ -33,9 +33,9 @@ import im.vector.matrix.android.internal.crypto.model.MXDeviceInfo import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo import im.vector.matrix.android.internal.crypto.model.rest.DevicesListResponse -import im.vector.riotredesign.R -import im.vector.riotredesign.features.crypto.verification.SASVerificationActivity -import im.vector.riotredesign.features.popup.PopupAlertManager +import im.vector.riotx.R +import im.vector.riotx.features.crypto.verification.SASVerificationActivity +import im.vector.riotx.features.popup.PopupAlertManager import timber.log.Timber import java.text.DateFormat import java.text.SimpleDateFormat diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/verification/IncomingVerificationRequestHandler.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/IncomingVerificationRequestHandler.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/features/crypto/verification/IncomingVerificationRequestHandler.kt rename to vector/src/main/java/im/vector/riotx/features/crypto/verification/IncomingVerificationRequestHandler.kt index cfa35ed4..7f7c4741 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/crypto/verification/IncomingVerificationRequestHandler.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/IncomingVerificationRequestHandler.kt @@ -13,17 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.crypto.verification +package im.vector.riotx.features.crypto.verification import android.content.Context -import im.vector.matrix.android.api.Matrix -import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.crypto.sas.SasVerificationService import im.vector.matrix.android.api.session.crypto.sas.SasVerificationTransaction import im.vector.matrix.android.api.session.crypto.sas.SasVerificationTxState -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ActiveSessionHolder -import im.vector.riotredesign.features.popup.PopupAlertManager +import im.vector.riotx.R +import im.vector.riotx.core.di.ActiveSessionHolder +import im.vector.riotx.features.popup.PopupAlertManager import javax.inject.Inject import javax.inject.Singleton diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationActivity.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationActivity.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationActivity.kt rename to vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationActivity.kt index c66a001c..2c695cad 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationActivity.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.crypto.verification +package im.vector.riotx.features.crypto.verification import android.app.Activity import android.content.Context @@ -26,10 +26,10 @@ import im.vector.matrix.android.api.session.crypto.sas.CancelCode import im.vector.matrix.android.api.session.crypto.sas.IncomingSasVerificationTransaction import im.vector.matrix.android.api.session.crypto.sas.OutgoingSasVerificationRequest import im.vector.matrix.android.api.session.crypto.sas.SasVerificationTxState -import im.vector.riotredesign.R -import im.vector.riotredesign.core.extensions.observeEvent -import im.vector.riotredesign.core.platform.SimpleFragmentActivity -import im.vector.riotredesign.core.platform.WaitingViewData +import im.vector.riotx.R +import im.vector.riotx.core.extensions.observeEvent +import im.vector.riotx.core.platform.SimpleFragmentActivity +import im.vector.riotx.core.platform.WaitingViewData class SASVerificationActivity : SimpleFragmentActivity() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationIncomingFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationIncomingFragment.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationIncomingFragment.kt rename to vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationIncomingFragment.kt index 6acbad55..bd0ec223 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationIncomingFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationIncomingFragment.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.crypto.verification +package im.vector.riotx.features.crypto.verification import android.os.Bundle import android.widget.ImageView @@ -23,10 +23,10 @@ import androidx.lifecycle.ViewModelProviders import butterknife.BindView import butterknife.OnClick import im.vector.matrix.android.api.session.crypto.sas.IncomingSasVerificationTransaction -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.platform.VectorBaseFragment -import im.vector.riotredesign.features.home.AvatarRenderer +import im.vector.riotx.R +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.riotx.features.home.AvatarRenderer import javax.inject.Inject class SASVerificationIncomingFragment : VectorBaseFragment() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationShortCodeFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationShortCodeFragment.kt similarity index 98% rename from vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationShortCodeFragment.kt rename to vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationShortCodeFragment.kt index faf40995..5cc0d525 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationShortCodeFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationShortCodeFragment.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.crypto.verification +package im.vector.riotx.features.crypto.verification import android.os.Bundle import android.view.ViewGroup @@ -26,8 +26,8 @@ import butterknife.BindView import butterknife.OnClick import im.vector.matrix.android.api.session.crypto.sas.IncomingSasVerificationTransaction import im.vector.matrix.android.api.session.crypto.sas.OutgoingSasVerificationRequest -import im.vector.riotredesign.R -import im.vector.riotredesign.core.platform.VectorBaseFragment +import im.vector.riotx.R +import im.vector.riotx.core.platform.VectorBaseFragment class SASVerificationShortCodeFragment : VectorBaseFragment() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationStartFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationStartFragment.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationStartFragment.kt rename to vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationStartFragment.kt index ce92888c..30b2a26b 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationStartFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationStartFragment.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.crypto.verification +package im.vector.riotx.features.crypto.verification import android.os.Bundle import android.view.ViewGroup @@ -28,9 +28,9 @@ import androidx.transition.TransitionManager import butterknife.BindView import butterknife.OnClick import im.vector.matrix.android.api.session.crypto.sas.OutgoingSasVerificationRequest -import im.vector.riotredesign.R -import im.vector.riotredesign.core.platform.VectorBaseActivity -import im.vector.riotredesign.core.platform.VectorBaseFragment +import im.vector.riotx.R +import im.vector.riotx.core.platform.VectorBaseActivity +import im.vector.riotx.core.platform.VectorBaseFragment class SASVerificationStartFragment : VectorBaseFragment() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationVerifiedFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationVerifiedFragment.kt similarity index 90% rename from vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationVerifiedFragment.kt rename to vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationVerifiedFragment.kt index 47e874be..5392f89e 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SASVerificationVerifiedFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/SASVerificationVerifiedFragment.kt @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.crypto.verification +package im.vector.riotx.features.crypto.verification import android.os.Bundle import androidx.lifecycle.ViewModelProviders import butterknife.OnClick -import im.vector.riotredesign.R -import im.vector.riotredesign.core.platform.VectorBaseFragment +import im.vector.riotx.R +import im.vector.riotx.core.platform.VectorBaseFragment class SASVerificationVerifiedFragment : VectorBaseFragment() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SasVerificationViewModel.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/SasVerificationViewModel.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SasVerificationViewModel.kt rename to vector/src/main/java/im/vector/riotx/features/crypto/verification/SasVerificationViewModel.kt index 31fc91a4..87a420d3 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/crypto/verification/SasVerificationViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/SasVerificationViewModel.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.crypto.verification +package im.vector.riotx.features.crypto.verification import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -24,7 +24,7 @@ import im.vector.matrix.android.api.session.crypto.sas.SasVerificationService import im.vector.matrix.android.api.session.crypto.sas.SasVerificationTransaction import im.vector.matrix.android.api.session.crypto.sas.SasVerificationTxState import im.vector.matrix.android.api.session.user.model.User -import im.vector.riotredesign.core.utils.LiveEvent +import im.vector.riotx.core.utils.LiveEvent import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/disclaimer/DisclaimerDialog.kt b/vector/src/main/java/im/vector/riotx/features/disclaimer/DisclaimerDialog.kt similarity index 90% rename from vector/src/main/java/im/vector/riotredesign/features/disclaimer/DisclaimerDialog.kt rename to vector/src/main/java/im/vector/riotx/features/disclaimer/DisclaimerDialog.kt index bf4a4094..6756033f 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/disclaimer/DisclaimerDialog.kt +++ b/vector/src/main/java/im/vector/riotx/features/disclaimer/DisclaimerDialog.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.disclaimer +package im.vector.riotx.features.disclaimer import android.app.Activity import android.preference.PreferenceManager @@ -22,10 +22,10 @@ import android.view.ViewGroup import android.widget.TextView import androidx.appcompat.app.AlertDialog import androidx.core.content.edit -import im.vector.riotredesign.BuildConfig -import im.vector.riotredesign.R -import im.vector.riotredesign.core.extensions.setTextWithColoredPart -import im.vector.riotredesign.core.utils.openPlayStore +import im.vector.riotx.BuildConfig +import im.vector.riotx.R +import im.vector.riotx.core.extensions.setTextWithColoredPart +import im.vector.riotx.core.utils.openPlayStore // Increase this value to show again the disclaimer dialog after an upgrade of the application private const val CURRENT_DISCLAIMER_VALUE = 1 diff --git a/vector/src/main/java/im/vector/riotredesign/features/form/FormEditTextItem.kt b/vector/src/main/java/im/vector/riotx/features/form/FormEditTextItem.kt similarity index 89% rename from vector/src/main/java/im/vector/riotredesign/features/form/FormEditTextItem.kt rename to vector/src/main/java/im/vector/riotx/features/form/FormEditTextItem.kt index e714f61e..06f364ab 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/form/FormEditTextItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/form/FormEditTextItem.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotredesign.features.form +package im.vector.riotx.features.form import android.text.Editable import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import com.google.android.material.textfield.TextInputEditText import com.google.android.material.textfield.TextInputLayout -import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder -import im.vector.riotredesign.core.epoxy.VectorEpoxyModel -import im.vector.riotredesign.core.platform.SimpleTextWatcher +import im.vector.riotx.R +import im.vector.riotx.core.epoxy.VectorEpoxyHolder +import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.riotx.core.platform.SimpleTextWatcher @EpoxyModelClass(layout = R.layout.item_form_text_input) abstract class FormEditTextItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/form/FormSwitchItem.kt b/vector/src/main/java/im/vector/riotx/features/form/FormSwitchItem.kt similarity index 88% rename from vector/src/main/java/im/vector/riotredesign/features/form/FormSwitchItem.kt rename to vector/src/main/java/im/vector/riotx/features/form/FormSwitchItem.kt index 6d8f6272..893858ac 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/form/FormSwitchItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/form/FormSwitchItem.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package im.vector.riotredesign.features.form +package im.vector.riotx.features.form import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import com.google.android.material.switchmaterial.SwitchMaterial -import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder -import im.vector.riotredesign.core.epoxy.VectorEpoxyModel -import im.vector.riotredesign.core.extensions.setTextOrHide +import im.vector.riotx.R +import im.vector.riotx.core.epoxy.VectorEpoxyHolder +import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.riotx.core.extensions.setTextOrHide @EpoxyModelClass(layout = R.layout.item_form_switch) abstract class FormSwitchItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/AvatarRenderer.kt b/vector/src/main/java/im/vector/riotx/features/home/AvatarRenderer.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/features/home/AvatarRenderer.kt rename to vector/src/main/java/im/vector/riotx/features/home/AvatarRenderer.kt index a9943a6e..83829e46 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/AvatarRenderer.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/AvatarRenderer.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home +package im.vector.riotx.features.home import android.content.Context import android.graphics.drawable.Drawable @@ -30,11 +30,11 @@ import im.vector.matrix.android.api.MatrixPatterns import im.vector.matrix.android.api.session.content.ContentUrlResolver import im.vector.matrix.android.api.session.room.model.RoomSummary import im.vector.matrix.android.api.session.user.model.User -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ActiveSessionHolder -import im.vector.riotredesign.core.glide.GlideApp -import im.vector.riotredesign.core.glide.GlideRequest -import im.vector.riotredesign.core.glide.GlideRequests +import im.vector.riotx.R +import im.vector.riotx.core.di.ActiveSessionHolder +import im.vector.riotx.core.glide.GlideApp +import im.vector.riotx.core.glide.GlideRequest +import im.vector.riotx.core.glide.GlideRequests import javax.inject.Inject /** diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt similarity index 86% rename from vector/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt rename to vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt index 71d40de5..11d1248c 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home +package im.vector.riotx.features.home import android.app.ProgressDialog import android.content.Context @@ -29,23 +29,23 @@ import androidx.fragment.app.FragmentManager import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProviders import com.airbnb.mvrx.viewModel -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ActiveSessionHolder -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.extensions.hideKeyboard -import im.vector.riotredesign.core.extensions.observeEvent -import im.vector.riotredesign.core.extensions.replaceFragment -import im.vector.riotredesign.core.platform.OnBackPressed -import im.vector.riotredesign.core.platform.ToolbarConfigurable -import im.vector.riotredesign.core.platform.VectorBaseActivity -import im.vector.riotredesign.core.pushers.PushersManager -import im.vector.riotredesign.features.crypto.keysrequest.KeyRequestHandler -import im.vector.riotredesign.features.crypto.verification.IncomingVerificationRequestHandler -import im.vector.riotredesign.features.disclaimer.showDisclaimerDialog -import im.vector.riotredesign.features.notifications.NotificationDrawerManager -import im.vector.riotredesign.features.rageshake.VectorUncaughtExceptionHandler -import im.vector.riotredesign.features.workers.signout.SignOutViewModel -import im.vector.riotredesign.push.fcm.FcmHelper +import im.vector.riotx.R +import im.vector.riotx.core.di.ActiveSessionHolder +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.extensions.hideKeyboard +import im.vector.riotx.core.extensions.observeEvent +import im.vector.riotx.core.extensions.replaceFragment +import im.vector.riotx.core.platform.OnBackPressed +import im.vector.riotx.core.platform.ToolbarConfigurable +import im.vector.riotx.core.platform.VectorBaseActivity +import im.vector.riotx.core.pushers.PushersManager +import im.vector.riotx.features.crypto.keysrequest.KeyRequestHandler +import im.vector.riotx.features.crypto.verification.IncomingVerificationRequestHandler +import im.vector.riotx.features.disclaimer.showDisclaimerDialog +import im.vector.riotx.features.notifications.NotificationDrawerManager +import im.vector.riotx.features.rageshake.VectorUncaughtExceptionHandler +import im.vector.riotx.features.workers.signout.SignOutViewModel +import im.vector.riotx.push.fcm.FcmHelper import kotlinx.android.synthetic.main.activity_home.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivityViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewModel.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/features/home/HomeActivityViewModel.kt rename to vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewModel.kt index a2f373fa..36d57255 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivityViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home +package im.vector.riotx.features.home import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -31,9 +31,9 @@ import im.vector.matrix.android.api.session.group.model.GroupSummary import im.vector.matrix.android.api.session.room.model.RoomSummary import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams import im.vector.matrix.rx.rx -import im.vector.riotredesign.core.platform.VectorViewModel -import im.vector.riotredesign.features.home.group.ALL_COMMUNITIES_GROUP_ID -import im.vector.riotredesign.features.home.group.SelectedGroupStore +import im.vector.riotx.core.platform.VectorViewModel +import im.vector.riotx.features.home.group.ALL_COMMUNITIES_GROUP_ID +import im.vector.riotx.features.home.group.SelectedGroupStore import io.reactivex.Observable import io.reactivex.functions.BiFunction import java.util.concurrent.TimeUnit diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeDetailFragment.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailFragment.kt rename to vector/src/main/java/im/vector/riotx/features/home/HomeDetailFragment.kt index 4ea3df5d..e24ae7ff 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/HomeDetailFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home +package im.vector.riotx.features.home import android.os.Bundle import android.os.Parcelable @@ -31,15 +31,15 @@ import com.google.android.material.bottomnavigation.BottomNavigationMenuView import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState import im.vector.matrix.android.api.session.sync.SyncState -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.platform.ToolbarConfigurable -import im.vector.riotredesign.core.platform.VectorBaseFragment -import im.vector.riotredesign.core.ui.views.KeysBackupBanner -import im.vector.riotredesign.features.home.room.list.RoomListFragment -import im.vector.riotredesign.features.home.room.list.RoomListParams -import im.vector.riotredesign.features.home.room.list.UnreadCounterBadgeView -import im.vector.riotredesign.features.workers.signout.SignOutViewModel +import im.vector.riotx.R +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.platform.ToolbarConfigurable +import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.riotx.core.ui.views.KeysBackupBanner +import im.vector.riotx.features.home.room.list.RoomListFragment +import im.vector.riotx.features.home.room.list.RoomListParams +import im.vector.riotx.features.home.room.list.UnreadCounterBadgeView +import im.vector.riotx.features.workers.signout.SignOutViewModel import kotlinx.android.parcel.Parcelize import kotlinx.android.synthetic.main.fragment_home_detail.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewModel.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailViewModel.kt rename to vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewModel.kt index 59ff9a75..2b5a993e 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home +package im.vector.riotx.features.home import com.airbnb.mvrx.FragmentViewModelContext import com.airbnb.mvrx.MvRxViewModelFactory @@ -23,7 +23,7 @@ import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject import im.vector.matrix.android.api.session.Session import im.vector.matrix.rx.rx -import im.vector.riotredesign.core.platform.VectorViewModel +import im.vector.riotx.core.platform.VectorViewModel /** * View model used to update the home bottom bar notification counts diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailViewState.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewState.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailViewState.kt rename to vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewState.kt index f201ea79..970951bf 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailViewState.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home +package im.vector.riotx.features.home import com.airbnb.mvrx.MvRxState import im.vector.matrix.android.api.session.sync.SyncState diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeDrawerFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeDrawerFragment.kt similarity index 85% rename from vector/src/main/java/im/vector/riotredesign/features/home/HomeDrawerFragment.kt rename to vector/src/main/java/im/vector/riotx/features/home/HomeDrawerFragment.kt index 378b6a1b..832e8a5e 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeDrawerFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/HomeDrawerFragment.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home +package im.vector.riotx.features.home import android.os.Bundle import im.vector.matrix.android.api.session.Session -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.extensions.observeK -import im.vector.riotredesign.core.extensions.replaceChildFragment -import im.vector.riotredesign.core.platform.VectorBaseFragment -import im.vector.riotredesign.features.home.group.GroupListFragment +import im.vector.riotx.R +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.extensions.observeK +import im.vector.riotx.core.extensions.replaceChildFragment +import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.riotx.features.home.group.GroupListFragment import kotlinx.android.synthetic.main.fragment_home_drawer.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeModule.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeModule.kt similarity index 79% rename from vector/src/main/java/im/vector/riotredesign/features/home/HomeModule.kt rename to vector/src/main/java/im/vector/riotx/features/home/HomeModule.kt index eee5b8e8..4c65aed2 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeModule.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/HomeModule.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home +package im.vector.riotx.features.home import android.os.Handler import dagger.Module import dagger.Provides -import im.vector.riotredesign.features.home.room.detail.timeline.TimelineEventControllerHandler -import im.vector.riotredesign.features.home.room.detail.timeline.helper.TimelineAsyncHelper +import im.vector.riotx.features.home.room.detail.timeline.TimelineEventControllerHandler +import im.vector.riotx.features.home.room.detail.timeline.helper.TimelineAsyncHelper @Module object HomeModule { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeNavigationViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeNavigationViewModel.kt similarity index 87% rename from vector/src/main/java/im/vector/riotredesign/features/home/HomeNavigationViewModel.kt rename to vector/src/main/java/im/vector/riotx/features/home/HomeNavigationViewModel.kt index c678b5f5..2d7a121d 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeNavigationViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/HomeNavigationViewModel.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home +package im.vector.riotx.features.home -import im.vector.riotredesign.core.mvrx.NavigationViewModel +import im.vector.riotx.core.mvrx.NavigationViewModel import javax.inject.Inject class HomeNavigationViewModel @Inject constructor() : NavigationViewModel() \ No newline at end of file diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeNavigator.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeNavigator.kt similarity index 91% rename from vector/src/main/java/im/vector/riotredesign/features/home/HomeNavigator.kt rename to vector/src/main/java/im/vector/riotx/features/home/HomeNavigator.kt index 0d1c3206..680d7bbc 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeNavigator.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/HomeNavigator.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home +package im.vector.riotx.features.home import androidx.core.view.GravityCompat import im.vector.matrix.android.api.session.group.model.GroupSummary -import im.vector.riotredesign.R -import im.vector.riotredesign.core.extensions.replaceFragment +import im.vector.riotx.R +import im.vector.riotx.core.extensions.replaceFragment import kotlinx.android.synthetic.main.activity_home.* import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeRoomListObservableStore.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeRoomListObservableStore.kt similarity index 82% rename from vector/src/main/java/im/vector/riotredesign/features/home/HomeRoomListObservableStore.kt rename to vector/src/main/java/im/vector/riotx/features/home/HomeRoomListObservableStore.kt index e455961f..f1f7e551 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeRoomListObservableStore.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/HomeRoomListObservableStore.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home +package im.vector.riotx.features.home import im.vector.matrix.android.api.session.room.model.RoomSummary -import im.vector.riotredesign.core.utils.RxStore -import im.vector.riotredesign.features.home.room.list.RoomListDisplayModeFilter -import im.vector.riotredesign.features.home.room.list.RoomListFragment +import im.vector.riotx.core.utils.RxStore +import im.vector.riotx.features.home.room.list.RoomListDisplayModeFilter +import im.vector.riotx.features.home.room.list.RoomListFragment import io.reactivex.Observable import javax.inject.Inject import javax.inject.Singleton diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/LoadingFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/LoadingFragment.kt similarity index 90% rename from vector/src/main/java/im/vector/riotredesign/features/home/LoadingFragment.kt rename to vector/src/main/java/im/vector/riotx/features/home/LoadingFragment.kt index d06a8275..85cd5c2e 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/LoadingFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/LoadingFragment.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home +package im.vector.riotx.features.home import android.graphics.drawable.AnimationDrawable import android.os.Bundle import android.view.View -import im.vector.riotredesign.R -import im.vector.riotredesign.core.platform.VectorBaseFragment +import im.vector.riotx.R +import im.vector.riotx.core.platform.VectorBaseFragment import kotlinx.android.synthetic.main.fragment_loading.* class LoadingFragment : VectorBaseFragment() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/PermalinkHandler.kt b/vector/src/main/java/im/vector/riotx/features/home/PermalinkHandler.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/features/home/PermalinkHandler.kt rename to vector/src/main/java/im/vector/riotx/features/home/PermalinkHandler.kt index 825e9748..c2148bcd 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/PermalinkHandler.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/PermalinkHandler.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home +package im.vector.riotx.features.home import android.content.Context import android.net.Uri import im.vector.matrix.android.api.permalinks.PermalinkData import im.vector.matrix.android.api.permalinks.PermalinkParser import im.vector.matrix.android.api.session.Session -import im.vector.riotredesign.features.navigation.Navigator +import im.vector.riotx.features.navigation.Navigator import javax.inject.Inject class PermalinkHandler @Inject constructor(private val session: Session, diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/UserColor.kt b/vector/src/main/java/im/vector/riotx/features/home/UserColor.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/features/home/UserColor.kt rename to vector/src/main/java/im/vector/riotx/features/home/UserColor.kt index bd3f60f4..ff05d98b 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/UserColor.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/UserColor.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home +package im.vector.riotx.features.home import androidx.annotation.ColorRes -import im.vector.riotredesign.R +import im.vector.riotx.R @ColorRes diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListActions.kt b/vector/src/main/java/im/vector/riotx/features/home/group/GroupListActions.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListActions.kt rename to vector/src/main/java/im/vector/riotx/features/home/group/GroupListActions.kt index ea92cae8..7c3a3f56 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListActions.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/group/GroupListActions.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.group +package im.vector.riotx.features.home.group import im.vector.matrix.android.api.session.group.model.GroupSummary diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/group/GroupListFragment.kt similarity index 86% rename from vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListFragment.kt rename to vector/src/main/java/im/vector/riotx/features/home/group/GroupListFragment.kt index 568e8498..61e68dfb 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/group/GroupListFragment.kt @@ -14,20 +14,19 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.group +package im.vector.riotx.features.home.group -import android.content.Context import android.os.Bundle import com.airbnb.mvrx.Incomplete import com.airbnb.mvrx.Success import com.airbnb.mvrx.fragmentViewModel import im.vector.matrix.android.api.session.group.model.GroupSummary -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.extensions.observeEvent -import im.vector.riotredesign.core.platform.StateView -import im.vector.riotredesign.core.platform.VectorBaseFragment -import im.vector.riotredesign.features.home.HomeNavigator +import im.vector.riotx.R +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.extensions.observeEvent +import im.vector.riotx.core.platform.StateView +import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.riotx.features.home.HomeNavigator import kotlinx.android.synthetic.main.fragment_group_list.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/group/GroupListViewModel.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListViewModel.kt rename to vector/src/main/java/im/vector/riotx/features/home/group/GroupListViewModel.kt index fdb62098..229652b0 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/group/GroupListViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.group +package im.vector.riotx.features.home.group import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -27,10 +27,10 @@ import com.squareup.inject.assisted.AssistedInject import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.group.model.GroupSummary import im.vector.matrix.rx.rx -import im.vector.riotredesign.R -import im.vector.riotredesign.core.platform.VectorViewModel -import im.vector.riotredesign.core.resources.StringProvider -import im.vector.riotredesign.core.utils.LiveEvent +import im.vector.riotx.R +import im.vector.riotx.core.platform.VectorViewModel +import im.vector.riotx.core.resources.StringProvider +import im.vector.riotx.core.utils.LiveEvent const val ALL_COMMUNITIES_GROUP_ID = "ALL_COMMUNITIES_GROUP_ID" diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListViewState.kt b/vector/src/main/java/im/vector/riotx/features/home/group/GroupListViewState.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListViewState.kt rename to vector/src/main/java/im/vector/riotx/features/home/group/GroupListViewState.kt index 0ee8b095..c86e9ef1 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListViewState.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/group/GroupListViewState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.group +package im.vector.riotx.features.home.group import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupSummaryController.kt b/vector/src/main/java/im/vector/riotx/features/home/group/GroupSummaryController.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/features/home/group/GroupSummaryController.kt rename to vector/src/main/java/im/vector/riotx/features/home/group/GroupSummaryController.kt index 02904be3..785f8330 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupSummaryController.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/group/GroupSummaryController.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.group +package im.vector.riotx.features.home.group import com.airbnb.epoxy.TypedEpoxyController import im.vector.matrix.android.api.session.group.model.GroupSummary -import im.vector.riotredesign.features.home.AvatarRenderer +import im.vector.riotx.features.home.AvatarRenderer import javax.inject.Inject class GroupSummaryController @Inject constructor(private val avatarRenderer: AvatarRenderer): TypedEpoxyController() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupSummaryItem.kt b/vector/src/main/java/im/vector/riotx/features/home/group/GroupSummaryItem.kt similarity index 84% rename from vector/src/main/java/im/vector/riotredesign/features/home/group/GroupSummaryItem.kt rename to vector/src/main/java/im/vector/riotx/features/home/group/GroupSummaryItem.kt index 1abb59bd..d1dd55a3 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupSummaryItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/group/GroupSummaryItem.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.group +package im.vector.riotx.features.home.group import android.widget.ImageView import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder -import im.vector.riotredesign.core.epoxy.VectorEpoxyModel -import im.vector.riotredesign.core.platform.CheckableConstraintLayout -import im.vector.riotredesign.features.home.AvatarRenderer +import im.vector.riotx.R +import im.vector.riotx.core.epoxy.VectorEpoxyHolder +import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.riotx.core.platform.CheckableConstraintLayout +import im.vector.riotx.features.home.AvatarRenderer @EpoxyModelClass(layout = R.layout.item_group) abstract class GroupSummaryItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/group/SelectedGroupStore.kt b/vector/src/main/java/im/vector/riotx/features/home/group/SelectedGroupStore.kt similarity index 89% rename from vector/src/main/java/im/vector/riotredesign/features/home/group/SelectedGroupStore.kt rename to vector/src/main/java/im/vector/riotx/features/home/group/SelectedGroupStore.kt index 5bd0cc4e..a6291ecb 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/group/SelectedGroupStore.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/group/SelectedGroupStore.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.group +package im.vector.riotx.features.home.group import arrow.core.Option import im.vector.matrix.android.api.session.group.model.GroupSummary -import im.vector.riotredesign.core.utils.RxStore +import im.vector.riotx.core.utils.RxStore import javax.inject.Inject import javax.inject.Singleton diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/VisibleRoomStore.kt b/vector/src/main/java/im/vector/riotx/features/home/room/VisibleRoomStore.kt similarity index 86% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/VisibleRoomStore.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/VisibleRoomStore.kt index 6b2d60f6..9805607c 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/VisibleRoomStore.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/VisibleRoomStore.kt @@ -14,8 +14,8 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room +package im.vector.riotx.features.home.room -import im.vector.riotredesign.core.utils.RxStore +import im.vector.riotx.core.utils.RxStore class VisibleRoomStore : RxStore() diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailActions.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailActions.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailActions.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailActions.kt index 2cf066ad..df5cfc96 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailActions.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailActions.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail +package im.vector.riotx.features.home.room.detail import com.jaiselrahman.filepicker.model.MediaFile import im.vector.matrix.android.api.session.room.model.EditAggregatedSummary diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailActivity.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailActivity.kt similarity index 86% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailActivity.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailActivity.kt index a7de1cfb..9108f5d0 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailActivity.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail +package im.vector.riotx.features.home.room.detail import android.content.Context import android.content.Intent import android.os.Bundle import androidx.appcompat.widget.Toolbar -import im.vector.riotredesign.R -import im.vector.riotredesign.core.extensions.replaceFragment -import im.vector.riotredesign.core.platform.ToolbarConfigurable -import im.vector.riotredesign.core.platform.VectorBaseActivity +import im.vector.riotx.R +import im.vector.riotx.core.extensions.replaceFragment +import im.vector.riotx.core.platform.ToolbarConfigurable +import im.vector.riotx.core.platform.VectorBaseActivity class RoomDetailActivity : VectorBaseActivity(), ToolbarConfigurable { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt similarity index 91% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailFragment.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt index 8c15900d..32458f23 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail +package im.vector.riotx.features.home.room.detail import android.annotation.SuppressLint import android.app.Activity.RESULT_OK @@ -60,51 +60,51 @@ import im.vector.matrix.android.api.session.room.model.Membership import im.vector.matrix.android.api.session.room.model.message.* import im.vector.matrix.android.api.session.room.timeline.TimelineEvent import im.vector.matrix.android.api.session.user.model.User -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.dialogs.DialogListItem -import im.vector.riotredesign.core.epoxy.LayoutManagerStateRestorer -import im.vector.riotredesign.core.extensions.hideKeyboard -import im.vector.riotredesign.core.extensions.observeEvent -import im.vector.riotredesign.core.extensions.setTextOrHide -import im.vector.riotredesign.core.glide.GlideApp -import im.vector.riotredesign.core.platform.VectorBaseFragment -import im.vector.riotredesign.core.utils.PERMISSIONS_FOR_TAKING_PHOTO -import im.vector.riotredesign.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA -import im.vector.riotredesign.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_NATIVE_CAMERA -import im.vector.riotredesign.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_NATIVE_VIDEO_CAMERA -import im.vector.riotredesign.core.utils.checkPermissions -import im.vector.riotredesign.core.utils.copyToClipboard -import im.vector.riotredesign.core.utils.openCamera -import im.vector.riotredesign.core.utils.shareMedia -import im.vector.riotredesign.features.autocomplete.command.AutocompleteCommandPresenter -import im.vector.riotredesign.features.autocomplete.command.CommandAutocompletePolicy -import im.vector.riotredesign.features.autocomplete.user.AutocompleteUserPresenter -import im.vector.riotredesign.features.command.Command -import im.vector.riotredesign.features.home.AvatarRenderer -import im.vector.riotredesign.features.home.NavigateToRoomInterceptor -import im.vector.riotredesign.features.home.PermalinkHandler -import im.vector.riotredesign.features.home.getColorFromUserId -import im.vector.riotredesign.features.home.room.detail.composer.TextComposerActions -import im.vector.riotredesign.features.home.room.detail.composer.TextComposerView -import im.vector.riotredesign.features.home.room.detail.composer.TextComposerViewModel -import im.vector.riotredesign.features.home.room.detail.composer.TextComposerViewState -import im.vector.riotredesign.features.home.room.detail.timeline.TimelineEventController -import im.vector.riotredesign.features.home.room.detail.timeline.action.ActionsHandler -import im.vector.riotredesign.features.home.room.detail.timeline.action.MessageActionsBottomSheet -import im.vector.riotredesign.features.home.room.detail.timeline.action.MessageMenuViewModel -import im.vector.riotredesign.features.home.room.detail.timeline.action.ViewReactionBottomSheet -import im.vector.riotredesign.features.home.room.detail.timeline.helper.EndlessRecyclerViewScrollListener -import im.vector.riotredesign.features.home.room.detail.timeline.item.MessageInformationData -import im.vector.riotredesign.features.html.PillImageSpan -import im.vector.riotredesign.features.invite.VectorInviteView -import im.vector.riotredesign.features.media.ImageContentRenderer -import im.vector.riotredesign.features.media.ImageMediaViewerActivity -import im.vector.riotredesign.features.media.VideoContentRenderer -import im.vector.riotredesign.features.media.VideoMediaViewerActivity -import im.vector.riotredesign.features.notifications.NotificationDrawerManager -import im.vector.riotredesign.features.reactions.EmojiReactionPickerActivity -import im.vector.riotredesign.features.settings.PreferencesManager +import im.vector.riotx.R +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.dialogs.DialogListItem +import im.vector.riotx.core.epoxy.LayoutManagerStateRestorer +import im.vector.riotx.core.extensions.hideKeyboard +import im.vector.riotx.core.extensions.observeEvent +import im.vector.riotx.core.extensions.setTextOrHide +import im.vector.riotx.core.glide.GlideApp +import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.riotx.core.utils.PERMISSIONS_FOR_TAKING_PHOTO +import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA +import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_NATIVE_CAMERA +import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_NATIVE_VIDEO_CAMERA +import im.vector.riotx.core.utils.checkPermissions +import im.vector.riotx.core.utils.copyToClipboard +import im.vector.riotx.core.utils.openCamera +import im.vector.riotx.core.utils.shareMedia +import im.vector.riotx.features.autocomplete.command.AutocompleteCommandPresenter +import im.vector.riotx.features.autocomplete.command.CommandAutocompletePolicy +import im.vector.riotx.features.autocomplete.user.AutocompleteUserPresenter +import im.vector.riotx.features.command.Command +import im.vector.riotx.features.home.AvatarRenderer +import im.vector.riotx.features.home.NavigateToRoomInterceptor +import im.vector.riotx.features.home.PermalinkHandler +import im.vector.riotx.features.home.getColorFromUserId +import im.vector.riotx.features.home.room.detail.composer.TextComposerActions +import im.vector.riotx.features.home.room.detail.composer.TextComposerView +import im.vector.riotx.features.home.room.detail.composer.TextComposerViewModel +import im.vector.riotx.features.home.room.detail.composer.TextComposerViewState +import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController +import im.vector.riotx.features.home.room.detail.timeline.action.ActionsHandler +import im.vector.riotx.features.home.room.detail.timeline.action.MessageActionsBottomSheet +import im.vector.riotx.features.home.room.detail.timeline.action.MessageMenuViewModel +import im.vector.riotx.features.home.room.detail.timeline.action.ViewReactionBottomSheet +import im.vector.riotx.features.home.room.detail.timeline.helper.EndlessRecyclerViewScrollListener +import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData +import im.vector.riotx.features.html.PillImageSpan +import im.vector.riotx.features.invite.VectorInviteView +import im.vector.riotx.features.media.ImageContentRenderer +import im.vector.riotx.features.media.ImageMediaViewerActivity +import im.vector.riotx.features.media.VideoContentRenderer +import im.vector.riotx.features.media.VideoMediaViewerActivity +import im.vector.riotx.features.notifications.NotificationDrawerManager +import im.vector.riotx.features.reactions.EmojiReactionPickerActivity +import im.vector.riotx.features.settings.PreferencesManager import kotlinx.android.parcel.Parcelize import kotlinx.android.synthetic.main.fragment_room_detail.* import kotlinx.android.synthetic.main.merge_composer_layout.view.* diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailViewModel.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt index 7134110d..61cea3cc 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail +package im.vector.riotx.features.home.room.detail import android.net.Uri import android.text.TextUtils @@ -36,14 +36,14 @@ import im.vector.matrix.android.api.session.room.model.message.MessageContent import im.vector.matrix.android.api.session.room.model.message.MessageType import im.vector.matrix.android.api.session.room.timeline.TimelineEvent import im.vector.matrix.rx.rx -import im.vector.riotredesign.R -import im.vector.riotredesign.core.intent.getFilenameFromUri -import im.vector.riotredesign.core.platform.VectorViewModel -import im.vector.riotredesign.core.resources.UserPreferencesProvider -import im.vector.riotredesign.core.utils.LiveEvent -import im.vector.riotredesign.features.command.CommandParser -import im.vector.riotredesign.features.command.ParsedCommand -import im.vector.riotredesign.features.home.room.detail.timeline.helper.TimelineDisplayableEvents +import im.vector.riotx.R +import im.vector.riotx.core.intent.getFilenameFromUri +import im.vector.riotx.core.platform.VectorViewModel +import im.vector.riotx.core.resources.UserPreferencesProvider +import im.vector.riotx.core.utils.LiveEvent +import im.vector.riotx.features.command.CommandParser +import im.vector.riotx.features.command.ParsedCommand +import im.vector.riotx.features.home.room.detail.timeline.helper.TimelineDisplayableEvents import io.reactivex.rxkotlin.subscribeBy import org.commonmark.parser.Parser import org.commonmark.renderer.html.HtmlRenderer diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailViewState.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewState.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailViewState.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewState.kt index 36408604..c32a79da 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailViewState.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail +package im.vector.riotx.features.home.room.detail import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/ScrollOnHighlightedEventCallback.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/ScrollOnHighlightedEventCallback.kt similarity index 89% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/ScrollOnHighlightedEventCallback.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/ScrollOnHighlightedEventCallback.kt index e9950fbb..43828b0e 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/ScrollOnHighlightedEventCallback.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/ScrollOnHighlightedEventCallback.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail +package im.vector.riotx.features.home.room.detail import androidx.recyclerview.widget.LinearLayoutManager -import im.vector.riotredesign.core.platform.DefaultListUpdateCallback -import im.vector.riotredesign.features.home.room.detail.timeline.TimelineEventController +import im.vector.riotx.core.platform.DefaultListUpdateCallback +import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController import java.util.concurrent.atomic.AtomicReference class ScrollOnHighlightedEventCallback(private val layoutManager: LinearLayoutManager, diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/ScrollOnNewMessageCallback.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/ScrollOnNewMessageCallback.kt similarity index 88% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/ScrollOnNewMessageCallback.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/ScrollOnNewMessageCallback.kt index 0888f672..8d3a96d8 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/ScrollOnNewMessageCallback.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/ScrollOnNewMessageCallback.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail +package im.vector.riotx.features.home.room.detail import androidx.recyclerview.widget.LinearLayoutManager -import im.vector.riotredesign.core.platform.DefaultListUpdateCallback +import im.vector.riotx.core.platform.DefaultListUpdateCallback class ScrollOnNewMessageCallback(private val layoutManager: LinearLayoutManager) : DefaultListUpdateCallback { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/SendMessageResult.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/SendMessageResult.kt similarity index 90% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/SendMessageResult.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/SendMessageResult.kt index 189ad90d..ae7a4706 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/SendMessageResult.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/SendMessageResult.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail +package im.vector.riotx.features.home.room.detail -import im.vector.riotredesign.features.command.Command +import im.vector.riotx.features.command.Command sealed class SendMessageResult { object MessageSent : SendMessageResult() diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/composer/TextComposerActions.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerActions.kt similarity index 91% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/composer/TextComposerActions.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerActions.kt index cb4e06c6..c36b80bd 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/composer/TextComposerActions.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerActions.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.composer +package im.vector.riotx.features.home.room.detail.composer sealed class TextComposerActions { data class QueryUsers(val query: CharSequence?) : TextComposerActions() diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/composer/TextComposerView.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerView.kt similarity index 98% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/composer/TextComposerView.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerView.kt index 47883965..488ecbd3 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/composer/TextComposerView.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.composer +package im.vector.riotx.features.home.room.detail.composer import android.content.Context import android.util.AttributeSet @@ -30,7 +30,7 @@ import androidx.transition.Transition import androidx.transition.TransitionManager import butterknife.BindView import butterknife.ButterKnife -import im.vector.riotredesign.R +import im.vector.riotx.R /** diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/composer/TextComposerViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerViewModel.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/composer/TextComposerViewModel.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerViewModel.kt index ef378a29..8c3b6757 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/composer/TextComposerViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.composer +package im.vector.riotx.features.home.room.detail.composer import arrow.core.Option import com.airbnb.mvrx.FragmentViewModelContext @@ -26,8 +26,8 @@ import com.squareup.inject.assisted.AssistedInject import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.user.model.User import im.vector.matrix.rx.rx -import im.vector.riotredesign.core.platform.VectorViewModel -import im.vector.riotredesign.features.home.room.detail.RoomDetailFragment +import im.vector.riotx.core.platform.VectorViewModel +import im.vector.riotx.features.home.room.detail.RoomDetailFragment import io.reactivex.Observable import io.reactivex.functions.BiFunction import java.util.concurrent.TimeUnit diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/composer/TextComposerViewState.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerViewState.kt similarity index 87% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/composer/TextComposerViewState.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerViewState.kt index e9317d71..57d5fc49 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/composer/TextComposerViewState.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerViewState.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.composer +package im.vector.riotx.features.home.room.detail.composer import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState import com.airbnb.mvrx.Uninitialized import im.vector.matrix.android.api.session.user.model.User -import im.vector.riotredesign.features.home.room.detail.RoomDetailArgs +import im.vector.riotx.features.home.room.detail.RoomDetailArgs data class TextComposerViewState(val roomId: String, diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineEventController.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/TimelineEventController.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineEventController.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/TimelineEventController.kt index 72f73cd5..f7e9d89b 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineEventController.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/TimelineEventController.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline +package im.vector.riotx.features.home.room.detail.timeline import android.os.Handler import android.os.Looper @@ -28,18 +28,18 @@ import im.vector.matrix.android.api.session.room.model.EditAggregatedSummary import im.vector.matrix.android.api.session.room.model.message.* import im.vector.matrix.android.api.session.room.timeline.Timeline import im.vector.matrix.android.api.session.room.timeline.TimelineEvent -import im.vector.riotredesign.core.epoxy.LoadingItem_ -import im.vector.riotredesign.core.extensions.localDateTime -import im.vector.riotredesign.core.resources.UserPreferencesProvider -import im.vector.riotredesign.features.home.AvatarRenderer -import im.vector.riotredesign.features.home.room.detail.timeline.factory.TimelineItemFactory -import im.vector.riotredesign.features.home.room.detail.timeline.helper.* -import im.vector.riotredesign.features.home.room.detail.timeline.item.DaySeparatorItem -import im.vector.riotredesign.features.home.room.detail.timeline.item.DaySeparatorItem_ -import im.vector.riotredesign.features.home.room.detail.timeline.item.MergedHeaderItem -import im.vector.riotredesign.features.home.room.detail.timeline.item.MessageInformationData -import im.vector.riotredesign.features.media.ImageContentRenderer -import im.vector.riotredesign.features.media.VideoContentRenderer +import im.vector.riotx.core.epoxy.LoadingItem_ +import im.vector.riotx.core.extensions.localDateTime +import im.vector.riotx.core.resources.UserPreferencesProvider +import im.vector.riotx.features.home.AvatarRenderer +import im.vector.riotx.features.home.room.detail.timeline.factory.TimelineItemFactory +import im.vector.riotx.features.home.room.detail.timeline.helper.* +import im.vector.riotx.features.home.room.detail.timeline.item.DaySeparatorItem +import im.vector.riotx.features.home.room.detail.timeline.item.DaySeparatorItem_ +import im.vector.riotx.features.home.room.detail.timeline.item.MergedHeaderItem +import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData +import im.vector.riotx.features.media.ImageContentRenderer +import im.vector.riotx.features.media.VideoContentRenderer import org.threeten.bp.LocalDateTime import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineEventControllerHandler.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/TimelineEventControllerHandler.kt similarity index 91% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineEventControllerHandler.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/TimelineEventControllerHandler.kt index 7ac38d97..5af7df86 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineEventControllerHandler.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/TimelineEventControllerHandler.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline +package im.vector.riotx.features.home.room.detail.timeline import javax.inject.Qualifier diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ActionsHandler.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ActionsHandler.kt similarity index 90% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ActionsHandler.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ActionsHandler.kt index 1755fe6b..6ad47bfe 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ActionsHandler.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ActionsHandler.kt @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.action +package im.vector.riotx.features.home.room.detail.timeline.action import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import im.vector.riotredesign.core.utils.LiveEvent +import im.vector.riotx.core.utils.LiveEvent import javax.inject.Inject /** diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt index 391a680e..1b39b1b7 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.action +package im.vector.riotx.features.home.room.detail.timeline.action import android.app.Dialog import android.os.Bundle @@ -32,10 +32,10 @@ import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialog -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.features.home.AvatarRenderer -import im.vector.riotredesign.features.home.room.detail.timeline.item.MessageInformationData +import im.vector.riotx.R +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.features.home.AvatarRenderer +import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData import kotlinx.android.synthetic.main.bottom_sheet_message_actions.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsViewModel.kt similarity index 92% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsViewModel.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsViewModel.kt index 58c8cf61..f8b88e70 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsViewModel.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.action +package im.vector.riotx.features.home.room.detail.timeline.action import com.airbnb.mvrx.* import com.squareup.inject.assisted.Assisted @@ -26,10 +26,10 @@ import im.vector.matrix.android.api.session.room.model.message.MessageTextConten import im.vector.matrix.android.api.session.room.model.message.MessageType import im.vector.matrix.android.api.session.room.timeline.TimelineEvent import im.vector.matrix.rx.RxRoom -import im.vector.riotredesign.core.platform.VectorViewModel -import im.vector.riotredesign.features.home.room.detail.timeline.format.NoticeEventFormatter -import im.vector.riotredesign.features.home.room.detail.timeline.item.MessageInformationData -import im.vector.riotredesign.features.html.EventHtmlRenderer +import im.vector.riotx.core.platform.VectorViewModel +import im.vector.riotx.features.home.room.detail.timeline.format.NoticeEventFormatter +import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData +import im.vector.riotx.features.html.EventHtmlRenderer import java.text.SimpleDateFormat import java.util.* diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageMenuFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageMenuFragment.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageMenuFragment.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageMenuFragment.kt index 4c8bc2c5..0c22091f 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageMenuFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageMenuFragment.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.action +package im.vector.riotx.features.home.room.detail.timeline.action import android.os.Bundle import android.view.LayoutInflater @@ -26,10 +26,10 @@ import android.widget.TextView import com.airbnb.mvrx.MvRx import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.platform.VectorBaseFragment -import im.vector.riotredesign.features.themes.ThemeUtils +import im.vector.riotx.R +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.riotx.features.themes.ThemeUtils import javax.inject.Inject /** diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageMenuViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageMenuViewModel.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageMenuViewModel.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageMenuViewModel.kt index 776d4cd5..c8accc8e 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageMenuViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageMenuViewModel.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.action +package im.vector.riotx.features.home.room.detail.timeline.action import com.airbnb.mvrx.* import com.squareup.inject.assisted.Assisted @@ -28,11 +28,11 @@ import im.vector.matrix.android.api.session.room.model.message.MessageType import im.vector.matrix.android.api.session.room.send.SendState import im.vector.matrix.android.api.session.room.timeline.TimelineEvent import im.vector.matrix.rx.RxRoom -import im.vector.riotredesign.R -import im.vector.riotredesign.core.platform.VectorViewModel -import im.vector.riotredesign.core.resources.StringProvider -import im.vector.riotredesign.core.utils.isSingleEmoji -import im.vector.riotredesign.features.home.room.detail.timeline.item.MessageInformationData +import im.vector.riotx.R +import im.vector.riotx.core.platform.VectorViewModel +import im.vector.riotx.core.resources.StringProvider +import im.vector.riotx.core.utils.isSingleEmoji +import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData import org.json.JSONObject diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/QuickReactionFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/QuickReactionFragment.kt similarity index 91% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/QuickReactionFragment.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/QuickReactionFragment.kt index d5d64231..fb731ce2 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/QuickReactionFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/QuickReactionFragment.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.action +package im.vector.riotx.features.home.room.detail.timeline.action import android.graphics.Typeface import android.os.Bundle @@ -22,10 +22,10 @@ import android.widget.TextView import com.airbnb.mvrx.MvRx import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotredesign.EmojiCompatFontProvider -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.platform.VectorBaseFragment +import im.vector.riotx.EmojiCompatFontProvider +import im.vector.riotx.R +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.platform.VectorBaseFragment import kotlinx.android.synthetic.main.adapter_item_action_quick_reaction.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/QuickReactionViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/QuickReactionViewModel.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/QuickReactionViewModel.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/QuickReactionViewModel.kt index 3d634fe8..d2a86f43 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/QuickReactionViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/QuickReactionViewModel.kt @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.action +package im.vector.riotx.features.home.room.detail.timeline.action import com.airbnb.mvrx.* import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject import im.vector.matrix.android.api.session.Session import im.vector.matrix.rx.RxRoom -import im.vector.riotredesign.core.platform.VectorViewModel -import im.vector.riotredesign.features.home.room.detail.timeline.item.MessageInformationData +import im.vector.riotx.core.platform.VectorViewModel +import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData /** * Quick reactions state, it's a toggle with 3rd state diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ReactionInfoSimpleItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ReactionInfoSimpleItem.kt similarity index 92% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ReactionInfoSimpleItem.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ReactionInfoSimpleItem.kt index 27e4c91c..10c2357d 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ReactionInfoSimpleItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ReactionInfoSimpleItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.action +package im.vector.riotx.features.home.room.detail.timeline.action import android.graphics.Typeface import android.widget.TextView @@ -22,8 +22,8 @@ import androidx.core.view.isVisible import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelWithHolder -import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder +import im.vector.riotx.R +import im.vector.riotx.core.epoxy.VectorEpoxyHolder /** * Item displaying an emoji reaction (single line with emoji, author, time) diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt similarity index 83% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt index b0104461..e6ac3a63 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.action +package im.vector.riotx.features.home.room.detail.timeline.action import android.os.Parcelable -import im.vector.riotredesign.features.home.room.detail.timeline.item.MessageInformationData +import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData import kotlinx.android.parcel.Parcelize @Parcelize diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/VectorBaseBottomSheetDialogFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/VectorBaseBottomSheetDialogFragment.kt similarity index 91% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/VectorBaseBottomSheetDialogFragment.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/VectorBaseBottomSheetDialogFragment.kt index 54b518bc..6e279ec9 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/VectorBaseBottomSheetDialogFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/VectorBaseBottomSheetDialogFragment.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.action +package im.vector.riotx.features.home.room.detail.timeline.action import android.content.Context import android.os.Bundle @@ -22,9 +22,9 @@ import com.airbnb.mvrx.MvRx import com.airbnb.mvrx.MvRxView import com.airbnb.mvrx.MvRxViewModelStore import com.google.android.material.bottomsheet.BottomSheetDialogFragment -import im.vector.riotredesign.core.di.DaggerScreenComponent -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.platform.VectorBaseActivity +import im.vector.riotx.core.di.DaggerScreenComponent +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.platform.VectorBaseActivity import java.util.* /** diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ViewReactionBottomSheet.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ViewReactionBottomSheet.kt similarity index 91% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ViewReactionBottomSheet.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ViewReactionBottomSheet.kt index 3aabaeb3..760b74da 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ViewReactionBottomSheet.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ViewReactionBottomSheet.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.action +package im.vector.riotx.features.home.room.detail.timeline.action import android.os.Bundle import android.view.LayoutInflater @@ -29,10 +29,10 @@ import com.airbnb.epoxy.EpoxyRecyclerView import com.airbnb.mvrx.MvRx import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotredesign.EmojiCompatFontProvider -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.features.home.room.detail.timeline.item.MessageInformationData +import im.vector.riotx.EmojiCompatFontProvider +import im.vector.riotx.R +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData import kotlinx.android.synthetic.main.bottom_sheet_display_reactions.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ViewReactionViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ViewReactionViewModel.kt similarity index 92% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ViewReactionViewModel.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ViewReactionViewModel.kt index 3cfb4097..6f5a7847 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ViewReactionViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ViewReactionViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.action +package im.vector.riotx.features.home.room.detail.timeline.action import com.airbnb.mvrx.* import com.squareup.inject.assisted.Assisted @@ -22,10 +22,10 @@ import com.squareup.inject.assisted.AssistedInject import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.room.model.ReactionAggregatedSummary import im.vector.matrix.rx.RxRoom -import im.vector.riotredesign.core.extensions.localDateTime -import im.vector.riotredesign.core.platform.VectorViewModel -import im.vector.riotredesign.core.utils.isSingleEmoji -import im.vector.riotredesign.features.home.room.detail.timeline.helper.TimelineDateFormatter +import im.vector.riotx.core.extensions.localDateTime +import im.vector.riotx.core.platform.VectorViewModel +import im.vector.riotx.core.utils.isSingleEmoji +import im.vector.riotx.features.home.room.detail.timeline.helper.TimelineDateFormatter import io.reactivex.Observable import io.reactivex.Single diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ViewReactionsEpoxyController.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ViewReactionsEpoxyController.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ViewReactionsEpoxyController.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ViewReactionsEpoxyController.kt index 3a9dcb20..57c3d265 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/ViewReactionsEpoxyController.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/ViewReactionsEpoxyController.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.action +package im.vector.riotx.features.home.room.detail.timeline.action import android.graphics.Typeface import com.airbnb.epoxy.TypedEpoxyController diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/animation/TimelineItemAnimator.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/animation/TimelineItemAnimator.kt similarity index 92% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/animation/TimelineItemAnimator.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/animation/TimelineItemAnimator.kt index 94fe199c..b54ee335 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/animation/TimelineItemAnimator.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/animation/TimelineItemAnimator.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.animation +package im.vector.riotx.features.home.room.detail.timeline.animation import androidx.recyclerview.widget.DefaultItemAnimator diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/DefaultItemFactory.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/DefaultItemFactory.kt similarity index 83% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/DefaultItemFactory.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/DefaultItemFactory.kt index f3782380..05e4007e 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/DefaultItemFactory.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/DefaultItemFactory.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.factory +package im.vector.riotx.features.home.room.detail.timeline.factory import im.vector.matrix.android.api.session.room.timeline.TimelineEvent -import im.vector.riotredesign.features.home.room.detail.timeline.item.DefaultItem -import im.vector.riotredesign.features.home.room.detail.timeline.item.DefaultItem_ +import im.vector.riotx.features.home.room.detail.timeline.item.DefaultItem +import im.vector.riotx.features.home.room.detail.timeline.item.DefaultItem_ import javax.inject.Inject class DefaultItemFactory @Inject constructor(){ diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt similarity index 82% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt index 3f170527..54c15685 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt @@ -14,22 +14,22 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.factory +package im.vector.riotx.features.home.room.detail.timeline.factory import android.view.View import im.vector.matrix.android.api.session.crypto.MXCryptoError import im.vector.matrix.android.api.session.events.model.EventType import im.vector.matrix.android.api.session.room.timeline.TimelineEvent -import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.VectorEpoxyModel -import im.vector.riotredesign.core.resources.ColorProvider -import im.vector.riotredesign.core.resources.StringProvider -import im.vector.riotredesign.core.utils.DebouncedClickListener -import im.vector.riotredesign.features.home.AvatarRenderer -import im.vector.riotredesign.features.home.room.detail.timeline.TimelineEventController -import im.vector.riotredesign.features.home.room.detail.timeline.item.MessageTextItem_ -import im.vector.riotredesign.features.home.room.detail.timeline.item.NoticeItem_ -import im.vector.riotredesign.features.home.room.detail.timeline.util.MessageInformationDataFactory +import im.vector.riotx.R +import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.riotx.core.resources.ColorProvider +import im.vector.riotx.core.resources.StringProvider +import im.vector.riotx.core.utils.DebouncedClickListener +import im.vector.riotx.features.home.AvatarRenderer +import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController +import im.vector.riotx.features.home.room.detail.timeline.item.MessageTextItem_ +import im.vector.riotx.features.home.room.detail.timeline.item.NoticeItem_ +import im.vector.riotx.features.home.room.detail.timeline.util.MessageInformationDataFactory import me.gujun.android.span.span import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt similarity index 76% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt index b2216729..ea7036b7 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt @@ -14,22 +14,22 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.factory +package im.vector.riotx.features.home.room.detail.timeline.factory import im.vector.matrix.android.api.session.events.model.Event import im.vector.matrix.android.api.session.events.model.EventType import im.vector.matrix.android.api.session.events.model.toModel import im.vector.matrix.android.api.session.room.timeline.TimelineEvent import im.vector.matrix.android.internal.crypto.model.event.EncryptionEventContent -import im.vector.riotredesign.R -import im.vector.riotredesign.core.resources.StringProvider -import im.vector.riotredesign.features.home.AvatarRenderer -import im.vector.riotredesign.features.home.room.detail.timeline.TimelineEventController -import im.vector.riotredesign.features.home.room.detail.timeline.helper.senderAvatar -import im.vector.riotredesign.features.home.room.detail.timeline.helper.senderName -import im.vector.riotredesign.features.home.room.detail.timeline.item.MessageInformationData -import im.vector.riotredesign.features.home.room.detail.timeline.item.NoticeItem -import im.vector.riotredesign.features.home.room.detail.timeline.item.NoticeItem_ +import im.vector.riotx.R +import im.vector.riotx.core.resources.StringProvider +import im.vector.riotx.features.home.AvatarRenderer +import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController +import im.vector.riotx.features.home.room.detail.timeline.helper.senderAvatar +import im.vector.riotx.features.home.room.detail.timeline.helper.senderName +import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData +import im.vector.riotx.features.home.room.detail.timeline.item.NoticeItem +import im.vector.riotx.features.home.room.detail.timeline.item.NoticeItem_ import javax.inject.Inject class EncryptionItemFactory @Inject constructor(private val stringProvider: StringProvider, diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/MessageItemFactory.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MessageItemFactory.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/MessageItemFactory.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MessageItemFactory.kt index 4bb900d1..f98bcc32 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/MessageItemFactory.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MessageItemFactory.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.factory +package im.vector.riotx.features.home.room.detail.timeline.factory import android.text.SpannableStringBuilder import android.text.Spanned @@ -32,22 +32,22 @@ import im.vector.matrix.android.api.session.room.model.message.* import im.vector.matrix.android.api.session.room.send.SendState import im.vector.matrix.android.api.session.room.timeline.TimelineEvent import im.vector.matrix.android.internal.crypto.attachments.toElementToDecrypt -import im.vector.riotredesign.EmojiCompatFontProvider -import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.VectorEpoxyModel -import im.vector.riotredesign.core.linkify.VectorLinkify -import im.vector.riotredesign.core.resources.ColorProvider -import im.vector.riotredesign.core.resources.StringProvider -import im.vector.riotredesign.core.utils.DebouncedClickListener -import im.vector.riotredesign.features.home.AvatarRenderer -import im.vector.riotredesign.features.home.room.detail.timeline.TimelineEventController -import im.vector.riotredesign.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder -import im.vector.riotredesign.features.home.room.detail.timeline.helper.TimelineMediaSizeProvider -import im.vector.riotredesign.features.home.room.detail.timeline.item.* -import im.vector.riotredesign.features.home.room.detail.timeline.util.MessageInformationDataFactory -import im.vector.riotredesign.features.html.EventHtmlRenderer -import im.vector.riotredesign.features.media.ImageContentRenderer -import im.vector.riotredesign.features.media.VideoContentRenderer +import im.vector.riotx.EmojiCompatFontProvider +import im.vector.riotx.R +import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.riotx.core.linkify.VectorLinkify +import im.vector.riotx.core.resources.ColorProvider +import im.vector.riotx.core.resources.StringProvider +import im.vector.riotx.core.utils.DebouncedClickListener +import im.vector.riotx.features.home.AvatarRenderer +import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController +import im.vector.riotx.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder +import im.vector.riotx.features.home.room.detail.timeline.helper.TimelineMediaSizeProvider +import im.vector.riotx.features.home.room.detail.timeline.item.* +import im.vector.riotx.features.home.room.detail.timeline.util.MessageInformationDataFactory +import im.vector.riotx.features.html.EventHtmlRenderer +import im.vector.riotx.features.media.ImageContentRenderer +import im.vector.riotx.features.media.VideoContentRenderer import me.gujun.android.span.span import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/NoticeItemFactory.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/NoticeItemFactory.kt similarity index 69% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/NoticeItemFactory.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/NoticeItemFactory.kt index 2c8e8d52..c23fdfbd 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/NoticeItemFactory.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/NoticeItemFactory.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.factory +package im.vector.riotx.features.home.room.detail.timeline.factory import im.vector.matrix.android.api.session.room.timeline.TimelineEvent -import im.vector.riotredesign.features.home.AvatarRenderer -import im.vector.riotredesign.features.home.room.detail.timeline.TimelineEventController -import im.vector.riotredesign.features.home.room.detail.timeline.format.NoticeEventFormatter -import im.vector.riotredesign.features.home.room.detail.timeline.helper.senderAvatar -import im.vector.riotredesign.features.home.room.detail.timeline.helper.senderName -import im.vector.riotredesign.features.home.room.detail.timeline.item.MessageInformationData -import im.vector.riotredesign.features.home.room.detail.timeline.item.NoticeItem -import im.vector.riotredesign.features.home.room.detail.timeline.item.NoticeItem_ +import im.vector.riotx.features.home.AvatarRenderer +import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController +import im.vector.riotx.features.home.room.detail.timeline.format.NoticeEventFormatter +import im.vector.riotx.features.home.room.detail.timeline.helper.senderAvatar +import im.vector.riotx.features.home.room.detail.timeline.helper.senderName +import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData +import im.vector.riotx.features.home.room.detail.timeline.item.NoticeItem +import im.vector.riotx.features.home.room.detail.timeline.item.NoticeItem_ import javax.inject.Inject class NoticeItemFactory @Inject constructor(private val eventFormatter: NoticeEventFormatter, diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/TimelineItemFactory.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/TimelineItemFactory.kt similarity index 87% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/TimelineItemFactory.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/TimelineItemFactory.kt index 84f4f287..cb9d354b 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/TimelineItemFactory.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/TimelineItemFactory.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.factory +package im.vector.riotx.features.home.room.detail.timeline.factory import im.vector.matrix.android.api.session.events.model.EventType import im.vector.matrix.android.api.session.room.timeline.TimelineEvent -import im.vector.riotredesign.core.epoxy.EmptyItem_ -import im.vector.riotredesign.core.epoxy.VectorEpoxyModel -import im.vector.riotredesign.features.home.AvatarRenderer -import im.vector.riotredesign.features.home.room.detail.timeline.TimelineEventController -import im.vector.riotredesign.features.home.room.detail.timeline.helper.senderAvatar -import im.vector.riotredesign.features.home.room.detail.timeline.item.MessageInformationData -import im.vector.riotredesign.features.home.room.detail.timeline.item.NoticeItem_ +import im.vector.riotx.core.epoxy.EmptyItem_ +import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.riotx.features.home.AvatarRenderer +import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController +import im.vector.riotx.features.home.room.detail.timeline.helper.senderAvatar +import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData +import im.vector.riotx.features.home.room.detail.timeline.item.NoticeItem_ import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/NoticeEventFormatter.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/format/NoticeEventFormatter.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/NoticeEventFormatter.kt index 1408f7c7..369af64a 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/format/NoticeEventFormatter.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/NoticeEventFormatter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.format +package im.vector.riotx.features.home.room.detail.timeline.format import android.text.TextUtils import im.vector.matrix.android.api.session.events.model.Event @@ -23,9 +23,9 @@ import im.vector.matrix.android.api.session.events.model.toModel import im.vector.matrix.android.api.session.room.model.* import im.vector.matrix.android.api.session.room.model.call.CallInviteContent import im.vector.matrix.android.api.session.room.timeline.TimelineEvent -import im.vector.riotredesign.R -import im.vector.riotredesign.core.resources.StringProvider -import im.vector.riotredesign.features.home.room.detail.timeline.helper.senderName +import im.vector.riotx.R +import im.vector.riotx.core.resources.StringProvider +import im.vector.riotx.features.home.room.detail.timeline.helper.senderName import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt index 3707eee0..fa4f05f1 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.helper +package im.vector.riotx.features.home.room.detail.timeline.helper import android.content.Context import android.text.format.Formatter @@ -23,9 +23,9 @@ import android.view.ViewGroup import android.widget.ProgressBar import android.widget.TextView import im.vector.matrix.android.api.session.content.ContentUploadStateTracker -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ActiveSessionHolder -import im.vector.riotredesign.features.media.ImageContentRenderer +import im.vector.riotx.R +import im.vector.riotx.core.di.ActiveSessionHolder +import im.vector.riotx.features.media.ImageContentRenderer import java.io.File import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/EndlessRecyclerViewScrollListener.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/EndlessRecyclerViewScrollListener.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/EndlessRecyclerViewScrollListener.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/EndlessRecyclerViewScrollListener.kt index d078e72c..9bcb7c63 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/EndlessRecyclerViewScrollListener.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/EndlessRecyclerViewScrollListener.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.helper +package im.vector.riotx.features.home.room.detail.timeline.helper import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt index 31bddf02..24bdd0ff 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.helper +package im.vector.riotx.features.home.room.detail.timeline.helper import android.os.Handler import android.os.HandlerThread diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineDateFormatter.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineDateFormatter.kt similarity index 90% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineDateFormatter.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineDateFormatter.kt index bd2b630f..a1104e32 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineDateFormatter.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineDateFormatter.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.helper +package im.vector.riotx.features.home.room.detail.timeline.helper -import im.vector.riotredesign.core.resources.LocaleProvider +import im.vector.riotx.core.resources.LocaleProvider import org.threeten.bp.LocalDateTime import org.threeten.bp.format.DateTimeFormatter import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt index 871edf37..667de65a 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.helper +package im.vector.riotx.features.home.room.detail.timeline.helper import im.vector.matrix.android.api.session.events.model.EventType import im.vector.matrix.android.api.session.events.model.RelationType @@ -22,7 +22,7 @@ import im.vector.matrix.android.api.session.events.model.toModel import im.vector.matrix.android.api.session.room.model.RoomMember import im.vector.matrix.android.api.session.room.model.message.MessageContent import im.vector.matrix.android.api.session.room.timeline.TimelineEvent -import im.vector.riotredesign.core.extensions.localDateTime +import im.vector.riotx.core.extensions.localDateTime object TimelineDisplayableEvents { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt index cd62b511..9c53ee99 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.helper +package im.vector.riotx.features.home.room.detail.timeline.helper import androidx.recyclerview.widget.DiffUtil import im.vector.matrix.android.api.session.room.timeline.TimelineEvent diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineEventVisibilityStateChangedListener.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineEventVisibilityStateChangedListener.kt similarity index 88% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineEventVisibilityStateChangedListener.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineEventVisibilityStateChangedListener.kt index 0b39bdf5..95d9b6f4 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineEventVisibilityStateChangedListener.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineEventVisibilityStateChangedListener.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.helper +package im.vector.riotx.features.home.room.detail.timeline.helper import com.airbnb.epoxy.VisibilityState import im.vector.matrix.android.api.session.room.timeline.TimelineEvent -import im.vector.riotredesign.core.epoxy.VectorEpoxyModel -import im.vector.riotredesign.features.home.room.detail.timeline.TimelineEventController +import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController class TimelineEventVisibilityStateChangedListener(private val callback: TimelineEventController.Callback?, private val event: TimelineEvent) diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt similarity index 92% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt index 6d985ae6..532e7661 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.helper +package im.vector.riotx.features.home.room.detail.timeline.helper import androidx.recyclerview.widget.RecyclerView -import im.vector.riotredesign.core.di.ScreenScope +import im.vector.riotx.core.di.ScreenScope import javax.inject.Inject @ScreenScope diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/AbsMessageItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/AbsMessageItem.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt index aeafcb18..7a66c6ad 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/AbsMessageItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.item +package im.vector.riotx.features.home.room.detail.timeline.item import android.graphics.Typeface import android.os.Build @@ -28,12 +28,12 @@ import androidx.core.view.children import androidx.core.view.isGone import androidx.core.view.isVisible import com.airbnb.epoxy.EpoxyAttribute -import im.vector.riotredesign.R -import im.vector.riotredesign.core.utils.DebouncedClickListener -import im.vector.riotredesign.core.utils.DimensionUtils.dpToPx -import im.vector.riotredesign.features.home.AvatarRenderer -import im.vector.riotredesign.features.home.room.detail.timeline.TimelineEventController -import im.vector.riotredesign.features.reactions.widget.ReactionButton +import im.vector.riotx.R +import im.vector.riotx.core.utils.DebouncedClickListener +import im.vector.riotx.core.utils.DimensionUtils.dpToPx +import im.vector.riotx.features.home.AvatarRenderer +import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController +import im.vector.riotx.features.reactions.widget.ReactionButton abstract class AbsMessageItem : BaseEventItem() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/BaseEventItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BaseEventItem.kt similarity index 86% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/BaseEventItem.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BaseEventItem.kt index 45da881f..3a7d09e2 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/BaseEventItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BaseEventItem.kt @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.item +package im.vector.riotx.features.home.room.detail.timeline.item import android.view.View import android.view.ViewStub import androidx.annotation.IdRes import androidx.constraintlayout.widget.Guideline import com.airbnb.epoxy.EpoxyAttribute -import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder -import im.vector.riotredesign.core.epoxy.VectorEpoxyModel -import im.vector.riotredesign.core.platform.CheckableView -import im.vector.riotredesign.core.utils.DimensionUtils.dpToPx +import im.vector.riotx.R +import im.vector.riotx.core.epoxy.VectorEpoxyHolder +import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.riotx.core.platform.CheckableView +import im.vector.riotx.core.utils.DimensionUtils.dpToPx abstract class BaseEventItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/BlankItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BlankItem.kt similarity index 78% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/BlankItem.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BlankItem.kt index 39ab2c42..1b62c77b 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/BlankItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BlankItem.kt @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.item +package im.vector.riotx.features.home.room.detail.timeline.item import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder -import im.vector.riotredesign.core.epoxy.VectorEpoxyModel +import im.vector.riotx.R +import im.vector.riotx.core.epoxy.VectorEpoxyHolder +import im.vector.riotx.core.epoxy.VectorEpoxyModel @EpoxyModelClass(layout = R.layout.item_timeline_event_blank_stub) diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/DaySeparatorItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/DaySeparatorItem.kt similarity index 87% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/DaySeparatorItem.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/DaySeparatorItem.kt index 217c12c7..49666633 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/DaySeparatorItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/DaySeparatorItem.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.item +package im.vector.riotx.features.home.room.detail.timeline.item import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelWithHolder -import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder +import im.vector.riotx.R +import im.vector.riotx.core.epoxy.VectorEpoxyHolder @EpoxyModelClass(layout = R.layout.item_timeline_event_day_separator) abstract class DaySeparatorItem : EpoxyModelWithHolder() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/DefaultItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/DefaultItem.kt similarity index 92% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/DefaultItem.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/DefaultItem.kt index 443290d3..cc50493a 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/DefaultItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/DefaultItem.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.item +package im.vector.riotx.features.home.room.detail.timeline.item 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_timeline_event_base_noinfo) abstract class DefaultItem : BaseEventItem() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MergedHeaderItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MergedHeaderItem.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MergedHeaderItem.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MergedHeaderItem.kt index 275d357a..8a6c8683 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MergedHeaderItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MergedHeaderItem.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.item +package im.vector.riotx.features.home.room.detail.timeline.item import android.view.View import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView import androidx.core.view.children -import im.vector.riotredesign.R -import im.vector.riotredesign.features.home.AvatarRenderer +import im.vector.riotx.R +import im.vector.riotx.features.home.AvatarRenderer data class MergedHeaderItem(private val isCollapsed: Boolean, diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MessageFileItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageFileItem.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MessageFileItem.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageFileItem.kt index 9ec8d08b..66b368df 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MessageFileItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageFileItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.item +package im.vector.riotx.features.home.room.detail.timeline.item import android.graphics.Paint import android.view.View @@ -24,8 +24,8 @@ import android.widget.TextView import androidx.annotation.DrawableRes import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotredesign.R -import im.vector.riotredesign.features.home.AvatarRenderer +import im.vector.riotx.R +import im.vector.riotx.features.home.AvatarRenderer @EpoxyModelClass(layout = R.layout.item_timeline_event_base) abstract class MessageFileItem : AbsMessageItem() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MessageImageVideoItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageImageVideoItem.kt similarity index 89% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MessageImageVideoItem.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageImageVideoItem.kt index 33bf5732..67f0ed7b 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MessageImageVideoItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageImageVideoItem.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.item +package im.vector.riotx.features.home.room.detail.timeline.item import android.view.View import android.view.ViewGroup import android.widget.ImageView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotredesign.R -import im.vector.riotredesign.features.home.AvatarRenderer -import im.vector.riotredesign.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder -import im.vector.riotredesign.features.media.ImageContentRenderer +import im.vector.riotx.R +import im.vector.riotx.features.home.AvatarRenderer +import im.vector.riotx.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder +import im.vector.riotx.features.media.ImageContentRenderer @EpoxyModelClass(layout = R.layout.item_timeline_event_base) abstract class MessageImageVideoItem : AbsMessageItem() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MessageInformationData.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageInformationData.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MessageInformationData.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageInformationData.kt index e7f4aa82..5f49fdc3 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MessageInformationData.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageInformationData.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.item +package im.vector.riotx.features.home.room.detail.timeline.item import android.os.Parcelable import im.vector.matrix.android.api.session.room.send.SendState diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MessageTextItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageTextItem.kt similarity index 90% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MessageTextItem.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageTextItem.kt index 8bf84011..ad69d104 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/MessageTextItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageTextItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.item +package im.vector.riotx.features.home.room.detail.timeline.item import androidx.appcompat.widget.AppCompatTextView import androidx.core.text.PrecomputedTextCompat @@ -22,11 +22,11 @@ import androidx.core.text.toSpannable import androidx.core.widget.TextViewCompat import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotredesign.R -import im.vector.riotredesign.core.utils.containsOnlyEmojis -import im.vector.riotredesign.features.home.AvatarRenderer -import im.vector.riotredesign.features.home.room.detail.timeline.TimelineEventController -import im.vector.riotredesign.features.html.PillImageSpan +import im.vector.riotx.R +import im.vector.riotx.core.utils.containsOnlyEmojis +import im.vector.riotx.features.home.AvatarRenderer +import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController +import im.vector.riotx.features.html.PillImageSpan import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/NoticeItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/NoticeItem.kt similarity index 89% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/NoticeItem.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/NoticeItem.kt index 35f17186..08645357 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/NoticeItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/NoticeItem.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.item +package im.vector.riotx.features.home.room.detail.timeline.item import android.view.View import android.widget.ImageView import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotredesign.R -import im.vector.riotredesign.features.home.AvatarRenderer -import im.vector.riotredesign.features.home.room.detail.timeline.TimelineEventController +import im.vector.riotx.R +import im.vector.riotx.features.home.AvatarRenderer +import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController @EpoxyModelClass(layout = R.layout.item_timeline_event_base_noinfo) abstract class NoticeItem : BaseEventItem() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/RedactedMessageItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/RedactedMessageItem.kt similarity index 88% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/RedactedMessageItem.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/RedactedMessageItem.kt index 76c38fa2..05967f00 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/RedactedMessageItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/RedactedMessageItem.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.item +package im.vector.riotx.features.home.room.detail.timeline.item import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotredesign.R -import im.vector.riotredesign.features.home.AvatarRenderer +import im.vector.riotx.R +import im.vector.riotx.features.home.AvatarRenderer @EpoxyModelClass(layout = R.layout.item_timeline_event_base) abstract class RedactedMessageItem : AbsMessageItem() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/util/MessageInformationDataFactory.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/util/MessageInformationDataFactory.kt similarity index 84% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/util/MessageInformationDataFactory.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/util/MessageInformationDataFactory.kt index 0f8a81c9..d17c8de6 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/util/MessageInformationDataFactory.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/util/MessageInformationDataFactory.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.detail.timeline.util +package im.vector.riotx.features.home.room.detail.timeline.util import im.vector.matrix.android.api.session.events.model.EventType import im.vector.matrix.android.api.session.room.timeline.TimelineEvent -import im.vector.riotredesign.core.extensions.localDateTime -import im.vector.riotredesign.core.resources.ColorProvider -import im.vector.riotredesign.core.utils.isSingleEmoji -import im.vector.riotredesign.features.home.getColorFromUserId -import im.vector.riotredesign.features.home.room.detail.timeline.helper.TimelineDateFormatter -import im.vector.riotredesign.features.home.room.detail.timeline.item.MessageInformationData -import im.vector.riotredesign.features.home.room.detail.timeline.item.ReactionInfoData +import im.vector.riotx.core.extensions.localDateTime +import im.vector.riotx.core.resources.ColorProvider +import im.vector.riotx.core.utils.isSingleEmoji +import im.vector.riotx.features.home.getColorFromUserId +import im.vector.riotx.features.home.room.detail.timeline.helper.TimelineDateFormatter +import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData +import im.vector.riotx.features.home.room.detail.timeline.item.ReactionInfoData import me.gujun.android.span.span import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/AlphabeticalRoomComparator.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/AlphabeticalRoomComparator.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/AlphabeticalRoomComparator.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/list/AlphabeticalRoomComparator.kt index 1c86d908..e69195b3 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/AlphabeticalRoomComparator.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/AlphabeticalRoomComparator.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.list +package im.vector.riotx.features.home.room.list import im.vector.matrix.android.api.session.room.model.RoomSummary import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/ChronologicalRoomComparator.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/ChronologicalRoomComparator.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/ChronologicalRoomComparator.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/list/ChronologicalRoomComparator.kt index 28259065..c4a1633b 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/ChronologicalRoomComparator.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/ChronologicalRoomComparator.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.list +package im.vector.riotx.features.home.room.list import im.vector.matrix.android.api.session.room.model.RoomSummary import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomCategoryItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomCategoryItem.kt similarity index 89% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomCategoryItem.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/list/RoomCategoryItem.kt index ef021938..7c1553df 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomCategoryItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomCategoryItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.list +package im.vector.riotx.features.home.room.list import android.view.ViewGroup import android.widget.TextView @@ -22,10 +22,10 @@ import androidx.core.content.ContextCompat import androidx.core.graphics.drawable.DrawableCompat import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder -import im.vector.riotredesign.core.epoxy.VectorEpoxyModel -import im.vector.riotredesign.features.themes.ThemeUtils +import im.vector.riotx.R +import im.vector.riotx.core.epoxy.VectorEpoxyHolder +import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.riotx.features.themes.ThemeUtils @EpoxyModelClass(layout = R.layout.item_room_category) abstract class RoomCategoryItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomInvitationItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomInvitationItem.kt similarity index 91% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomInvitationItem.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/list/RoomInvitationItem.kt index 0da7de18..e944816e 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomInvitationItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomInvitationItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.list +package im.vector.riotx.features.home.room.list import android.view.ViewGroup import android.widget.ImageView @@ -22,12 +22,12 @@ import android.widget.TextView import androidx.core.view.isVisible import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder -import im.vector.riotredesign.core.epoxy.VectorEpoxyModel -import im.vector.riotredesign.core.extensions.setTextOrHide -import im.vector.riotredesign.core.platform.ButtonStateView -import im.vector.riotredesign.features.home.AvatarRenderer +import im.vector.riotx.R +import im.vector.riotx.core.epoxy.VectorEpoxyHolder +import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.riotx.core.extensions.setTextOrHide +import im.vector.riotx.core.platform.ButtonStateView +import im.vector.riotx.features.home.AvatarRenderer @EpoxyModelClass(layout = R.layout.item_room_invitation) diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListActions.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListActions.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListActions.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListActions.kt index 4c5d57df..d5019365 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListActions.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListActions.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.list +package im.vector.riotx.features.home.room.list import im.vector.matrix.android.api.session.room.model.RoomSummary diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListAnimator.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListAnimator.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListAnimator.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListAnimator.kt index 687f5ac5..53aa5236 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListAnimator.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListAnimator.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.list +package im.vector.riotx.features.home.room.list import androidx.recyclerview.widget.DefaultItemAnimator diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListDisplayModeFilter.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListDisplayModeFilter.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListDisplayModeFilter.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListDisplayModeFilter.kt index 958c431a..96fad483 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListDisplayModeFilter.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListDisplayModeFilter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.list +package im.vector.riotx.features.home.room.list import im.vector.matrix.android.api.session.room.model.Membership import im.vector.matrix.android.api.session.room.model.RoomSummary diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListFragment.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListFragment.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListFragment.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListFragment.kt index 1b2a3650..f417033b 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.list +package im.vector.riotx.features.home.room.list import android.os.Bundle import android.os.Parcelable @@ -28,16 +28,16 @@ import com.google.android.material.snackbar.Snackbar import im.vector.matrix.android.api.failure.Failure import im.vector.matrix.android.api.session.room.model.Membership import im.vector.matrix.android.api.session.room.model.RoomSummary -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.epoxy.LayoutManagerStateRestorer -import im.vector.riotredesign.core.error.ErrorFormatter -import im.vector.riotredesign.core.extensions.observeEvent -import im.vector.riotredesign.core.extensions.observeEventDebounced -import im.vector.riotredesign.core.platform.OnBackPressed -import im.vector.riotredesign.core.platform.StateView -import im.vector.riotredesign.core.platform.VectorBaseFragment -import im.vector.riotredesign.features.home.room.list.widget.FabMenuView +import im.vector.riotx.R +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.epoxy.LayoutManagerStateRestorer +import im.vector.riotx.core.error.ErrorFormatter +import im.vector.riotx.core.extensions.observeEvent +import im.vector.riotx.core.extensions.observeEventDebounced +import im.vector.riotx.core.platform.OnBackPressed +import im.vector.riotx.core.platform.StateView +import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.riotx.features.home.room.list.widget.FabMenuView import kotlinx.android.parcel.Parcelize import kotlinx.android.synthetic.main.fragment_room_list.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewModel.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListViewModel.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewModel.kt index 7cd49fd5..6b814bb9 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.list +package im.vector.riotx.features.home.room.list import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -28,9 +28,9 @@ import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.room.model.Membership import im.vector.matrix.android.api.session.room.model.RoomSummary import im.vector.matrix.android.api.session.room.model.tag.RoomTag -import im.vector.riotredesign.core.platform.VectorViewModel -import im.vector.riotredesign.core.utils.LiveEvent -import im.vector.riotredesign.features.home.HomeRoomListObservableStore +import im.vector.riotx.core.platform.VectorViewModel +import im.vector.riotx.core.utils.LiveEvent +import im.vector.riotx.features.home.HomeRoomListObservableStore import timber.log.Timber class RoomListViewModel @AssistedInject constructor(@Assisted initialState: RoomListViewState, diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListViewState.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewState.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListViewState.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewState.kt index c56e1b6c..aa03c98a 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListViewState.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewState.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.list +package im.vector.riotx.features.home.room.list import androidx.annotation.StringRes import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState import com.airbnb.mvrx.Uninitialized import im.vector.matrix.android.api.session.room.model.RoomSummary -import im.vector.riotredesign.R +import im.vector.riotx.R data class RoomListViewState( val displayMode: RoomListFragment.DisplayMode, diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryController.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryController.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryController.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryController.kt index f258ed79..ca9fc82e 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryController.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryController.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.list +package im.vector.riotx.features.home.room.list import androidx.annotation.StringRes import com.airbnb.epoxy.TypedEpoxyController import im.vector.matrix.android.api.session.room.model.RoomSummary -import im.vector.riotredesign.core.resources.StringProvider +import im.vector.riotx.core.resources.StringProvider import javax.inject.Inject class RoomSummaryController @Inject constructor(private val stringProvider: StringProvider, diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryFormatter.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryFormatter.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryFormatter.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryFormatter.kt index a6463e37..86085281 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryFormatter.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryFormatter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.list +package im.vector.riotx.features.home.room.list object RoomSummaryFormatter { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItem.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItem.kt similarity index 90% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItem.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItem.kt index 1207cb13..72f5b973 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItem.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.list +package im.vector.riotx.features.home.room.list import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder -import im.vector.riotredesign.core.epoxy.VectorEpoxyModel -import im.vector.riotredesign.features.home.AvatarRenderer +import im.vector.riotx.R +import im.vector.riotx.core.epoxy.VectorEpoxyHolder +import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.riotx.features.home.AvatarRenderer @EpoxyModelClass(layout = R.layout.item_room) diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItemFactory.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItemFactory.kt similarity index 89% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItemFactory.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItemFactory.kt index e846ebbb..05b366a6 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItemFactory.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItemFactory.kt @@ -14,23 +14,23 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.list +package im.vector.riotx.features.home.room.list import im.vector.matrix.android.api.session.events.model.EventType import im.vector.matrix.android.api.session.events.model.toModel import im.vector.matrix.android.api.session.room.model.Membership import im.vector.matrix.android.api.session.room.model.RoomSummary import im.vector.matrix.android.api.session.room.model.message.MessageContent -import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.VectorEpoxyModel -import im.vector.riotredesign.core.extensions.localDateTime -import im.vector.riotredesign.core.resources.ColorProvider -import im.vector.riotredesign.core.resources.DateProvider -import im.vector.riotredesign.core.resources.StringProvider -import im.vector.riotredesign.features.home.AvatarRenderer -import im.vector.riotredesign.features.home.room.detail.timeline.format.NoticeEventFormatter -import im.vector.riotredesign.features.home.room.detail.timeline.helper.TimelineDateFormatter -import im.vector.riotredesign.features.home.room.detail.timeline.helper.senderName +import im.vector.riotx.R +import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.riotx.core.extensions.localDateTime +import im.vector.riotx.core.resources.ColorProvider +import im.vector.riotx.core.resources.DateProvider +import im.vector.riotx.core.resources.StringProvider +import im.vector.riotx.features.home.AvatarRenderer +import im.vector.riotx.features.home.room.detail.timeline.format.NoticeEventFormatter +import im.vector.riotx.features.home.room.detail.timeline.helper.TimelineDateFormatter +import im.vector.riotx.features.home.room.detail.timeline.helper.senderName import me.gujun.android.span.span import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/UnreadCounterBadgeView.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/UnreadCounterBadgeView.kt similarity index 91% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/UnreadCounterBadgeView.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/list/UnreadCounterBadgeView.kt index 381fd0ec..f2ba1591 100755 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/UnreadCounterBadgeView.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/UnreadCounterBadgeView.kt @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.home.room.list +package im.vector.riotx.features.home.room.list import android.content.Context import android.util.AttributeSet import android.view.View import androidx.appcompat.widget.AppCompatTextView -import im.vector.riotredesign.R -import im.vector.riotredesign.features.themes.ThemeUtils +import im.vector.riotx.R +import im.vector.riotx.features.themes.ThemeUtils class UnreadCounterBadgeView : AppCompatTextView { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/widget/FabMenuView.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/widget/FabMenuView.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/features/home/room/list/widget/FabMenuView.kt rename to vector/src/main/java/im/vector/riotx/features/home/room/list/widget/FabMenuView.kt index 9210e7ac..32efca66 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/widget/FabMenuView.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/widget/FabMenuView.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotredesign.features.home.room.list.widget +package im.vector.riotx.features.home.room.list.widget import android.content.Context import android.util.AttributeSet import androidx.constraintlayout.motion.widget.MotionLayout import androidx.core.view.isVisible import com.google.android.material.floatingactionbutton.FloatingActionButton -import im.vector.riotredesign.R -import im.vector.riotredesign.features.themes.ThemeUtils +import im.vector.riotx.R +import im.vector.riotx.features.themes.ThemeUtils import kotlinx.android.synthetic.main.motion_fab_menu_merge.view.* class FabMenuView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, diff --git a/vector/src/main/java/im/vector/riotredesign/features/homeserver/ServerUrlsRepository.kt b/vector/src/main/java/im/vector/riotx/features/homeserver/ServerUrlsRepository.kt similarity index 98% rename from vector/src/main/java/im/vector/riotredesign/features/homeserver/ServerUrlsRepository.kt rename to vector/src/main/java/im/vector/riotx/features/homeserver/ServerUrlsRepository.kt index 2893dded..37ac4400 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/homeserver/ServerUrlsRepository.kt +++ b/vector/src/main/java/im/vector/riotx/features/homeserver/ServerUrlsRepository.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package im.vector.riotredesign.features.homeserver +package im.vector.riotx.features.homeserver import android.content.Context import android.text.TextUtils import androidx.core.content.edit import androidx.preference.PreferenceManager -import im.vector.riotredesign.R +import im.vector.riotx.R /** * Object to store and retrieve home and identity server urls diff --git a/vector/src/main/java/im/vector/riotredesign/features/html/EventHtmlRenderer.kt b/vector/src/main/java/im/vector/riotx/features/html/EventHtmlRenderer.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/features/html/EventHtmlRenderer.kt rename to vector/src/main/java/im/vector/riotx/features/html/EventHtmlRenderer.kt index fa755a11..3e563b33 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/html/EventHtmlRenderer.kt +++ b/vector/src/main/java/im/vector/riotx/features/html/EventHtmlRenderer.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.html +package im.vector.riotx.features.html import android.content.Context import android.text.style.URLSpan @@ -22,9 +22,9 @@ import androidx.appcompat.app.AppCompatActivity import im.vector.matrix.android.api.permalinks.PermalinkData import im.vector.matrix.android.api.permalinks.PermalinkParser import im.vector.matrix.android.api.session.Session -import im.vector.riotredesign.core.glide.GlideApp -import im.vector.riotredesign.core.glide.GlideRequests -import im.vector.riotredesign.features.home.AvatarRenderer +import im.vector.riotx.core.glide.GlideApp +import im.vector.riotx.core.glide.GlideRequests +import im.vector.riotx.features.home.AvatarRenderer import org.commonmark.node.BlockQuote import org.commonmark.node.HtmlBlock import org.commonmark.node.HtmlInline diff --git a/vector/src/main/java/im/vector/riotredesign/features/html/FontTagHandler.kt b/vector/src/main/java/im/vector/riotx/features/html/FontTagHandler.kt similarity index 98% rename from vector/src/main/java/im/vector/riotredesign/features/html/FontTagHandler.kt rename to vector/src/main/java/im/vector/riotx/features/html/FontTagHandler.kt index f7571559..adaee21f 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/html/FontTagHandler.kt +++ b/vector/src/main/java/im/vector/riotx/features/html/FontTagHandler.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.html +package im.vector.riotx.features.html import android.graphics.Color import android.text.style.ForegroundColorSpan diff --git a/vector/src/main/java/im/vector/riotredesign/features/html/PillImageSpan.kt b/vector/src/main/java/im/vector/riotx/features/html/PillImageSpan.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/features/html/PillImageSpan.kt rename to vector/src/main/java/im/vector/riotx/features/html/PillImageSpan.kt index c5939e6d..3f9e4b2b 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/html/PillImageSpan.kt +++ b/vector/src/main/java/im/vector/riotx/features/html/PillImageSpan.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.html +package im.vector.riotx.features.html import android.content.Context import android.graphics.Canvas @@ -27,9 +27,9 @@ import com.bumptech.glide.request.target.SimpleTarget import com.bumptech.glide.request.transition.Transition import com.google.android.material.chip.ChipDrawable import im.vector.matrix.android.api.session.user.model.User -import im.vector.riotredesign.R -import im.vector.riotredesign.core.glide.GlideRequests -import im.vector.riotredesign.features.home.AvatarRenderer +import im.vector.riotx.R +import im.vector.riotx.core.glide.GlideRequests +import im.vector.riotx.features.home.AvatarRenderer import java.lang.ref.WeakReference /** diff --git a/vector/src/main/java/im/vector/riotredesign/features/invite/VectorInviteView.kt b/vector/src/main/java/im/vector/riotx/features/invite/VectorInviteView.kt similarity index 92% rename from vector/src/main/java/im/vector/riotredesign/features/invite/VectorInviteView.kt rename to vector/src/main/java/im/vector/riotx/features/invite/VectorInviteView.kt index 15187a32..29e98a02 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/invite/VectorInviteView.kt +++ b/vector/src/main/java/im/vector/riotx/features/invite/VectorInviteView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.invite +package im.vector.riotx.features.invite import android.content.Context import android.util.AttributeSet @@ -22,9 +22,9 @@ import android.view.View import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.view.updateLayoutParams import im.vector.matrix.android.api.session.user.model.User -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.HasScreenInjector -import im.vector.riotredesign.features.home.AvatarRenderer +import im.vector.riotx.R +import im.vector.riotx.core.di.HasScreenInjector +import im.vector.riotx.features.home.AvatarRenderer import kotlinx.android.synthetic.main.vector_invite_view.view.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/lifecycle/VectorActivityLifecycleCallbacks.kt b/vector/src/main/java/im/vector/riotx/features/lifecycle/VectorActivityLifecycleCallbacks.kt similarity index 92% rename from vector/src/main/java/im/vector/riotredesign/features/lifecycle/VectorActivityLifecycleCallbacks.kt rename to vector/src/main/java/im/vector/riotx/features/lifecycle/VectorActivityLifecycleCallbacks.kt index b3ac5726..d6c7bbd9 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/lifecycle/VectorActivityLifecycleCallbacks.kt +++ b/vector/src/main/java/im/vector/riotx/features/lifecycle/VectorActivityLifecycleCallbacks.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotredesign.features.lifecycle +package im.vector.riotx.features.lifecycle import android.app.Activity import android.app.Application import android.os.Bundle -import im.vector.riotredesign.features.popup.PopupAlertManager +import im.vector.riotx.features.popup.PopupAlertManager import javax.inject.Inject class VectorActivityLifecycleCallbacks @Inject constructor() : Application.ActivityLifecycleCallbacks { diff --git a/vector/src/main/java/im/vector/riotredesign/features/login/LoginActivity.kt b/vector/src/main/java/im/vector/riotx/features/login/LoginActivity.kt similarity index 90% rename from vector/src/main/java/im/vector/riotredesign/features/login/LoginActivity.kt rename to vector/src/main/java/im/vector/riotx/features/login/LoginActivity.kt index 6ced7b27..911bffb8 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/login/LoginActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/login/LoginActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.login +package im.vector.riotx.features.login import android.content.Context import android.content.Intent @@ -27,15 +27,15 @@ import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.auth.Authenticator import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig import im.vector.matrix.android.api.session.Session -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ActiveSessionHolder -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.extensions.configureAndStart -import im.vector.riotredesign.core.extensions.showPassword -import im.vector.riotredesign.core.platform.VectorBaseActivity -import im.vector.riotredesign.features.disclaimer.showDisclaimerDialog -import im.vector.riotredesign.features.home.HomeActivity -import im.vector.riotredesign.features.notifications.PushRuleTriggerListener +import im.vector.riotx.R +import im.vector.riotx.core.di.ActiveSessionHolder +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.extensions.configureAndStart +import im.vector.riotx.core.extensions.showPassword +import im.vector.riotx.core.platform.VectorBaseActivity +import im.vector.riotx.features.disclaimer.showDisclaimerDialog +import im.vector.riotx.features.home.HomeActivity +import im.vector.riotx.features.notifications.PushRuleTriggerListener import io.reactivex.Observable import io.reactivex.functions.Function3 import io.reactivex.rxkotlin.subscribeBy diff --git a/vector/src/main/java/im/vector/riotredesign/features/media/DefaultImageLoaderCallback.kt b/vector/src/main/java/im/vector/riotx/features/media/DefaultImageLoaderCallback.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/features/media/DefaultImageLoaderCallback.kt rename to vector/src/main/java/im/vector/riotx/features/media/DefaultImageLoaderCallback.kt index 40bbad20..4485a60c 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/media/DefaultImageLoaderCallback.kt +++ b/vector/src/main/java/im/vector/riotx/features/media/DefaultImageLoaderCallback.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.media +package im.vector.riotx.features.media import com.github.piasy.biv.loader.ImageLoader import java.io.File diff --git a/vector/src/main/java/im/vector/riotredesign/features/media/ImageContentRenderer.kt b/vector/src/main/java/im/vector/riotx/features/media/ImageContentRenderer.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/features/media/ImageContentRenderer.kt rename to vector/src/main/java/im/vector/riotx/features/media/ImageContentRenderer.kt index 15b7e82f..0f92cbff 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/media/ImageContentRenderer.kt +++ b/vector/src/main/java/im/vector/riotx/features/media/ImageContentRenderer.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.media +package im.vector.riotx.features.media import android.net.Uri import android.os.Parcelable @@ -24,9 +24,9 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners import com.github.piasy.biv.view.BigImageView import im.vector.matrix.android.api.session.content.ContentUrlResolver import im.vector.matrix.android.internal.crypto.attachments.ElementToDecrypt -import im.vector.riotredesign.core.di.ActiveSessionHolder -import im.vector.riotredesign.core.glide.GlideApp -import im.vector.riotredesign.core.utils.DimensionUtils.dpToPx +import im.vector.riotx.core.di.ActiveSessionHolder +import im.vector.riotx.core.glide.GlideApp +import im.vector.riotx.core.utils.DimensionUtils.dpToPx import kotlinx.android.parcel.Parcelize import java.io.File import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/media/ImageMediaViewerActivity.kt b/vector/src/main/java/im/vector/riotx/features/media/ImageMediaViewerActivity.kt similarity index 91% rename from vector/src/main/java/im/vector/riotredesign/features/media/ImageMediaViewerActivity.kt rename to vector/src/main/java/im/vector/riotx/features/media/ImageMediaViewerActivity.kt index fc5e2725..bd3f4480 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/media/ImageMediaViewerActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/media/ImageMediaViewerActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.media +package im.vector.riotx.features.media import android.content.Context import android.content.Intent @@ -23,9 +23,9 @@ import androidx.appcompat.widget.Toolbar import androidx.core.view.isVisible import com.github.piasy.biv.indicator.progresspie.ProgressPieIndicator import com.github.piasy.biv.view.GlideImageViewFactory -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.glide.GlideApp -import im.vector.riotredesign.core.platform.VectorBaseActivity +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.glide.GlideApp +import im.vector.riotx.core.platform.VectorBaseActivity import kotlinx.android.synthetic.main.activity_image_media_viewer.* import javax.inject.Inject @@ -40,7 +40,7 @@ class ImageMediaViewerActivity : VectorBaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(im.vector.riotredesign.R.layout.activity_image_media_viewer) + setContentView(im.vector.riotx.R.layout.activity_image_media_viewer) val mediaData = intent.getParcelableExtra(EXTRA_MEDIA_DATA) if (mediaData.url.isNullOrEmpty()) { finish() diff --git a/vector/src/main/java/im/vector/riotredesign/features/media/VideoContentRenderer.kt b/vector/src/main/java/im/vector/riotx/features/media/VideoContentRenderer.kt similarity index 90% rename from vector/src/main/java/im/vector/riotredesign/features/media/VideoContentRenderer.kt rename to vector/src/main/java/im/vector/riotx/features/media/VideoContentRenderer.kt index 2eb5f062..5cba0084 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/media/VideoContentRenderer.kt +++ b/vector/src/main/java/im/vector/riotx/features/media/VideoContentRenderer.kt @@ -14,13 +14,12 @@ * limitations under the License. */ -package im.vector.riotredesign.features.media +package im.vector.riotx.features.media import android.os.Parcelable import android.widget.ImageView import android.widget.VideoView -import im.vector.matrix.android.api.Matrix -import im.vector.riotredesign.core.di.ActiveSessionHolder +import im.vector.riotx.core.di.ActiveSessionHolder import kotlinx.android.parcel.Parcelize import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/media/VideoMediaViewerActivity.kt b/vector/src/main/java/im/vector/riotx/features/media/VideoMediaViewerActivity.kt similarity index 87% rename from vector/src/main/java/im/vector/riotredesign/features/media/VideoMediaViewerActivity.kt rename to vector/src/main/java/im/vector/riotx/features/media/VideoMediaViewerActivity.kt index d0b70302..e8e4f213 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/media/VideoMediaViewerActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/media/VideoMediaViewerActivity.kt @@ -14,15 +14,14 @@ * limitations under the License. */ -package im.vector.riotredesign.features.media +package im.vector.riotx.features.media import android.content.Context import android.content.Intent import android.os.Bundle import androidx.appcompat.widget.Toolbar -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.platform.VectorBaseActivity -import im.vector.riotredesign.features.home.AvatarRenderer +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.platform.VectorBaseActivity import kotlinx.android.synthetic.main.activity_video_media_viewer.* import javax.inject.Inject @@ -37,7 +36,7 @@ class VideoMediaViewerActivity : VectorBaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(im.vector.riotredesign.R.layout.activity_video_media_viewer) + setContentView(im.vector.riotx.R.layout.activity_video_media_viewer) val mediaData = intent.getParcelableExtra(EXTRA_MEDIA_DATA) if (mediaData.videoUrl.isNullOrEmpty()) { finish() diff --git a/vector/src/main/java/im/vector/riotredesign/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt similarity index 76% rename from vector/src/main/java/im/vector/riotredesign/features/navigation/DefaultNavigator.kt rename to vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt index bd0a82a0..82e60c64 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/navigation/DefaultNavigator.kt +++ b/vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt @@ -14,22 +14,22 @@ * limitations under the License. */ -package im.vector.riotredesign.features.navigation +package im.vector.riotx.features.navigation import android.content.Context import android.content.Intent import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoom -import im.vector.riotredesign.R -import im.vector.riotredesign.core.platform.VectorBaseActivity -import im.vector.riotredesign.core.utils.toast -import im.vector.riotredesign.features.crypto.keysbackup.settings.KeysBackupManageActivity -import im.vector.riotredesign.features.crypto.keysbackup.setup.KeysBackupSetupActivity -import im.vector.riotredesign.features.debug.DebugMenuActivity -import im.vector.riotredesign.features.home.room.detail.RoomDetailActivity -import im.vector.riotredesign.features.home.room.detail.RoomDetailArgs -import im.vector.riotredesign.features.roomdirectory.RoomDirectoryActivity -import im.vector.riotredesign.features.roomdirectory.roompreview.RoomPreviewActivity -import im.vector.riotredesign.features.settings.VectorSettingsActivity +import im.vector.riotx.R +import im.vector.riotx.core.platform.VectorBaseActivity +import im.vector.riotx.core.utils.toast +import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupManageActivity +import im.vector.riotx.features.crypto.keysbackup.setup.KeysBackupSetupActivity +import im.vector.riotx.features.debug.DebugMenuActivity +import im.vector.riotx.features.home.room.detail.RoomDetailActivity +import im.vector.riotx.features.home.room.detail.RoomDetailArgs +import im.vector.riotx.features.roomdirectory.RoomDirectoryActivity +import im.vector.riotx.features.roomdirectory.roompreview.RoomPreviewActivity +import im.vector.riotx.features.settings.VectorSettingsActivity import timber.log.Timber import javax.inject.Inject import javax.inject.Singleton diff --git a/vector/src/main/java/im/vector/riotredesign/features/navigation/Navigator.kt b/vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/features/navigation/Navigator.kt rename to vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt index 9908f246..aada9e18 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/navigation/Navigator.kt +++ b/vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.navigation +package im.vector.riotx.features.navigation import android.content.Context import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoom diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/BitmapLoader.kt b/vector/src/main/java/im/vector/riotx/features/notifications/BitmapLoader.kt similarity index 98% rename from vector/src/main/java/im/vector/riotredesign/features/notifications/BitmapLoader.kt rename to vector/src/main/java/im/vector/riotx/features/notifications/BitmapLoader.kt index 9a52ea5d..d3506be7 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/notifications/BitmapLoader.kt +++ b/vector/src/main/java/im/vector/riotx/features/notifications/BitmapLoader.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.notifications +package im.vector.riotx.features.notifications import android.content.Context import android.graphics.Bitmap diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/IconLoader.kt b/vector/src/main/java/im/vector/riotx/features/notifications/IconLoader.kt similarity index 98% rename from vector/src/main/java/im/vector/riotredesign/features/notifications/IconLoader.kt rename to vector/src/main/java/im/vector/riotx/features/notifications/IconLoader.kt index 61da3ea3..c606f900 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/notifications/IconLoader.kt +++ b/vector/src/main/java/im/vector/riotx/features/notifications/IconLoader.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.notifications +package im.vector.riotx.features.notifications import android.content.Context import android.os.Handler diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/InviteNotifiableEvent.kt b/vector/src/main/java/im/vector/riotx/features/notifications/InviteNotifiableEvent.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/features/notifications/InviteNotifiableEvent.kt rename to vector/src/main/java/im/vector/riotx/features/notifications/InviteNotifiableEvent.kt index 34838de2..d6f3655f 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/notifications/InviteNotifiableEvent.kt +++ b/vector/src/main/java/im/vector/riotx/features/notifications/InviteNotifiableEvent.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.notifications +package im.vector.riotx.features.notifications import androidx.core.app.NotificationCompat diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotifiableEvent.kt b/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEvent.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/features/notifications/NotifiableEvent.kt rename to vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEvent.kt index 5e2cb667..ea2e21ab 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotifiableEvent.kt +++ b/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEvent.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.notifications +package im.vector.riotx.features.notifications import java.io.Serializable diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotifiableEventResolver.kt b/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEventResolver.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/features/notifications/NotifiableEventResolver.kt rename to vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEventResolver.kt index d2e166c2..2ec91652 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotifiableEventResolver.kt +++ b/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEventResolver.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.notifications +package im.vector.riotx.features.notifications import androidx.core.app.NotificationCompat import im.vector.matrix.android.api.session.Session @@ -25,10 +25,10 @@ import im.vector.matrix.android.api.session.room.model.Membership import im.vector.matrix.android.api.session.room.model.RoomMember import im.vector.matrix.android.api.session.room.model.message.MessageContent import im.vector.matrix.android.api.session.room.timeline.TimelineEvent -import im.vector.riotredesign.BuildConfig -import im.vector.riotredesign.R -import im.vector.riotredesign.core.resources.StringProvider -import im.vector.riotredesign.features.home.room.detail.timeline.format.NoticeEventFormatter +import im.vector.riotx.BuildConfig +import im.vector.riotx.R +import im.vector.riotx.core.resources.StringProvider +import im.vector.riotx.features.home.room.detail.timeline.format.NoticeEventFormatter import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotifiableMessageEvent.kt b/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableMessageEvent.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/features/notifications/NotifiableMessageEvent.kt rename to vector/src/main/java/im/vector/riotx/features/notifications/NotifiableMessageEvent.kt index 784aac2b..11c2d744 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotifiableMessageEvent.kt +++ b/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableMessageEvent.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.notifications +package im.vector.riotx.features.notifications import androidx.core.app.NotificationCompat import im.vector.matrix.android.api.session.events.model.EventType diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationAction.kt b/vector/src/main/java/im/vector/riotx/features/notifications/NotificationAction.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationAction.kt rename to vector/src/main/java/im/vector/riotx/features/notifications/NotificationAction.kt index a1eac946..869a204c 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationAction.kt +++ b/vector/src/main/java/im/vector/riotx/features/notifications/NotificationAction.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.notifications +package im.vector.riotx.features.notifications import im.vector.matrix.android.api.pushrules.Action diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationBroadcastReceiver.kt b/vector/src/main/java/im/vector/riotx/features/notifications/NotificationBroadcastReceiver.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationBroadcastReceiver.kt rename to vector/src/main/java/im/vector/riotx/features/notifications/NotificationBroadcastReceiver.kt index 2272487e..791072a2 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationBroadcastReceiver.kt +++ b/vector/src/main/java/im/vector/riotx/features/notifications/NotificationBroadcastReceiver.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.notifications +package im.vector.riotx.features.notifications import android.content.BroadcastReceiver import android.content.Context @@ -23,9 +23,9 @@ import androidx.core.app.RemoteInput import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.room.Room -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ActiveSessionHolder -import im.vector.riotredesign.core.extensions.vectorComponent +import im.vector.riotx.R +import im.vector.riotx.core.di.ActiveSessionHolder +import im.vector.riotx.core.extensions.vectorComponent import timber.log.Timber import java.util.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationDrawerManager.kt b/vector/src/main/java/im/vector/riotx/features/notifications/NotificationDrawerManager.kt similarity index 98% rename from vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationDrawerManager.kt rename to vector/src/main/java/im/vector/riotx/features/notifications/NotificationDrawerManager.kt index a66d6395..a704f672 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationDrawerManager.kt +++ b/vector/src/main/java/im/vector/riotx/features/notifications/NotificationDrawerManager.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.notifications +package im.vector.riotx.features.notifications import android.app.Notification import android.content.Context @@ -22,10 +22,10 @@ import androidx.core.app.NotificationCompat import androidx.core.app.Person import im.vector.matrix.android.api.session.content.ContentUrlResolver import im.vector.matrix.android.api.util.SecretStoringUtils -import im.vector.riotredesign.BuildConfig -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ActiveSessionHolder -import im.vector.riotredesign.features.settings.PreferencesManager +import im.vector.riotx.BuildConfig +import im.vector.riotx.R +import im.vector.riotx.core.di.ActiveSessionHolder +import im.vector.riotx.features.settings.PreferencesManager import me.gujun.android.span.span import timber.log.Timber import java.io.File diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationUtils.kt b/vector/src/main/java/im/vector/riotx/features/notifications/NotificationUtils.kt similarity index 98% rename from vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationUtils.kt rename to vector/src/main/java/im/vector/riotx/features/notifications/NotificationUtils.kt index e91b4d74..c6673698 100755 --- a/vector/src/main/java/im/vector/riotredesign/features/notifications/NotificationUtils.kt +++ b/vector/src/main/java/im/vector/riotx/features/notifications/NotificationUtils.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.notifications +package im.vector.riotx.features.notifications import android.annotation.SuppressLint import android.annotation.TargetApi @@ -35,13 +35,13 @@ import androidx.core.app.RemoteInput import androidx.core.app.TaskStackBuilder import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment -import im.vector.riotredesign.BuildConfig -import im.vector.riotredesign.R -import im.vector.riotredesign.core.utils.startNotificationChannelSettingsIntent -import im.vector.riotredesign.features.home.HomeActivity -import im.vector.riotredesign.features.home.room.detail.RoomDetailActivity -import im.vector.riotredesign.features.home.room.detail.RoomDetailArgs -import im.vector.riotredesign.features.settings.PreferencesManager +import im.vector.riotx.BuildConfig +import im.vector.riotx.R +import im.vector.riotx.core.utils.startNotificationChannelSettingsIntent +import im.vector.riotx.features.home.HomeActivity +import im.vector.riotx.features.home.room.detail.RoomDetailActivity +import im.vector.riotx.features.home.room.detail.RoomDetailArgs +import im.vector.riotx.features.settings.PreferencesManager import timber.log.Timber import java.util.* diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/OutdatedEventDetector.kt b/vector/src/main/java/im/vector/riotx/features/notifications/OutdatedEventDetector.kt similarity index 92% rename from vector/src/main/java/im/vector/riotredesign/features/notifications/OutdatedEventDetector.kt rename to vector/src/main/java/im/vector/riotx/features/notifications/OutdatedEventDetector.kt index 05bbc2ea..41ab92cd 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/notifications/OutdatedEventDetector.kt +++ b/vector/src/main/java/im/vector/riotx/features/notifications/OutdatedEventDetector.kt @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.notifications +package im.vector.riotx.features.notifications -import im.vector.riotredesign.core.di.ActiveSessionHolder +import im.vector.riotx.core.di.ActiveSessionHolder import javax.inject.Inject class OutdatedEventDetector @Inject constructor(private val activeSessionHolder: ActiveSessionHolder) { diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/PushRuleTriggerListener.kt b/vector/src/main/java/im/vector/riotx/features/notifications/PushRuleTriggerListener.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/features/notifications/PushRuleTriggerListener.kt rename to vector/src/main/java/im/vector/riotx/features/notifications/PushRuleTriggerListener.kt index 3fa30b31..760128de 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/notifications/PushRuleTriggerListener.kt +++ b/vector/src/main/java/im/vector/riotx/features/notifications/PushRuleTriggerListener.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.notifications +package im.vector.riotx.features.notifications import im.vector.matrix.android.api.pushrules.Action import im.vector.matrix.android.api.pushrules.PushRuleService diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/RoomEventGroupInfo.kt b/vector/src/main/java/im/vector/riotx/features/notifications/RoomEventGroupInfo.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/features/notifications/RoomEventGroupInfo.kt rename to vector/src/main/java/im/vector/riotx/features/notifications/RoomEventGroupInfo.kt index eac6e4d9..c0852abb 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/notifications/RoomEventGroupInfo.kt +++ b/vector/src/main/java/im/vector/riotx/features/notifications/RoomEventGroupInfo.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.notifications +package im.vector.riotx.features.notifications /** * Data class to hold information about a group of notifications for a room diff --git a/vector/src/main/java/im/vector/riotredesign/features/notifications/SimpleNotifiableEvent.kt b/vector/src/main/java/im/vector/riotx/features/notifications/SimpleNotifiableEvent.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/features/notifications/SimpleNotifiableEvent.kt rename to vector/src/main/java/im/vector/riotx/features/notifications/SimpleNotifiableEvent.kt index b0226ca3..8ec5ff95 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/notifications/SimpleNotifiableEvent.kt +++ b/vector/src/main/java/im/vector/riotx/features/notifications/SimpleNotifiableEvent.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.notifications +package im.vector.riotx.features.notifications import androidx.core.app.NotificationCompat diff --git a/vector/src/main/java/im/vector/riotredesign/features/popup/PopupAlertManager.kt b/vector/src/main/java/im/vector/riotx/features/popup/PopupAlertManager.kt similarity index 98% rename from vector/src/main/java/im/vector/riotredesign/features/popup/PopupAlertManager.kt rename to vector/src/main/java/im/vector/riotx/features/popup/PopupAlertManager.kt index 7d547abc..7382ad9f 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/popup/PopupAlertManager.kt +++ b/vector/src/main/java/im/vector/riotx/features/popup/PopupAlertManager.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.popup +package im.vector.riotx.features.popup import android.app.Activity import android.os.Build @@ -24,8 +24,8 @@ import androidx.annotation.ColorRes import androidx.annotation.DrawableRes import com.tapadoo.alerter.Alerter import com.tapadoo.alerter.OnHideAlertListener -import im.vector.riotredesign.R -import im.vector.riotredesign.features.crypto.verification.SASVerificationActivity +import im.vector.riotx.R +import im.vector.riotx.features.crypto.verification.SASVerificationActivity import timber.log.Timber import java.lang.ref.WeakReference diff --git a/vector/src/main/java/im/vector/riotredesign/features/rageshake/BugReportActivity.kt b/vector/src/main/java/im/vector/riotx/features/rageshake/BugReportActivity.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/features/rageshake/BugReportActivity.kt rename to vector/src/main/java/im/vector/riotx/features/rageshake/BugReportActivity.kt index 45486ee1..d0e229ff 100755 --- a/vector/src/main/java/im/vector/riotredesign/features/rageshake/BugReportActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/rageshake/BugReportActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.rageshake +package im.vector.riotx.features.rageshake import android.text.TextUtils import android.view.Menu @@ -23,9 +23,9 @@ import android.widget.Toast import androidx.core.view.isVisible import butterknife.OnCheckedChanged import butterknife.OnTextChanged -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.platform.VectorBaseActivity +import im.vector.riotx.R +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.platform.VectorBaseActivity import kotlinx.android.synthetic.main.activity_bug_report.* import timber.log.Timber diff --git a/vector/src/main/java/im/vector/riotredesign/features/rageshake/BugReporter.kt b/vector/src/main/java/im/vector/riotx/features/rageshake/BugReporter.kt similarity index 98% rename from vector/src/main/java/im/vector/riotredesign/features/rageshake/BugReporter.kt rename to vector/src/main/java/im/vector/riotx/features/rageshake/BugReporter.kt index 54270374..7bb75c4e 100755 --- a/vector/src/main/java/im/vector/riotredesign/features/rageshake/BugReporter.kt +++ b/vector/src/main/java/im/vector/riotx/features/rageshake/BugReporter.kt @@ -16,7 +16,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.rageshake +package im.vector.riotx.features.rageshake import android.annotation.SuppressLint import android.app.Activity @@ -28,14 +28,14 @@ import android.os.Build import android.text.TextUtils import android.view.View import im.vector.matrix.android.api.Matrix -import im.vector.riotredesign.BuildConfig -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ActiveSessionHolder -import im.vector.riotredesign.core.extensions.toOnOff -import im.vector.riotredesign.core.utils.getDeviceLocale -import im.vector.riotredesign.features.settings.VectorLocale -import im.vector.riotredesign.features.themes.ThemeUtils -import im.vector.riotredesign.features.version.getVersion +import im.vector.riotx.BuildConfig +import im.vector.riotx.R +import im.vector.riotx.core.di.ActiveSessionHolder +import im.vector.riotx.core.extensions.toOnOff +import im.vector.riotx.core.utils.getDeviceLocale +import im.vector.riotx.features.settings.VectorLocale +import im.vector.riotx.features.themes.ThemeUtils +import im.vector.riotx.features.version.getVersion import okhttp3.* import org.json.JSONException import org.json.JSONObject diff --git a/vector/src/main/java/im/vector/riotredesign/features/rageshake/BugReporterMultipartBody.java b/vector/src/main/java/im/vector/riotx/features/rageshake/BugReporterMultipartBody.java similarity index 99% rename from vector/src/main/java/im/vector/riotredesign/features/rageshake/BugReporterMultipartBody.java rename to vector/src/main/java/im/vector/riotx/features/rageshake/BugReporterMultipartBody.java index 48796efa..6b0ae149 100755 --- a/vector/src/main/java/im/vector/riotredesign/features/rageshake/BugReporterMultipartBody.java +++ b/vector/src/main/java/im/vector/riotx/features/rageshake/BugReporterMultipartBody.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.rageshake; +package im.vector.riotx.features.rageshake; import java.io.IOException; import java.util.ArrayList; diff --git a/vector/src/main/java/im/vector/riotredesign/features/rageshake/RageShake.kt b/vector/src/main/java/im/vector/riotx/features/rageshake/RageShake.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/features/rageshake/RageShake.kt rename to vector/src/main/java/im/vector/riotx/features/rageshake/RageShake.kt index 4125ac20..d281ea3b 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/rageshake/RageShake.kt +++ b/vector/src/main/java/im/vector/riotx/features/rageshake/RageShake.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.rageshake +package im.vector.riotx.features.rageshake import android.content.Context import android.hardware.Sensor @@ -24,7 +24,7 @@ import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity import androidx.core.content.edit import com.squareup.seismic.ShakeDetector -import im.vector.riotredesign.R +import im.vector.riotx.R import javax.inject.Inject class RageShake @Inject constructor(private val activity: AppCompatActivity, diff --git a/vector/src/main/java/im/vector/riotredesign/features/rageshake/VectorFileLogger.kt b/vector/src/main/java/im/vector/riotx/features/rageshake/VectorFileLogger.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/features/rageshake/VectorFileLogger.kt rename to vector/src/main/java/im/vector/riotx/features/rageshake/VectorFileLogger.kt index eac95887..cdea1f0d 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/rageshake/VectorFileLogger.kt +++ b/vector/src/main/java/im/vector/riotx/features/rageshake/VectorFileLogger.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.rageshake +package im.vector.riotx.features.rageshake import android.content.Context import android.text.TextUtils @@ -36,7 +36,7 @@ object VectorFileLogger : Timber.DebugTree() { // relatively large rotation count because closing > opening the app rotates the log (!) private const val LOG_ROTATION_COUNT = 15 - private val sLogger = Logger.getLogger("im.vector.riotredesign") + private val sLogger = Logger.getLogger("im.vector.riotx") private lateinit var sFileHandler: FileHandler private lateinit var sCacheDirectory: File private var sFileName = "riotx" diff --git a/vector/src/main/java/im/vector/riotredesign/features/rageshake/VectorUncaughtExceptionHandler.kt b/vector/src/main/java/im/vector/riotx/features/rageshake/VectorUncaughtExceptionHandler.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/features/rageshake/VectorUncaughtExceptionHandler.kt rename to vector/src/main/java/im/vector/riotx/features/rageshake/VectorUncaughtExceptionHandler.kt index bd23eb9c..86e4d9ee 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/rageshake/VectorUncaughtExceptionHandler.kt +++ b/vector/src/main/java/im/vector/riotx/features/rageshake/VectorUncaughtExceptionHandler.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotredesign.features.rageshake +package im.vector.riotx.features.rageshake import android.content.Context import android.os.Build import androidx.core.content.edit import androidx.preference.PreferenceManager import im.vector.matrix.android.api.Matrix -import im.vector.riotredesign.BuildConfig -import im.vector.riotredesign.features.version.getVersion +import im.vector.riotx.BuildConfig +import im.vector.riotx.features.version.getVersion import timber.log.Timber import java.io.PrintWriter import java.io.StringWriter diff --git a/vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiChooserFragment.kt b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiChooserFragment.kt similarity index 91% rename from vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiChooserFragment.kt rename to vector/src/main/java/im/vector/riotx/features/reactions/EmojiChooserFragment.kt index 13ade472..0335d0a4 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiChooserFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiChooserFragment.kt @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.reactions +package im.vector.riotx.features.reactions import android.os.Bundle import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.RecyclerView -import im.vector.riotredesign.R -import im.vector.riotredesign.core.platform.VectorBaseFragment +import im.vector.riotx.R +import im.vector.riotx.core.platform.VectorBaseFragment class EmojiChooserFragment : VectorBaseFragment() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiChooserViewModel.kt b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiChooserViewModel.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiChooserViewModel.kt rename to vector/src/main/java/im/vector/riotx/features/reactions/EmojiChooserViewModel.kt index 47f2dbf1..b03dfb05 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiChooserViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiChooserViewModel.kt @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.reactions +package im.vector.riotx.features.reactions import android.content.Context import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import im.vector.riotredesign.core.utils.LiveEvent +import im.vector.riotx.core.utils.LiveEvent import javax.inject.Inject class EmojiChooserViewModel @Inject constructor() : ViewModel() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiDataSource.kt b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiDataSource.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiDataSource.kt rename to vector/src/main/java/im/vector/riotx/features/reactions/EmojiDataSource.kt index d892dce2..ad824a5c 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiDataSource.kt +++ b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiDataSource.kt @@ -13,16 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.reactions +package im.vector.riotx.features.reactions import android.content.Context import com.squareup.moshi.Json import com.squareup.moshi.JsonClass import com.squareup.moshi.Moshi -import im.vector.riotredesign.R -import java.io.InputStreamReader -import com.squareup.moshi.JsonAdapter - +import im.vector.riotx.R class EmojiDataSource(val context: Context) { diff --git a/vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiDrawView.kt b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiDrawView.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiDrawView.kt rename to vector/src/main/java/im/vector/riotx/features/reactions/EmojiDrawView.kt index 146cc7b9..3f20c65a 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiDrawView.kt +++ b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiDrawView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.reactions +package im.vector.riotx.features.reactions import android.content.Context import android.graphics.Canvas diff --git a/vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiReactionPickerActivity.kt b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiReactionPickerActivity.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiReactionPickerActivity.kt rename to vector/src/main/java/im/vector/riotx/features/reactions/EmojiReactionPickerActivity.kt index 5944c81d..d8d0fb04 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiReactionPickerActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiReactionPickerActivity.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.reactions +package im.vector.riotx.features.reactions import android.app.Activity import android.content.Context @@ -28,11 +28,11 @@ import androidx.appcompat.widget.Toolbar import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProviders import com.google.android.material.tabs.TabLayout -import im.vector.riotredesign.EmojiCompatFontProvider -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.extensions.observeEvent -import im.vector.riotredesign.core.platform.VectorBaseActivity +import im.vector.riotx.EmojiCompatFontProvider +import im.vector.riotx.R +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.extensions.observeEvent +import im.vector.riotx.core.platform.VectorBaseActivity import kotlinx.android.synthetic.main.activity_emoji_reaction_picker.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiRecyclerAdapter.kt b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiRecyclerAdapter.kt similarity index 99% rename from vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiRecyclerAdapter.kt rename to vector/src/main/java/im/vector/riotx/features/reactions/EmojiRecyclerAdapter.kt index e9f83f72..a8a7be6f 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/reactions/EmojiRecyclerAdapter.kt +++ b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiRecyclerAdapter.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.reactions +package im.vector.riotx.features.reactions import android.os.Build import android.os.Trace @@ -29,7 +29,7 @@ import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.transition.AutoTransition import androidx.transition.TransitionManager -import im.vector.riotredesign.R +import im.vector.riotx.R import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch diff --git a/vector/src/main/java/im/vector/riotredesign/features/reactions/ReactionClickListener.kt b/vector/src/main/java/im/vector/riotx/features/reactions/ReactionClickListener.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/features/reactions/ReactionClickListener.kt rename to vector/src/main/java/im/vector/riotx/features/reactions/ReactionClickListener.kt index 6e520c89..b26076b6 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/reactions/ReactionClickListener.kt +++ b/vector/src/main/java/im/vector/riotx/features/reactions/ReactionClickListener.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.reactions +package im.vector.riotx.features.reactions interface ReactionClickListener { fun onReactionSelected(reaction: String) diff --git a/vector/src/main/java/im/vector/riotredesign/features/reactions/widget/CircleView.kt b/vector/src/main/java/im/vector/riotx/features/reactions/widget/CircleView.kt similarity index 98% rename from vector/src/main/java/im/vector/riotredesign/features/reactions/widget/CircleView.kt rename to vector/src/main/java/im/vector/riotx/features/reactions/widget/CircleView.kt index 119f340c..6632e23d 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/reactions/widget/CircleView.kt +++ b/vector/src/main/java/im/vector/riotx/features/reactions/widget/CircleView.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.reactions.widget +package im.vector.riotx.features.reactions.widget import android.animation.ArgbEvaluator import android.content.Context diff --git a/vector/src/main/java/im/vector/riotredesign/features/reactions/widget/DotsView.kt b/vector/src/main/java/im/vector/riotx/features/reactions/widget/DotsView.kt similarity index 99% rename from vector/src/main/java/im/vector/riotredesign/features/reactions/widget/DotsView.kt rename to vector/src/main/java/im/vector/riotx/features/reactions/widget/DotsView.kt index d0e8fac1..3bb03157 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/reactions/widget/DotsView.kt +++ b/vector/src/main/java/im/vector/riotx/features/reactions/widget/DotsView.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.reactions.widget +package im.vector.riotx.features.reactions.widget import android.animation.ArgbEvaluator import android.content.Context diff --git a/vector/src/main/java/im/vector/riotredesign/features/reactions/widget/ReactionButton.kt b/vector/src/main/java/im/vector/riotx/features/reactions/widget/ReactionButton.kt similarity index 98% rename from vector/src/main/java/im/vector/riotredesign/features/reactions/widget/ReactionButton.kt rename to vector/src/main/java/im/vector/riotx/features/reactions/widget/ReactionButton.kt index 8250b668..0af910a0 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/reactions/widget/ReactionButton.kt +++ b/vector/src/main/java/im/vector/riotx/features/reactions/widget/ReactionButton.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.reactions.widget +package im.vector.riotx.features.reactions.widget import android.animation.Animator import android.animation.AnimatorListenerAdapter @@ -35,8 +35,8 @@ import android.widget.TextView import androidx.annotation.ColorInt import androidx.annotation.ColorRes import androidx.core.content.ContextCompat -import im.vector.riotredesign.R -import im.vector.riotredesign.core.utils.TextUtils +import im.vector.riotx.R +import im.vector.riotx.core.utils.TextUtils /** * An animated reaction button. diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/JoinState.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/JoinState.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/JoinState.kt rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/JoinState.kt index a5212181..7792bbb6 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/JoinState.kt +++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/JoinState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.roomdirectory +package im.vector.riotx.features.roomdirectory /** * Join state of a room diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomItem.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomItem.kt similarity index 89% rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomItem.kt rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomItem.kt index 2f46fbce..d3d858f9 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomItem.kt @@ -14,19 +14,19 @@ * limitations under the License. */ -package im.vector.riotredesign.features.roomdirectory +package im.vector.riotx.features.roomdirectory import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder -import im.vector.riotredesign.core.epoxy.VectorEpoxyModel -import im.vector.riotredesign.core.extensions.setTextOrHide -import im.vector.riotredesign.core.platform.ButtonStateView -import im.vector.riotredesign.features.home.AvatarRenderer +import im.vector.riotx.R +import im.vector.riotx.core.epoxy.VectorEpoxyHolder +import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.riotx.core.extensions.setTextOrHide +import im.vector.riotx.core.platform.ButtonStateView +import im.vector.riotx.features.home.AvatarRenderer @EpoxyModelClass(layout = R.layout.item_public_room) abstract class PublicRoomItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsController.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsController.kt similarity index 90% rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsController.kt rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsController.kt index b9bf30e7..47a7722e 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsController.kt +++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsController.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.roomdirectory +package im.vector.riotx.features.roomdirectory import com.airbnb.epoxy.TypedEpoxyController import com.airbnb.epoxy.VisibilityState @@ -22,13 +22,13 @@ import com.airbnb.mvrx.Fail import com.airbnb.mvrx.Incomplete import com.airbnb.mvrx.Success import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoom -import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.errorWithRetryItem -import im.vector.riotredesign.core.epoxy.loadingItem -import im.vector.riotredesign.core.epoxy.noResultItem -import im.vector.riotredesign.core.error.ErrorFormatter -import im.vector.riotredesign.core.resources.StringProvider -import im.vector.riotredesign.features.home.AvatarRenderer +import im.vector.riotx.R +import im.vector.riotx.core.epoxy.errorWithRetryItem +import im.vector.riotx.core.epoxy.loadingItem +import im.vector.riotx.core.epoxy.noResultItem +import im.vector.riotx.core.error.ErrorFormatter +import im.vector.riotx.core.resources.StringProvider +import im.vector.riotx.features.home.AvatarRenderer import javax.inject.Inject class PublicRoomsController @Inject constructor(private val stringProvider: StringProvider, diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsFragment.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsFragment.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsFragment.kt rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsFragment.kt index 05e9d493..873f8b8b 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.roomdirectory +package im.vector.riotx.features.roomdirectory import android.os.Bundle import android.view.MenuItem @@ -27,12 +27,12 @@ import com.airbnb.mvrx.withState import com.google.android.material.snackbar.Snackbar import com.jakewharton.rxbinding2.widget.RxTextView import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoom -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.error.ErrorFormatter -import im.vector.riotredesign.core.extensions.observeEvent -import im.vector.riotredesign.core.platform.VectorBaseFragment -import im.vector.riotredesign.features.themes.ThemeUtils +import im.vector.riotx.R +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.error.ErrorFormatter +import im.vector.riotx.core.extensions.observeEvent +import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.riotx.features.themes.ThemeUtils import io.reactivex.rxkotlin.subscribeBy import kotlinx.android.synthetic.main.fragment_public_rooms.* import timber.log.Timber diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsViewState.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsViewState.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsViewState.kt rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsViewState.kt index 0d43368e..0ad1ac26 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsViewState.kt +++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsViewState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.roomdirectory +package im.vector.riotx.features.roomdirectory import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryActivity.kt similarity index 79% rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryActivity.kt index 1b99b5a1..d708de94 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryActivity.kt @@ -14,18 +14,18 @@ * limitations under the License. */ -package im.vector.riotredesign.features.roomdirectory +package im.vector.riotx.features.roomdirectory import android.os.Bundle import androidx.lifecycle.ViewModelProviders -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.extensions.addFragment -import im.vector.riotredesign.core.extensions.addFragmentToBackstack -import im.vector.riotredesign.core.extensions.observeEvent -import im.vector.riotredesign.core.platform.VectorBaseActivity -import im.vector.riotredesign.features.roomdirectory.createroom.CreateRoomFragment -import im.vector.riotredesign.features.roomdirectory.picker.RoomDirectoryPickerFragment +import im.vector.riotx.R +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.extensions.addFragment +import im.vector.riotx.core.extensions.addFragmentToBackstack +import im.vector.riotx.core.extensions.observeEvent +import im.vector.riotx.core.platform.VectorBaseActivity +import im.vector.riotx.features.roomdirectory.createroom.CreateRoomFragment +import im.vector.riotx.features.roomdirectory.picker.RoomDirectoryPickerFragment import javax.inject.Inject class RoomDirectoryActivity : VectorBaseActivity() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryNavigationViewModel.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryNavigationViewModel.kt similarity index 86% rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryNavigationViewModel.kt rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryNavigationViewModel.kt index e92cd883..8becb009 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryNavigationViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryNavigationViewModel.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotredesign.features.roomdirectory +package im.vector.riotx.features.roomdirectory -import im.vector.riotredesign.core.mvrx.NavigationViewModel +import im.vector.riotx.core.mvrx.NavigationViewModel import javax.inject.Inject class RoomDirectoryNavigationViewModel @Inject constructor(): NavigationViewModel() \ No newline at end of file diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryViewModel.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryViewModel.kt similarity index 98% rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryViewModel.kt rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryViewModel.kt index 954c0f74..b34618e2 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.roomdirectory +package im.vector.riotx.features.roomdirectory import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -31,8 +31,8 @@ import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRooms import im.vector.matrix.android.api.session.room.model.thirdparty.RoomDirectoryData import im.vector.matrix.android.api.util.Cancelable import im.vector.matrix.rx.rx -import im.vector.riotredesign.core.platform.VectorViewModel -import im.vector.riotredesign.core.utils.LiveEvent +import im.vector.riotx.core.platform.VectorViewModel +import im.vector.riotx.core.utils.LiveEvent import timber.log.Timber private const val PUBLIC_ROOMS_LIMIT = 20 diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomController.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomController.kt similarity index 88% rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomController.kt rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomController.kt index abd78d96..ad58c0ce 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomController.kt +++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomController.kt @@ -14,20 +14,20 @@ * limitations under the License. */ -package im.vector.riotredesign.features.roomdirectory.createroom +package im.vector.riotx.features.roomdirectory.createroom import com.airbnb.epoxy.TypedEpoxyController import com.airbnb.mvrx.Fail import com.airbnb.mvrx.Loading import com.airbnb.mvrx.Success import com.airbnb.mvrx.Uninitialized -import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.errorWithRetryItem -import im.vector.riotredesign.core.epoxy.loadingItem -import im.vector.riotredesign.core.error.ErrorFormatter -import im.vector.riotredesign.core.resources.StringProvider -import im.vector.riotredesign.features.form.formEditTextItem -import im.vector.riotredesign.features.form.formSwitchItem +import im.vector.riotx.R +import im.vector.riotx.core.epoxy.errorWithRetryItem +import im.vector.riotx.core.epoxy.loadingItem +import im.vector.riotx.core.error.ErrorFormatter +import im.vector.riotx.core.resources.StringProvider +import im.vector.riotx.features.form.formEditTextItem +import im.vector.riotx.features.form.formSwitchItem import javax.inject.Inject class CreateRoomController @Inject constructor(private val stringProvider: StringProvider, diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomFragment.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomFragment.kt similarity index 90% rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomFragment.kt rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomFragment.kt index ee962961..28dc761a 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.roomdirectory.createroom +package im.vector.riotx.features.roomdirectory.createroom import android.os.Bundle import android.view.MenuItem @@ -23,11 +23,11 @@ import androidx.recyclerview.widget.LinearLayoutManager import com.airbnb.mvrx.Success import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.platform.VectorBaseFragment -import im.vector.riotredesign.features.roomdirectory.RoomDirectoryActivity -import im.vector.riotredesign.features.roomdirectory.RoomDirectoryNavigationViewModel +import im.vector.riotx.R +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.riotx.features.roomdirectory.RoomDirectoryActivity +import im.vector.riotx.features.roomdirectory.RoomDirectoryNavigationViewModel import kotlinx.android.synthetic.main.fragment_create_room.* import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomViewModel.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomViewModel.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomViewModel.kt rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomViewModel.kt index f928e20c..c6a4ff17 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.roomdirectory.createroom +package im.vector.riotx.features.roomdirectory.createroom import com.airbnb.mvrx.* import com.squareup.inject.assisted.Assisted @@ -24,7 +24,7 @@ import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.room.model.RoomDirectoryVisibility import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams import im.vector.matrix.android.api.session.room.model.create.CreateRoomPreset -import im.vector.riotredesign.core.platform.VectorViewModel +import im.vector.riotx.core.platform.VectorViewModel class CreateRoomViewModel @AssistedInject constructor(@Assisted initialState: CreateRoomViewState, private val session: Session diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomViewState.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomViewState.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomViewState.kt rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomViewState.kt index 42d9d144..7338d9fd 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomViewState.kt +++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomViewState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.roomdirectory.createroom +package im.vector.riotx.features.roomdirectory.createroom import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryItem.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryItem.kt similarity index 86% rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryItem.kt rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryItem.kt index e4b280f4..72fde059 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryItem.kt @@ -14,18 +14,18 @@ * limitations under the License. */ -package im.vector.riotredesign.features.roomdirectory.picker +package im.vector.riotx.features.roomdirectory.picker import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder -import im.vector.riotredesign.core.epoxy.VectorEpoxyModel -import im.vector.riotredesign.core.extensions.setTextOrHide -import im.vector.riotredesign.core.glide.GlideApp +import im.vector.riotx.R +import im.vector.riotx.core.epoxy.VectorEpoxyHolder +import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.riotx.core.extensions.setTextOrHide +import im.vector.riotx.core.glide.GlideApp @EpoxyModelClass(layout = R.layout.item_room_directory) abstract class RoomDirectoryItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryListCreator.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryListCreator.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryListCreator.kt rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryListCreator.kt index dadb4fa9..d4eeb67c 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryListCreator.kt +++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryListCreator.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package im.vector.riotredesign.features.roomdirectory.picker +package im.vector.riotx.features.roomdirectory.picker import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.room.model.thirdparty.RoomDirectoryData import im.vector.matrix.android.api.session.room.model.thirdparty.ThirdPartyProtocol -import im.vector.riotredesign.R -import im.vector.riotredesign.core.resources.StringArrayProvider +import im.vector.riotx.R +import im.vector.riotx.core.resources.StringArrayProvider import javax.inject.Inject class RoomDirectoryListCreator @Inject constructor(private val stringArrayProvider: StringArrayProvider, diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerController.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerController.kt similarity index 90% rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerController.kt rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerController.kt index b80944b9..3b0f4f5c 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerController.kt +++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerController.kt @@ -14,18 +14,18 @@ * limitations under the License. */ -package im.vector.riotredesign.features.roomdirectory.picker +package im.vector.riotx.features.roomdirectory.picker import com.airbnb.epoxy.TypedEpoxyController import com.airbnb.mvrx.Fail import com.airbnb.mvrx.Incomplete import com.airbnb.mvrx.Success import im.vector.matrix.android.api.session.room.model.thirdparty.RoomDirectoryData -import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.errorWithRetryItem -import im.vector.riotredesign.core.epoxy.loadingItem -import im.vector.riotredesign.core.error.ErrorFormatter -import im.vector.riotredesign.core.resources.StringProvider +import im.vector.riotx.R +import im.vector.riotx.core.epoxy.errorWithRetryItem +import im.vector.riotx.core.epoxy.loadingItem +import im.vector.riotx.core.error.ErrorFormatter +import im.vector.riotx.core.resources.StringProvider import javax.inject.Inject class RoomDirectoryPickerController @Inject constructor(private val stringProvider: StringProvider, diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt similarity index 89% rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt index bde76fd2..241e880c 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.roomdirectory.picker +package im.vector.riotx.features.roomdirectory.picker import android.os.Bundle import android.view.MenuItem @@ -25,12 +25,12 @@ import com.airbnb.mvrx.activityViewModel import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState import im.vector.matrix.android.api.session.room.model.thirdparty.RoomDirectoryData -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.platform.VectorBaseFragment -import im.vector.riotredesign.features.roomdirectory.RoomDirectoryActivity -import im.vector.riotredesign.features.roomdirectory.RoomDirectoryNavigationViewModel -import im.vector.riotredesign.features.roomdirectory.RoomDirectoryViewModel +import im.vector.riotx.R +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.riotx.features.roomdirectory.RoomDirectoryActivity +import im.vector.riotx.features.roomdirectory.RoomDirectoryNavigationViewModel +import im.vector.riotx.features.roomdirectory.RoomDirectoryViewModel import kotlinx.android.synthetic.main.fragment_room_directory_picker.* import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt index 6b5d86fb..746fe61c 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.roomdirectory.picker +package im.vector.riotx.features.roomdirectory.picker import com.airbnb.mvrx.Fail import com.airbnb.mvrx.FragmentViewModelContext @@ -26,7 +26,7 @@ import com.squareup.inject.assisted.AssistedInject import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.room.model.thirdparty.ThirdPartyProtocol -import im.vector.riotredesign.core.platform.VectorViewModel +import im.vector.riotx.core.platform.VectorViewModel class RoomDirectoryPickerViewModel @AssistedInject constructor(@Assisted initialState: RoomDirectoryPickerViewState, private val session: Session) : VectorViewModel(initialState) { diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt index 81b10812..be5c1378 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt +++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.roomdirectory.picker +package im.vector.riotx.features.roomdirectory.picker import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewActivity.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewActivity.kt similarity index 89% rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewActivity.kt rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewActivity.kt index 46044914..85da8f2d 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewActivity.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotredesign.features.roomdirectory.roompreview +package im.vector.riotx.features.roomdirectory.roompreview import android.content.Context import android.content.Intent import android.os.Parcelable import androidx.appcompat.widget.Toolbar import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoom -import im.vector.riotredesign.R -import im.vector.riotredesign.core.extensions.addFragment -import im.vector.riotredesign.core.platform.ToolbarConfigurable -import im.vector.riotredesign.core.platform.VectorBaseActivity +import im.vector.riotx.R +import im.vector.riotx.core.extensions.addFragment +import im.vector.riotx.core.platform.ToolbarConfigurable +import im.vector.riotx.core.platform.VectorBaseActivity import kotlinx.android.parcel.Parcelize @Parcelize diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt similarity index 88% rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt index 2fbd8a7c..c0da697a 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.roomdirectory.roompreview +package im.vector.riotx.features.roomdirectory.roompreview import android.os.Bundle import android.view.View @@ -23,14 +23,14 @@ import androidx.transition.TransitionManager import com.airbnb.mvrx.args import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.error.ErrorFormatter -import im.vector.riotredesign.core.extensions.setTextOrHide -import im.vector.riotredesign.core.platform.ButtonStateView -import im.vector.riotredesign.core.platform.VectorBaseFragment -import im.vector.riotredesign.features.home.AvatarRenderer -import im.vector.riotredesign.features.roomdirectory.JoinState +import im.vector.riotx.R +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.error.ErrorFormatter +import im.vector.riotx.core.extensions.setTextOrHide +import im.vector.riotx.core.platform.ButtonStateView +import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.riotx.features.home.AvatarRenderer +import im.vector.riotx.features.roomdirectory.JoinState import kotlinx.android.synthetic.main.fragment_room_preview_no_preview.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewViewModel.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewViewModel.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewViewModel.kt rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewViewModel.kt index 61102f11..bf5fa743 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.roomdirectory.roompreview +package im.vector.riotx.features.roomdirectory.roompreview import com.airbnb.mvrx.FragmentViewModelContext import com.airbnb.mvrx.MvRxViewModelFactory @@ -25,8 +25,8 @@ import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.room.model.Membership import im.vector.matrix.rx.rx -import im.vector.riotredesign.core.platform.VectorViewModel -import im.vector.riotredesign.features.roomdirectory.JoinState +import im.vector.riotx.core.platform.VectorViewModel +import im.vector.riotx.features.roomdirectory.JoinState import timber.log.Timber class RoomPreviewViewModel @AssistedInject constructor(@Assisted initialState: RoomPreviewViewState, diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewViewState.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewViewState.kt similarity index 88% rename from vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewViewState.kt rename to vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewViewState.kt index 4ba4bdee..81657c68 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/roompreview/RoomPreviewViewState.kt +++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewViewState.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotredesign.features.roomdirectory.roompreview +package im.vector.riotx.features.roomdirectory.roompreview import com.airbnb.mvrx.MvRxState -import im.vector.riotredesign.features.roomdirectory.JoinState +import im.vector.riotx.features.roomdirectory.JoinState data class RoomPreviewViewState( // The room id diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/FontScale.kt b/vector/src/main/java/im/vector/riotx/features/settings/FontScale.kt similarity index 98% rename from vector/src/main/java/im/vector/riotredesign/features/settings/FontScale.kt rename to vector/src/main/java/im/vector/riotx/features/settings/FontScale.kt index ad8a4506..52cd2c63 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/FontScale.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/FontScale.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotredesign.features.settings +package im.vector.riotx.features.settings import android.content.Context import android.content.res.Configuration import android.text.TextUtils import androidx.core.content.edit import androidx.preference.PreferenceManager -import im.vector.riotredesign.R +import im.vector.riotx.R /** * Object to manage the Font Scale choice of the user diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/PreferencesManager.java b/vector/src/main/java/im/vector/riotx/features/settings/PreferencesManager.java similarity index 99% rename from vector/src/main/java/im/vector/riotredesign/features/settings/PreferencesManager.java rename to vector/src/main/java/im/vector/riotx/features/settings/PreferencesManager.java index 89dc3bde..e24bc2fe 100755 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/PreferencesManager.java +++ b/vector/src/main/java/im/vector/riotx/features/settings/PreferencesManager.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.settings; +package im.vector.riotx.features.settings; import android.content.Context; import android.content.SharedPreferences; @@ -34,9 +34,9 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import im.vector.riotredesign.R; -import im.vector.riotredesign.features.homeserver.ServerUrlsRepository; -import im.vector.riotredesign.features.themes.ThemeUtils; +import im.vector.riotx.R; +import im.vector.riotx.features.homeserver.ServerUrlsRepository; +import im.vector.riotx.features.themes.ThemeUtils; import timber.log.Timber; public class PreferencesManager { diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorLocale.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorLocale.kt similarity index 98% rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorLocale.kt rename to vector/src/main/java/im/vector/riotx/features/settings/VectorLocale.kt index 0c88f508..a7ee3012 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorLocale.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorLocale.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.settings +package im.vector.riotx.features.settings import android.content.Context import android.content.res.Configuration @@ -23,7 +23,7 @@ import android.preference.PreferenceManager import android.text.TextUtils import android.util.Pair import androidx.core.content.edit -import im.vector.riotredesign.R +import im.vector.riotx.R import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import timber.log.Timber diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsActivity.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsActivity.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsActivity.kt rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsActivity.kt index 5207efd5..3e109a23 100755 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsActivity.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.settings +package im.vector.riotx.features.settings import android.content.Context import android.content.Intent @@ -22,9 +22,9 @@ import androidx.fragment.app.FragmentManager import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat import im.vector.matrix.android.api.session.Session -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.platform.VectorBaseActivity +import im.vector.riotx.R +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.platform.VectorBaseActivity import kotlinx.android.synthetic.main.activity_vector_settings.* import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt index 1392a3ba..906cf5ea 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt @@ -13,28 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.settings +package im.vector.riotx.features.settings import android.app.Activity import android.content.Intent import android.media.RingtoneManager import android.net.Uri -import android.os.Bundle import android.os.Parcelable -import android.view.View import androidx.core.content.edit import androidx.preference.Preference import androidx.preference.PreferenceManager -import im.vector.matrix.android.api.session.Session -import im.vector.riotredesign.R -import im.vector.riotredesign.core.extensions.withArgs -import im.vector.riotredesign.core.platform.VectorBaseActivity -import im.vector.riotredesign.core.platform.VectorPreferenceFragment -import im.vector.riotredesign.core.preference.BingRule -import im.vector.riotredesign.core.preference.BingRulePreference -import im.vector.riotredesign.features.notifications.NotificationUtils -import im.vector.riotredesign.features.notifications.supportNotificationChannels -import javax.inject.Inject +import im.vector.riotx.R +import im.vector.riotx.core.extensions.withArgs +import im.vector.riotx.core.preference.BingRule +import im.vector.riotx.core.preference.BingRulePreference +import im.vector.riotx.features.notifications.NotificationUtils +import im.vector.riotx.features.notifications.supportNotificationChannels class VectorSettingsAdvancedNotificationPreferenceFragment : VectorSettingsBaseFragment() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsBaseFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsBaseFragment.kt similarity index 92% rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsBaseFragment.kt rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsBaseFragment.kt index f5abb7ce..b78921b5 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsBaseFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsBaseFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.settings +package im.vector.riotx.features.settings import android.content.Context import android.os.Bundle @@ -23,12 +23,12 @@ import android.view.View import androidx.annotation.CallSuper import androidx.preference.PreferenceFragmentCompat import im.vector.matrix.android.api.session.Session -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.DaggerScreenComponent -import im.vector.riotredesign.core.di.HasScreenInjector -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.platform.VectorBaseActivity -import im.vector.riotredesign.core.utils.toast +import im.vector.riotx.R +import im.vector.riotx.core.di.DaggerScreenComponent +import im.vector.riotx.core.di.HasScreenInjector +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.platform.VectorBaseActivity +import im.vector.riotx.core.utils.toast import timber.log.Timber abstract class VectorSettingsBaseFragment : PreferenceFragmentCompat(), HasScreenInjector { diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsFlairFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsFlairFragment.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsFlairFragment.kt rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsFlairFragment.kt index abab4160..d2ea1970 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsFlairFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsFlairFragment.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package im.vector.riotredesign.features.settings +package im.vector.riotx.features.settings import androidx.preference.PreferenceCategory -import im.vector.riotredesign.R -import im.vector.riotredesign.core.preference.ProgressBarPreference +import im.vector.riotx.R +import im.vector.riotx.core.preference.ProgressBarPreference class VectorSettingsFlairFragment : VectorSettingsBaseFragment() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsFragmentInteractionListener.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsFragmentInteractionListener.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsFragmentInteractionListener.kt rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsFragmentInteractionListener.kt index f141f949..db96a4b6 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsFragmentInteractionListener.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsFragmentInteractionListener.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.settings +package im.vector.riotx.features.settings interface VectorSettingsFragmentInteractionListener { diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsGeneralFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt similarity index 98% rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsGeneralFragment.kt rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt index aa7ce304..0e1c448c 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsGeneralFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.settings +package im.vector.riotx.features.settings import android.app.Activity import android.content.Context @@ -35,18 +35,18 @@ import androidx.preference.PreferenceCategory import com.bumptech.glide.Glide 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.riotredesign.core.preference.UserAvatarPreference -import im.vector.riotredesign.core.preference.VectorPreference -import im.vector.riotredesign.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA -import im.vector.riotredesign.core.utils.allGranted -import im.vector.riotredesign.core.utils.copyToClipboard -import im.vector.riotredesign.core.utils.toast -import im.vector.riotredesign.features.MainActivity -import im.vector.riotredesign.features.themes.ThemeUtils -import im.vector.riotredesign.features.workers.signout.SignOutUiWorker +import im.vector.riotx.R +import im.vector.riotx.core.extensions.showPassword +import im.vector.riotx.core.platform.SimpleTextWatcher +import im.vector.riotx.core.preference.UserAvatarPreference +import im.vector.riotx.core.preference.VectorPreference +import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA +import im.vector.riotx.core.utils.allGranted +import im.vector.riotx.core.utils.copyToClipboard +import im.vector.riotx.core.utils.toast +import im.vector.riotx.features.MainActivity +import im.vector.riotx.features.themes.ThemeUtils +import im.vector.riotx.features.workers.signout.SignOutUiWorker import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsHelpAboutFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsHelpAboutFragment.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsHelpAboutFragment.kt rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsHelpAboutFragment.kt index f67f89bb..2be698a2 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsHelpAboutFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsHelpAboutFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.settings +package im.vector.riotx.features.settings import android.content.Intent import android.net.Uri @@ -22,10 +22,10 @@ import android.provider.Settings import androidx.preference.Preference import com.google.android.gms.oss.licenses.OssLicensesMenuActivity import im.vector.matrix.android.api.Matrix -import im.vector.riotredesign.R -import im.vector.riotredesign.core.utils.copyToClipboard -import im.vector.riotredesign.core.utils.displayInWebView -import im.vector.riotredesign.features.version.getVersion +import im.vector.riotx.R +import im.vector.riotx.core.utils.copyToClipboard +import im.vector.riotx.core.utils.displayInWebView +import im.vector.riotx.features.version.getVersion class VectorSettingsHelpAboutFragment : VectorSettingsBaseFragment() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsIgnoredUsersFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsIgnoredUsersFragment.kt similarity index 98% rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsIgnoredUsersFragment.kt rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsIgnoredUsersFragment.kt index 5fce7b63..3532a794 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsIgnoredUsersFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsIgnoredUsersFragment.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotredesign.features.settings +package im.vector.riotx.features.settings import androidx.appcompat.app.AlertDialog import androidx.preference.Preference import androidx.preference.PreferenceCategory -import im.vector.riotredesign.R +import im.vector.riotx.R import java.util.ArrayList import kotlin.Comparator import kotlin.String diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsLabsFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsLabsFragment.kt similarity index 98% rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsLabsFragment.kt rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsLabsFragment.kt index f9bd57fb..bb5ad0ee 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsLabsFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsLabsFragment.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotredesign.features.settings +package im.vector.riotx.features.settings -import im.vector.riotredesign.R +import im.vector.riotx.R class VectorSettingsLabsFragment : VectorSettingsBaseFragment() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsNotificationFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationFragment.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsNotificationFragment.kt rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationFragment.kt index ead9f9e3..95312461 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsNotificationFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationFragment.kt @@ -14,18 +14,18 @@ * limitations under the License. */ -package im.vector.riotredesign.features.settings +package im.vector.riotx.features.settings import android.widget.Toast import androidx.preference.Preference import androidx.preference.SwitchPreference import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.pushrules.RuleIds -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ActiveSessionHolder -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.pushers.PushersManager -import im.vector.riotredesign.push.fcm.FcmHelper +import im.vector.riotx.R +import im.vector.riotx.core.di.ActiveSessionHolder +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.pushers.PushersManager +import im.vector.riotx.push.fcm.FcmHelper import javax.inject.Inject // Referenced in vector_settings_preferences_root.xml diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt similarity index 91% rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt index 0db2bfd6..428a52c7 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.settings +package im.vector.riotx.features.settings import android.app.Activity import android.content.Context @@ -29,15 +29,15 @@ import androidx.recyclerview.widget.RecyclerView import androidx.transition.TransitionManager import butterknife.BindView import im.vector.matrix.android.api.session.Session -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.core.extensions.withArgs -import im.vector.riotredesign.core.platform.VectorBaseActivity -import im.vector.riotredesign.core.platform.VectorBaseFragment -import im.vector.riotredesign.features.rageshake.BugReporter -import im.vector.riotredesign.features.settings.troubleshoot.NotificationTroubleshootTestManager -import im.vector.riotredesign.features.settings.troubleshoot.TroubleshootTest -import im.vector.riotredesign.push.fcm.NotificationTroubleshootTestManagerFactory +import im.vector.riotx.R +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.core.extensions.withArgs +import im.vector.riotx.core.platform.VectorBaseActivity +import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.riotx.features.rageshake.BugReporter +import im.vector.riotx.features.settings.troubleshoot.NotificationTroubleshootTestManager +import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest +import im.vector.riotx.push.fcm.NotificationTroubleshootTestManagerFactory import javax.inject.Inject class VectorSettingsNotificationsTroubleshootFragment : VectorBaseFragment() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsPreferencesFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsPreferencesFragment.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsPreferencesFragment.kt rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsPreferencesFragment.kt index 0a82ef9f..962be362 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsPreferencesFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsPreferencesFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.settings +package im.vector.riotx.features.settings import android.app.Activity import android.content.Context @@ -25,10 +25,10 @@ import android.widget.LinearLayout import androidx.appcompat.app.AlertDialog import androidx.preference.Preference import androidx.preference.SwitchPreference -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ScreenComponent -import im.vector.riotredesign.features.configuration.VectorConfiguration -import im.vector.riotredesign.features.themes.ThemeUtils +import im.vector.riotx.R +import im.vector.riotx.core.di.ScreenComponent +import im.vector.riotx.features.configuration.VectorConfiguration +import im.vector.riotx.features.themes.ThemeUtils import javax.inject.Inject class VectorSettingsPreferencesFragment : VectorSettingsBaseFragment() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsRootFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsRootFragment.kt similarity index 88% rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsRootFragment.kt rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsRootFragment.kt index 842f161f..ed823825 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsRootFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsRootFragment.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotredesign.features.settings +package im.vector.riotx.features.settings -import im.vector.riotredesign.R -import im.vector.riotredesign.core.extensions.withArgs +import im.vector.riotx.R +import im.vector.riotx.core.extensions.withArgs class VectorSettingsRootFragment : VectorSettingsBaseFragment() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsSecurityPrivacyFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt similarity index 97% rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsSecurityPrivacyFragment.kt rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt index 39895235..474777cb 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsSecurityPrivacyFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.settings +package im.vector.riotx.features.settings import android.annotation.SuppressLint import android.app.Activity @@ -41,18 +41,18 @@ import im.vector.matrix.android.internal.auth.data.LoginFlowTypes import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo import im.vector.matrix.android.internal.crypto.model.rest.DevicesListResponse -import im.vector.riotredesign.R -import im.vector.riotredesign.core.dialogs.ExportKeysDialog -import im.vector.riotredesign.core.intent.ExternalIntentData -import im.vector.riotredesign.core.intent.analyseIntent -import im.vector.riotredesign.core.intent.getFilenameFromUri -import im.vector.riotredesign.core.platform.SimpleTextWatcher -import im.vector.riotredesign.core.preference.ProgressBarPreference -import im.vector.riotredesign.core.preference.VectorPreference -import im.vector.riotredesign.core.utils.* -import im.vector.riotredesign.features.crypto.keys.KeysExporter -import im.vector.riotredesign.features.crypto.keys.KeysImporter -import im.vector.riotredesign.features.crypto.keysbackup.settings.KeysBackupManageActivity +import im.vector.riotx.R +import im.vector.riotx.core.dialogs.ExportKeysDialog +import im.vector.riotx.core.intent.ExternalIntentData +import im.vector.riotx.core.intent.analyseIntent +import im.vector.riotx.core.intent.getFilenameFromUri +import im.vector.riotx.core.platform.SimpleTextWatcher +import im.vector.riotx.core.preference.ProgressBarPreference +import im.vector.riotx.core.preference.VectorPreference +import im.vector.riotx.core.utils.* +import im.vector.riotx.features.crypto.keys.KeysExporter +import im.vector.riotx.features.crypto.keys.KeysImporter +import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupManageActivity import timber.log.Timber import java.text.DateFormat import java.text.SimpleDateFormat diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsUrls.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsUrls.kt similarity index 94% rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsUrls.kt rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsUrls.kt index 23babd4b..43fcd983 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsUrls.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsUrls.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.settings +package im.vector.riotx.features.settings object VectorSettingsUrls { diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsVoiceVideoFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsVoiceVideoFragment.kt similarity index 91% rename from vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsVoiceVideoFragment.kt rename to vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsVoiceVideoFragment.kt index 04c9393d..6e62efa7 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsVoiceVideoFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsVoiceVideoFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.settings +package im.vector.riotx.features.settings import android.app.Activity import android.content.Intent @@ -22,11 +22,11 @@ import android.media.RingtoneManager import android.net.Uri import androidx.preference.Preference import androidx.preference.SwitchPreference -import im.vector.riotredesign.R -import im.vector.riotredesign.core.utils.getCallRingtoneName -import im.vector.riotredesign.core.utils.getCallRingtoneUri -import im.vector.riotredesign.core.utils.setCallRingtoneUri -import im.vector.riotredesign.core.utils.setUseRiotDefaultRingtone +import im.vector.riotx.R +import im.vector.riotx.core.utils.getCallRingtoneName +import im.vector.riotx.core.utils.getCallRingtoneUri +import im.vector.riotx.core.utils.setCallRingtoneUri +import im.vector.riotx.core.utils.setUseRiotDefaultRingtone class VectorSettingsVoiceVideoFragment : VectorSettingsBaseFragment() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/push/PushGatewayItem.kt b/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewayItem.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/features/settings/push/PushGatewayItem.kt rename to vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewayItem.kt index 4e3e1166..e2777fed 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/push/PushGatewayItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewayItem.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotredesign.features.settings.push +package im.vector.riotx.features.settings.push import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelWithHolder import im.vector.matrix.android.api.session.pushers.Pusher -import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder +import im.vector.riotx.R +import im.vector.riotx.core.epoxy.VectorEpoxyHolder @EpoxyModelClass(layout = R.layout.item_pushgateway) diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/push/PushGatewaysFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewaysFragment.kt similarity index 90% rename from vector/src/main/java/im/vector/riotredesign/features/settings/push/PushGatewaysFragment.kt rename to vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewaysFragment.kt index b51c131c..275e66a6 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/push/PushGatewaysFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewaysFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.settings.push +package im.vector.riotx.features.settings.push import android.os.Bundle import androidx.recyclerview.widget.DividerItemDecoration @@ -23,11 +23,11 @@ import androidx.recyclerview.widget.RecyclerView import com.airbnb.epoxy.TypedEpoxyController import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotredesign.R -import im.vector.riotredesign.core.platform.VectorBaseActivity -import im.vector.riotredesign.core.platform.VectorBaseFragment -import im.vector.riotredesign.core.resources.StringProvider -import im.vector.riotredesign.core.ui.list.genericFooterItem +import im.vector.riotx.R +import im.vector.riotx.core.platform.VectorBaseActivity +import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.riotx.core.resources.StringProvider +import im.vector.riotx.core.ui.list.genericFooterItem import kotlinx.android.synthetic.main.fragment_generic_recycler_epoxy.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/push/PushGatewaysViewModel.kt b/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewaysViewModel.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/features/settings/push/PushGatewaysViewModel.kt rename to vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewaysViewModel.kt index 70bbd17a..7d05c6a7 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/push/PushGatewaysViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewaysViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.settings.push +package im.vector.riotx.features.settings.push import com.airbnb.mvrx.Async import com.airbnb.mvrx.FragmentViewModelContext @@ -27,7 +27,7 @@ import com.squareup.inject.assisted.AssistedInject import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.pushers.Pusher import im.vector.matrix.rx.RxSession -import im.vector.riotredesign.core.platform.VectorViewModel +import im.vector.riotx.core.platform.VectorViewModel data class PushGatewayViewState( diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/push/PushRuleItem.kt b/vector/src/main/java/im/vector/riotx/features/settings/push/PushRuleItem.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/features/settings/push/PushRuleItem.kt rename to vector/src/main/java/im/vector/riotx/features/settings/push/PushRuleItem.kt index 5af89c00..47c9a06a 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/push/PushRuleItem.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/push/PushRuleItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.settings.push +package im.vector.riotx.features.settings.push import android.annotation.SuppressLint import android.graphics.Color @@ -28,9 +28,9 @@ import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelWithHolder import im.vector.matrix.android.api.pushrules.Action import im.vector.matrix.android.api.pushrules.rest.PushRule -import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder -import im.vector.riotredesign.features.notifications.NotificationAction +import im.vector.riotx.R +import im.vector.riotx.core.epoxy.VectorEpoxyHolder +import im.vector.riotx.features.notifications.NotificationAction @EpoxyModelClass(layout = R.layout.item_pushrule_raw) diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/push/PushRulesFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/push/PushRulesFragment.kt similarity index 89% rename from vector/src/main/java/im/vector/riotredesign/features/settings/push/PushRulesFragment.kt rename to vector/src/main/java/im/vector/riotx/features/settings/push/PushRulesFragment.kt index 3d5881db..23018dc7 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/push/PushRulesFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/push/PushRulesFragment.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.settings.push +package im.vector.riotx.features.settings.push import android.os.Bundle import androidx.recyclerview.widget.DividerItemDecoration @@ -22,11 +22,11 @@ import androidx.recyclerview.widget.RecyclerView import com.airbnb.epoxy.TypedEpoxyController import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotredesign.R -import im.vector.riotredesign.core.platform.VectorBaseActivity -import im.vector.riotredesign.core.platform.VectorBaseFragment -import im.vector.riotredesign.core.resources.StringProvider -import im.vector.riotredesign.core.ui.list.genericFooterItem +import im.vector.riotx.R +import im.vector.riotx.core.platform.VectorBaseActivity +import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.riotx.core.resources.StringProvider +import im.vector.riotx.core.ui.list.genericFooterItem import kotlinx.android.synthetic.main.fragment_generic_recycler_epoxy.* // Referenced in vector_settings_notifications.xml diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/push/PushRulesViewModel.kt b/vector/src/main/java/im/vector/riotx/features/settings/push/PushRulesViewModel.kt similarity index 88% rename from vector/src/main/java/im/vector/riotredesign/features/settings/push/PushRulesViewModel.kt rename to vector/src/main/java/im/vector/riotx/features/settings/push/PushRulesViewModel.kt index 24294353..9de839b3 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/push/PushRulesViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/push/PushRulesViewModel.kt @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.settings.push +package im.vector.riotx.features.settings.push import com.airbnb.mvrx.MvRxState import com.airbnb.mvrx.MvRxViewModelFactory import com.airbnb.mvrx.ViewModelContext import im.vector.matrix.android.api.pushrules.rest.PushRule -import im.vector.riotredesign.core.di.HasScreenInjector -import im.vector.riotredesign.core.platform.VectorViewModel +import im.vector.riotx.core.di.HasScreenInjector +import im.vector.riotx.core.platform.VectorViewModel data class PushRulesViewState( val rules: List = emptyList() diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt similarity index 96% rename from vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt rename to vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt index 779ab8fc..c3b53de0 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.settings.troubleshoot +package im.vector.riotx.features.settings.troubleshoot import android.os.Build import android.view.LayoutInflater @@ -27,8 +27,8 @@ import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import butterknife.BindView import butterknife.ButterKnife -import im.vector.riotredesign.R -import im.vector.riotredesign.features.themes.ThemeUtils +import im.vector.riotx.R +import im.vector.riotx.features.themes.ThemeUtils class NotificationTroubleshootRecyclerViewAdapter(val tests: ArrayList) : RecyclerView.Adapter() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt similarity index 98% rename from vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt rename to vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt index 0cc89417..09f8c060 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.settings.troubleshoot +package im.vector.riotx.features.settings.troubleshoot import android.os.Handler import android.os.Looper diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestAccountSettings.kt b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestAccountSettings.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestAccountSettings.kt rename to vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestAccountSettings.kt index efb91607..47d1f635 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestAccountSettings.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestAccountSettings.kt @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.settings.troubleshoot +package im.vector.riotx.features.settings.troubleshoot import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.pushrules.RuleIds -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ActiveSessionHolder -import im.vector.riotredesign.core.resources.StringProvider +import im.vector.riotx.R +import im.vector.riotx.core.di.ActiveSessionHolder +import im.vector.riotx.core.resources.StringProvider import javax.inject.Inject /** diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestBingRulesSettings.kt b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestBingRulesSettings.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestBingRulesSettings.kt rename to vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestBingRulesSettings.kt index 41ff19f5..e820bc5e 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestBingRulesSettings.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestBingRulesSettings.kt @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.settings.troubleshoot +package im.vector.riotx.features.settings.troubleshoot import im.vector.matrix.android.api.pushrules.Action import im.vector.matrix.android.api.pushrules.RuleIds -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ActiveSessionHolder -import im.vector.riotredesign.core.resources.StringProvider -import im.vector.riotredesign.features.notifications.NotificationAction +import im.vector.riotx.R +import im.vector.riotx.core.di.ActiveSessionHolder +import im.vector.riotx.core.resources.StringProvider +import im.vector.riotx.features.notifications.NotificationAction import javax.inject.Inject class TestBingRulesSettings @Inject constructor(private val activeSessionHolder: ActiveSessionHolder, diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestDeviceSettings.kt b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestDeviceSettings.kt similarity index 89% rename from vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestDeviceSettings.kt rename to vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestDeviceSettings.kt index dd783f62..b6e2d3d7 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestDeviceSettings.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestDeviceSettings.kt @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.settings.troubleshoot +package im.vector.riotx.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.riotx.R +import im.vector.riotx.core.resources.StringProvider +import im.vector.riotx.features.settings.PreferencesManager import javax.inject.Inject /** diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestSystemSettings.kt b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestSystemSettings.kt similarity index 89% rename from vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestSystemSettings.kt rename to vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestSystemSettings.kt index 9d336f9d..653f3330 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TestSystemSettings.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestSystemSettings.kt @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.settings.troubleshoot +package im.vector.riotx.features.settings.troubleshoot import androidx.appcompat.app.AppCompatActivity import androidx.core.app.NotificationManagerCompat -import im.vector.riotredesign.R -import im.vector.riotredesign.core.resources.StringProvider -import im.vector.riotredesign.core.utils.startNotificationSettingsIntent +import im.vector.riotx.R +import im.vector.riotx.core.resources.StringProvider +import im.vector.riotx.core.utils.startNotificationSettingsIntent import javax.inject.Inject /** diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TroubleshootTest.kt b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TroubleshootTest.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TroubleshootTest.kt rename to vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TroubleshootTest.kt index b9f6281e..950382c1 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/troubleshoot/TroubleshootTest.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TroubleshootTest.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotredesign.features.settings.troubleshoot +package im.vector.riotx.features.settings.troubleshoot import androidx.annotation.StringRes import kotlin.properties.Delegates diff --git a/vector/src/main/java/im/vector/riotredesign/features/themes/ActivityOtherThemes.kt b/vector/src/main/java/im/vector/riotx/features/themes/ActivityOtherThemes.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/features/themes/ActivityOtherThemes.kt rename to vector/src/main/java/im/vector/riotx/features/themes/ActivityOtherThemes.kt index 159a4801..3cfba65a 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/themes/ActivityOtherThemes.kt +++ b/vector/src/main/java/im/vector/riotx/features/themes/ActivityOtherThemes.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotredesign.features.themes +package im.vector.riotx.features.themes import androidx.annotation.StyleRes -import im.vector.riotredesign.R +import im.vector.riotx.R /** * Class to manage Activity other possible themes. diff --git a/vector/src/main/java/im/vector/riotredesign/features/themes/ThemeUtils.kt b/vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt similarity index 99% rename from vector/src/main/java/im/vector/riotredesign/features/themes/ThemeUtils.kt rename to vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt index 26a265df..a3e33271 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/themes/ThemeUtils.kt +++ b/vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.themes +package im.vector.riotx.features.themes import android.app.Activity @@ -27,7 +27,7 @@ import androidx.annotation.ColorInt import androidx.core.content.ContextCompat import androidx.core.graphics.drawable.DrawableCompat import androidx.preference.PreferenceManager -import im.vector.riotredesign.R +import im.vector.riotx.R import timber.log.Timber import java.util.* diff --git a/vector/src/main/java/im/vector/riotredesign/features/version/Version.kt b/vector/src/main/java/im/vector/riotx/features/version/Version.kt similarity index 93% rename from vector/src/main/java/im/vector/riotredesign/features/version/Version.kt rename to vector/src/main/java/im/vector/riotx/features/version/Version.kt index 826fe156..c058dc26 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/version/Version.kt +++ b/vector/src/main/java/im/vector/riotx/features/version/Version.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotredesign.features.version +package im.vector.riotx.features.version -import im.vector.riotredesign.BuildConfig +import im.vector.riotx.BuildConfig fun getVersion(longFormat: Boolean, useBuildNumber: Boolean): String { var result = BuildConfig.VERSION_NAME diff --git a/vector/src/main/java/im/vector/riotredesign/features/workers/signout/SignOutBottomSheetDialogFragment.kt b/vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutBottomSheetDialogFragment.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/features/workers/signout/SignOutBottomSheetDialogFragment.kt rename to vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutBottomSheetDialogFragment.kt index d9c6d7f9..c06a40e8 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/workers/signout/SignOutBottomSheetDialogFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutBottomSheetDialogFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.workers.signout +package im.vector.riotx.features.workers.signout import android.app.Activity import android.app.Dialog @@ -41,12 +41,12 @@ import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.bottomsheet.BottomSheetDialogFragment import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.DaggerScreenComponent -import im.vector.riotredesign.core.platform.VectorBaseActivity -import im.vector.riotredesign.core.utils.toast -import im.vector.riotredesign.features.crypto.keysbackup.settings.KeysBackupManageActivity -import im.vector.riotredesign.features.crypto.keysbackup.setup.KeysBackupSetupActivity +import im.vector.riotx.R +import im.vector.riotx.core.di.DaggerScreenComponent +import im.vector.riotx.core.platform.VectorBaseActivity +import im.vector.riotx.core.utils.toast +import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupManageActivity +import im.vector.riotx.features.crypto.keysbackup.setup.KeysBackupSetupActivity class SignOutBottomSheetDialogFragment : BottomSheetDialogFragment() { diff --git a/vector/src/main/java/im/vector/riotredesign/features/workers/signout/SignOutUiWorker.kt b/vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutUiWorker.kt similarity index 86% rename from vector/src/main/java/im/vector/riotredesign/features/workers/signout/SignOutUiWorker.kt rename to vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutUiWorker.kt index 7de9fd95..8bc8973b 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/workers/signout/SignOutUiWorker.kt +++ b/vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutUiWorker.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package im.vector.riotredesign.features.workers.signout +package im.vector.riotx.features.workers.signout import android.content.Context import androidx.appcompat.app.AlertDialog import androidx.fragment.app.FragmentActivity -import im.vector.riotredesign.R -import im.vector.riotredesign.core.di.ActiveSessionHolder -import im.vector.riotredesign.core.extensions.vectorComponent -import im.vector.riotredesign.features.MainActivity -import im.vector.riotredesign.features.notifications.NotificationDrawerManager +import im.vector.riotx.R +import im.vector.riotx.core.di.ActiveSessionHolder +import im.vector.riotx.core.extensions.vectorComponent +import im.vector.riotx.features.MainActivity +import im.vector.riotx.features.notifications.NotificationDrawerManager class SignOutUiWorker(private val activity: FragmentActivity) { diff --git a/vector/src/main/java/im/vector/riotredesign/features/workers/signout/SignOutViewModel.kt b/vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutViewModel.kt similarity index 98% rename from vector/src/main/java/im/vector/riotredesign/features/workers/signout/SignOutViewModel.kt rename to vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutViewModel.kt index bc975743..b48040a0 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/workers/signout/SignOutViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.features.workers.signout +package im.vector.riotx.features.workers.signout import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel 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 475ff54c..ccaf1497 100644 --- a/vector/src/main/res/layout/activity_emoji_reaction_picker.xml +++ b/vector/src/main/res/layout/activity_emoji_reaction_picker.xml @@ -4,11 +4,11 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="im.vector.riotredesign.features.reactions.EmojiReactionPickerActivity"> + tools:context="im.vector.riotx.features.reactions.EmojiReactionPickerActivity"> - - + diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml index 4729b15b..cc80bd3a 100644 --- a/vector/src/main/res/layout/fragment_home_detail.xml +++ b/vector/src/main/res/layout/fragment_home_detail.xml @@ -57,7 +57,7 @@ app:layout_constraintTop_toBottomOf="@id/groupToolbar" tools:visibility="visible" /> - - - - - - - + diff --git a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml index 6a988346..d6a154da 100644 --- a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml +++ b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml @@ -118,7 +118,7 @@ tools:text="Error" tools:visibility="visible" /> - - - - \ No newline at end of file + \ No newline at end of file diff --git a/vector/src/main/res/layout/item_public_room.xml b/vector/src/main/res/layout/item_public_room.xml index 5c28baad..c605a2fe 100644 --- a/vector/src/main/res/layout/item_public_room.xml +++ b/vector/src/main/res/layout/item_public_room.xml @@ -102,7 +102,7 @@ app:layout_constraintStart_toEndOf="@+id/itemPublicRoomMembersCount" tools:text="@sample/matrix.json/data/roomAlias" /> - - - - - - - - - - - - - - - - - - - diff --git a/vector/src/main/res/xml/vector_settings_general.xml b/vector/src/main/res/xml/vector_settings_general.xml index 8bc15fef..b289a9b2 100644 --- a/vector/src/main/res/xml/vector_settings_general.xml +++ b/vector/src/main/res/xml/vector_settings_general.xml @@ -4,20 +4,20 @@ xmlns:tools="http://schemas.android.com/tools"> - - - - @@ -25,7 +25,7 @@ - - - + - + - - - - + - + - + - - - - - - + - + - - - + - - - + \ No newline at end of file diff --git a/vector/src/main/res/xml/vector_settings_help_about.xml b/vector/src/main/res/xml/vector_settings_help_about.xml index 6774f934..49c96a36 100644 --- a/vector/src/main/res/xml/vector_settings_help_about.xml +++ b/vector/src/main/res/xml/vector_settings_help_about.xml @@ -2,50 +2,50 @@ - - - - - - - - - - - + \ No newline at end of file diff --git a/vector/src/main/res/xml/vector_settings_ignored_users.xml b/vector/src/main/res/xml/vector_settings_ignored_users.xml index 15223b63..4ad8aed5 100644 --- a/vector/src/main/res/xml/vector_settings_ignored_users.xml +++ b/vector/src/main/res/xml/vector_settings_ignored_users.xml @@ -3,11 +3,11 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"> - - + \ No newline at end of file diff --git a/vector/src/main/res/xml/vector_settings_labs.xml b/vector/src/main/res/xml/vector_settings_labs.xml index 6c1315dc..66eb3f39 100644 --- a/vector/src/main/res/xml/vector_settings_labs.xml +++ b/vector/src/main/res/xml/vector_settings_labs.xml @@ -3,44 +3,44 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"> - + - - + - + - + - + - + - - + \ No newline at end of file diff --git a/vector/src/main/res/xml/vector_settings_notification_advanced_preferences.xml b/vector/src/main/res/xml/vector_settings_notification_advanced_preferences.xml index bb5de919..32b6a2b4 100644 --- a/vector/src/main/res/xml/vector_settings_notification_advanced_preferences.xml +++ b/vector/src/main/res/xml/vector_settings_notification_advanced_preferences.xml @@ -1,63 +1,63 @@ - - - - - - - - - + - + - - - - - - - - + - - + app:fragment="im.vector.riotx.features.settings.VectorSettingsNotificationsTroubleshootFragment" /> - + - + - + - + app:fragment="im.vector.riotx.features.settings.push.PushGatewaysFragment" /> - + app:fragment="im.vector.riotx.features.settings.push.PushRulesFragment" /> - + \ No newline at end of file diff --git a/vector/src/main/res/xml/vector_settings_preferences.xml b/vector/src/main/res/xml/vector_settings_preferences.xml index a8e4b08f..11209b53 100644 --- a/vector/src/main/res/xml/vector_settings_preferences.xml +++ b/vector/src/main/res/xml/vector_settings_preferences.xml @@ -3,16 +3,16 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> - - - - - - - - - - - - - - - - + - + - - - - + - + - + - - - - - - - + \ No newline at end of file diff --git a/vector/src/main/res/xml/vector_settings_root.xml b/vector/src/main/res/xml/vector_settings_root.xml index 2baad761..e0cb4f77 100644 --- a/vector/src/main/res/xml/vector_settings_root.xml +++ b/vector/src/main/res/xml/vector_settings_root.xml @@ -2,62 +2,62 @@ - + app:fragment="im.vector.riotx.features.settings.VectorSettingsGeneralFragment" /> - + app:fragment="im.vector.riotx.features.settings.VectorSettingsFlairFragment" /> - + app:fragment="im.vector.riotx.features.settings.VectorSettingsNotificationPreferenceFragment" /> - + app:fragment="im.vector.riotx.features.settings.VectorSettingsPreferencesFragment" /> - + app:fragment="im.vector.riotx.features.settings.VectorSettingsVoiceVideoFragment" /> - + app:fragment="im.vector.riotx.features.settings.VectorSettingsIgnoredUsersFragment" /> - + app:fragment="im.vector.riotx.features.settings.VectorSettingsSecurityPrivacyFragment" /> - + app:fragment="im.vector.riotx.features.settings.VectorSettingsLabsFragment" /> - + app:fragment="im.vector.riotx.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 7398a0a8..9e88da34 100644 --- a/vector/src/main/res/xml/vector_settings_security_privacy.xml +++ b/vector/src/main/res/xml/vector_settings_security_privacy.xml @@ -2,74 +2,74 @@ - - - - - - + - + - - - - - + - + - - + - - - - + \ No newline at end of file diff --git a/vector/src/main/res/xml/vector_settings_voice_video.xml b/vector/src/main/res/xml/vector_settings_voice_video.xml index f7a80481..787935b8 100644 --- a/vector/src/main/res/xml/vector_settings_voice_video.xml +++ b/vector/src/main/res/xml/vector_settings_voice_video.xml @@ -3,19 +3,19 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"> - + - - - + \ No newline at end of file diff --git a/vector/src/release/java/im/vector/riotredesign/features/debug/DebugMenuActivity.kt b/vector/src/release/java/im/vector/riotx/features/debug/DebugMenuActivity.kt similarity index 94% rename from vector/src/release/java/im/vector/riotredesign/features/debug/DebugMenuActivity.kt rename to vector/src/release/java/im/vector/riotx/features/debug/DebugMenuActivity.kt index 8529df79..bd97cad9 100644 --- a/vector/src/release/java/im/vector/riotredesign/features/debug/DebugMenuActivity.kt +++ b/vector/src/release/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 androidx.appcompat.app.AppCompatActivity diff --git a/vector/src/release/java/im/vector/riotredesign/receivers/DebugReceiver.kt b/vector/src/release/java/im/vector/riotx/receivers/DebugReceiver.kt similarity index 96% rename from vector/src/release/java/im/vector/riotredesign/receivers/DebugReceiver.kt rename to vector/src/release/java/im/vector/riotx/receivers/DebugReceiver.kt index ccb28213..89149817 100644 --- a/vector/src/release/java/im/vector/riotredesign/receivers/DebugReceiver.kt +++ b/vector/src/release/java/im/vector/riotx/receivers/DebugReceiver.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign.receivers +package im.vector.riotx.receivers import android.content.BroadcastReceiver import android.content.Context diff --git a/vector/src/test/java/im/vector/riotredesign/ExampleUnitTest.kt b/vector/src/test/java/im/vector/riotx/ExampleUnitTest.kt similarity index 96% rename from vector/src/test/java/im/vector/riotredesign/ExampleUnitTest.kt rename to vector/src/test/java/im/vector/riotx/ExampleUnitTest.kt index bd93628e..c51f642a 100644 --- a/vector/src/test/java/im/vector/riotredesign/ExampleUnitTest.kt +++ b/vector/src/test/java/im/vector/riotx/ExampleUnitTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotredesign +package im.vector.riotx import org.junit.Test