From d28c091f0a5e8cb2604617034dc6364ec3e54cac Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 3 Aug 2020 17:58:35 +0200 Subject: [PATCH 1/6] Rename package `im.vector.riotx.attachmentviewer` to `im.vector.lib.attachmentviewer` --- CHANGES.md | 1 + attachment-viewer/src/main/AndroidManifest.xml | 2 +- .../attachmentviewer/AnimatedImageViewHolder.kt | 2 +- .../{riotx => lib}/attachmentviewer/AttachmentEvents.kt | 2 +- .../attachmentviewer/AttachmentSourceProvider.kt | 2 +- .../attachmentviewer/AttachmentViewerActivity.kt | 2 +- .../{riotx => lib}/attachmentviewer/AttachmentsAdapter.kt | 2 +- .../{riotx => lib}/attachmentviewer/BaseViewHolder.kt | 2 +- .../{riotx => lib}/attachmentviewer/ImageLoaderTarget.kt | 2 +- .../{riotx => lib}/attachmentviewer/SwipeDirection.kt | 2 +- .../attachmentviewer/SwipeDirectionDetector.kt | 3 +-- .../attachmentviewer/SwipeToDismissHandler.kt | 2 +- .../{riotx => lib}/attachmentviewer/VideoLoaderTarget.kt | 2 +- .../{riotx => lib}/attachmentviewer/VideoViewHolder.kt | 2 +- .../attachmentviewer/ZoomableImageViewHolder.kt | 2 +- .../vector/riotx/features/media/AttachmentOverlayView.kt | 4 ++-- .../vector/riotx/features/media/BaseAttachmentProvider.kt | 8 ++++---- .../riotx/features/media/DataAttachmentRoomProvider.kt | 2 +- .../riotx/features/media/RoomEventsAttachmentProvider.kt | 4 ++-- .../features/media/VectorAttachmentViewerActivity.kt | 4 ++-- 20 files changed, 26 insertions(+), 26 deletions(-) rename attachment-viewer/src/main/java/im/vector/{riotx => lib}/attachmentviewer/AnimatedImageViewHolder.kt (96%) rename attachment-viewer/src/main/java/im/vector/{riotx => lib}/attachmentviewer/AttachmentEvents.kt (96%) rename attachment-viewer/src/main/java/im/vector/{riotx => lib}/attachmentviewer/AttachmentSourceProvider.kt (97%) rename attachment-viewer/src/main/java/im/vector/{riotx => lib}/attachmentviewer/AttachmentViewerActivity.kt (99%) rename attachment-viewer/src/main/java/im/vector/{riotx => lib}/attachmentviewer/AttachmentsAdapter.kt (99%) rename attachment-viewer/src/main/java/im/vector/{riotx => lib}/attachmentviewer/BaseViewHolder.kt (97%) rename attachment-viewer/src/main/java/im/vector/{riotx => lib}/attachmentviewer/ImageLoaderTarget.kt (98%) rename attachment-viewer/src/main/java/im/vector/{riotx => lib}/attachmentviewer/SwipeDirection.kt (96%) rename attachment-viewer/src/main/java/im/vector/{riotx => lib}/attachmentviewer/SwipeDirectionDetector.kt (97%) rename attachment-viewer/src/main/java/im/vector/{riotx => lib}/attachmentviewer/SwipeToDismissHandler.kt (99%) rename attachment-viewer/src/main/java/im/vector/{riotx => lib}/attachmentviewer/VideoLoaderTarget.kt (98%) rename attachment-viewer/src/main/java/im/vector/{riotx => lib}/attachmentviewer/VideoViewHolder.kt (99%) rename attachment-viewer/src/main/java/im/vector/{riotx => lib}/attachmentviewer/ZoomableImageViewHolder.kt (97%) diff --git a/CHANGES.md b/CHANGES.md index 88b276922b..a1eeb4904a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -21,6 +21,7 @@ Build 🧱: Other changes: - Hide Flair settings, this is not implemented yet. + - Rename package `im.vector.riotx.attachmentviewer` to `im.vector.lib.attachmentviewer` Changes in Element 1.0.4 (2020-08-03) =================================================== diff --git a/attachment-viewer/src/main/AndroidManifest.xml b/attachment-viewer/src/main/AndroidManifest.xml index ff8ec394d2..8970b47178 100644 --- a/attachment-viewer/src/main/AndroidManifest.xml +++ b/attachment-viewer/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ - + diff --git a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AnimatedImageViewHolder.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt similarity index 96% rename from attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AnimatedImageViewHolder.kt rename to attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt index f00a4eff30..6b7818c612 100644 --- a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AnimatedImageViewHolder.kt +++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.attachmentviewer +package im.vector.lib.attachmentviewer import android.view.View import android.widget.ImageView diff --git a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AttachmentEvents.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentEvents.kt similarity index 96% rename from attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AttachmentEvents.kt rename to attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentEvents.kt index b2b6c9fe16..eb2249e033 100644 --- a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AttachmentEvents.kt +++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentEvents.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.attachmentviewer +package im.vector.lib.attachmentviewer sealed class AttachmentEvents { data class VideoEvent(val isPlaying: Boolean, val progress: Int, val duration: Int) : AttachmentEvents() diff --git a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AttachmentSourceProvider.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentSourceProvider.kt similarity index 97% rename from attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AttachmentSourceProvider.kt rename to attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentSourceProvider.kt index 92a4f1d9e4..b5de38fed3 100644 --- a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AttachmentSourceProvider.kt +++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentSourceProvider.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.attachmentviewer +package im.vector.lib.attachmentviewer import android.content.Context import android.view.View diff --git a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AttachmentViewerActivity.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt similarity index 99% rename from attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AttachmentViewerActivity.kt rename to attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt index 8c2d4e9833..71ce436cf2 100644 --- a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AttachmentViewerActivity.kt +++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package im.vector.riotx.attachmentviewer +package im.vector.lib.attachmentviewer import android.graphics.Color import android.os.Bundle diff --git a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AttachmentsAdapter.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt similarity index 99% rename from attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AttachmentsAdapter.kt rename to attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt index 27bdfdc91d..99c7777220 100644 --- a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/AttachmentsAdapter.kt +++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.attachmentviewer +package im.vector.lib.attachmentviewer import android.view.LayoutInflater import android.view.ViewGroup diff --git a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/BaseViewHolder.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/BaseViewHolder.kt similarity index 97% rename from attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/BaseViewHolder.kt rename to attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/BaseViewHolder.kt index 49b47c11ff..86f1945e53 100644 --- a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/BaseViewHolder.kt +++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/BaseViewHolder.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.attachmentviewer +package im.vector.lib.attachmentviewer import android.view.View import androidx.recyclerview.widget.RecyclerView diff --git a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/ImageLoaderTarget.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt similarity index 98% rename from attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/ImageLoaderTarget.kt rename to attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt index bb59c9e01e..1e5e88d91f 100644 --- a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/ImageLoaderTarget.kt +++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.attachmentviewer +package im.vector.lib.attachmentviewer import android.graphics.drawable.Animatable import android.graphics.drawable.Drawable diff --git a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/SwipeDirection.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirection.kt similarity index 96% rename from attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/SwipeDirection.kt rename to attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirection.kt index ebe8784e15..7948f37ae8 100644 --- a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/SwipeDirection.kt +++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirection.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package im.vector.riotx.attachmentviewer +package im.vector.lib.attachmentviewer sealed class SwipeDirection { object NotDetected : SwipeDirection() diff --git a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/SwipeDirectionDetector.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirectionDetector.kt similarity index 97% rename from attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/SwipeDirectionDetector.kt rename to attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirectionDetector.kt index 0cf9a19ab1..ea796588a3 100644 --- a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/SwipeDirectionDetector.kt +++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirectionDetector.kt @@ -1,6 +1,5 @@ /* * Copyright (c) 2020 New Vector Ltd - * Copyright (C) 2018 stfalcon.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.attachmentviewer +package im.vector.lib.attachmentviewer import android.content.Context import android.view.MotionEvent diff --git a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/SwipeToDismissHandler.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt similarity index 99% rename from attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/SwipeToDismissHandler.kt rename to attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt index ca93d4f73a..ca2c28b498 100644 --- a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/SwipeToDismissHandler.kt +++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package im.vector.riotx.attachmentviewer +package im.vector.lib.attachmentviewer import android.animation.Animator import android.animation.AnimatorListenerAdapter diff --git a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/VideoLoaderTarget.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt similarity index 98% rename from attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/VideoLoaderTarget.kt rename to attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt index 548c6431e5..78f46a320f 100644 --- a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/VideoLoaderTarget.kt +++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.attachmentviewer +package im.vector.lib.attachmentviewer import android.graphics.drawable.Drawable import android.widget.ImageView diff --git a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/VideoViewHolder.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt similarity index 99% rename from attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/VideoViewHolder.kt rename to attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt index e1a5a9864f..32f449d6fe 100644 --- a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/VideoViewHolder.kt +++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.attachmentviewer +package im.vector.lib.attachmentviewer import android.view.View import android.widget.ImageView diff --git a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/ZoomableImageViewHolder.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt similarity index 97% rename from attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/ZoomableImageViewHolder.kt rename to attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt index 3eb06e4c27..019cd3202d 100644 --- a/attachment-viewer/src/main/java/im/vector/riotx/attachmentviewer/ZoomableImageViewHolder.kt +++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.attachmentviewer +package im.vector.lib.attachmentviewer import android.view.View import android.widget.ProgressBar diff --git a/vector/src/main/java/im/vector/riotx/features/media/AttachmentOverlayView.kt b/vector/src/main/java/im/vector/riotx/features/media/AttachmentOverlayView.kt index 2812b011f9..46524f3bfd 100644 --- a/vector/src/main/java/im/vector/riotx/features/media/AttachmentOverlayView.kt +++ b/vector/src/main/java/im/vector/riotx/features/media/AttachmentOverlayView.kt @@ -25,9 +25,9 @@ import android.widget.SeekBar import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.Group +import im.vector.lib.attachmentviewer.AttachmentEventListener +import im.vector.lib.attachmentviewer.AttachmentEvents import im.vector.riotx.R -import im.vector.riotx.attachmentviewer.AttachmentEventListener -import im.vector.riotx.attachmentviewer.AttachmentEvents class AttachmentOverlayView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 diff --git a/vector/src/main/java/im/vector/riotx/features/media/BaseAttachmentProvider.kt b/vector/src/main/java/im/vector/riotx/features/media/BaseAttachmentProvider.kt index d4c41c7cb3..d843b4aad2 100644 --- a/vector/src/main/java/im/vector/riotx/features/media/BaseAttachmentProvider.kt +++ b/vector/src/main/java/im/vector/riotx/features/media/BaseAttachmentProvider.kt @@ -22,12 +22,12 @@ import android.view.View import android.widget.ImageView import com.bumptech.glide.request.target.CustomViewTarget import com.bumptech.glide.request.transition.Transition +import im.vector.lib.attachmentviewer.AttachmentInfo +import im.vector.lib.attachmentviewer.AttachmentSourceProvider +import im.vector.lib.attachmentviewer.ImageLoaderTarget +import im.vector.lib.attachmentviewer.VideoLoaderTarget import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.session.file.FileService -import im.vector.riotx.attachmentviewer.AttachmentInfo -import im.vector.riotx.attachmentviewer.AttachmentSourceProvider -import im.vector.riotx.attachmentviewer.ImageLoaderTarget -import im.vector.riotx.attachmentviewer.VideoLoaderTarget import java.io.File abstract class BaseAttachmentProvider(val imageContentRenderer: ImageContentRenderer, val fileService: FileService) : AttachmentSourceProvider { diff --git a/vector/src/main/java/im/vector/riotx/features/media/DataAttachmentRoomProvider.kt b/vector/src/main/java/im/vector/riotx/features/media/DataAttachmentRoomProvider.kt index cb0039fc7e..439dffb2ff 100644 --- a/vector/src/main/java/im/vector/riotx/features/media/DataAttachmentRoomProvider.kt +++ b/vector/src/main/java/im/vector/riotx/features/media/DataAttachmentRoomProvider.kt @@ -19,11 +19,11 @@ package im.vector.riotx.features.media import android.content.Context import android.view.View import androidx.core.view.isVisible +import im.vector.lib.attachmentviewer.AttachmentInfo import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.session.events.model.isVideoMessage import im.vector.matrix.android.api.session.file.FileService import im.vector.matrix.android.api.session.room.Room -import im.vector.riotx.attachmentviewer.AttachmentInfo import im.vector.riotx.core.date.VectorDateFormatter import im.vector.riotx.core.extensions.localDateTime import java.io.File diff --git a/vector/src/main/java/im/vector/riotx/features/media/RoomEventsAttachmentProvider.kt b/vector/src/main/java/im/vector/riotx/features/media/RoomEventsAttachmentProvider.kt index 7a7fea6dc4..d4a81314fb 100644 --- a/vector/src/main/java/im/vector/riotx/features/media/RoomEventsAttachmentProvider.kt +++ b/vector/src/main/java/im/vector/riotx/features/media/RoomEventsAttachmentProvider.kt @@ -19,6 +19,7 @@ package im.vector.riotx.features.media import android.content.Context import android.view.View import androidx.core.view.isVisible +import im.vector.lib.attachmentviewer.AttachmentInfo import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.events.model.isVideoMessage @@ -32,7 +33,6 @@ import im.vector.matrix.android.api.session.room.model.message.MessageWithAttach import im.vector.matrix.android.api.session.room.model.message.getFileUrl import im.vector.matrix.android.api.session.room.timeline.TimelineEvent import im.vector.matrix.android.internal.crypto.attachments.toElementToDecrypt -import im.vector.riotx.attachmentviewer.AttachmentInfo import im.vector.riotx.core.date.VectorDateFormatter import im.vector.riotx.core.extensions.localDateTime import java.io.File @@ -147,7 +147,7 @@ class RoomEventsAttachmentProvider( elementToDecrypt = messageContent.encryptedFileInfo?.toElementToDecrypt(), callback = object : MatrixCallback { override fun onSuccess(data: File) { - callback(data) + callback(data) } override fun onFailure(failure: Throwable) { diff --git a/vector/src/main/java/im/vector/riotx/features/media/VectorAttachmentViewerActivity.kt b/vector/src/main/java/im/vector/riotx/features/media/VectorAttachmentViewerActivity.kt index 9e5facd162..9e13e2a028 100644 --- a/vector/src/main/java/im/vector/riotx/features/media/VectorAttachmentViewerActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/media/VectorAttachmentViewerActivity.kt @@ -30,9 +30,9 @@ import androidx.core.view.isInvisible import androidx.core.view.isVisible import androidx.lifecycle.Lifecycle import androidx.transition.Transition +import im.vector.lib.attachmentviewer.AttachmentCommands +import im.vector.lib.attachmentviewer.AttachmentViewerActivity import im.vector.riotx.R -import im.vector.riotx.attachmentviewer.AttachmentCommands -import im.vector.riotx.attachmentviewer.AttachmentViewerActivity import im.vector.riotx.core.di.ActiveSessionHolder import im.vector.riotx.core.di.DaggerScreenComponent import im.vector.riotx.core.di.HasVectorInjector From 67fc2feacb8e2563cc25f61ed6da48cb4de57ed7 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 3 Aug 2020 18:08:13 +0200 Subject: [PATCH 2/6] Rename package `im.vector.riotx.multipicker` to `im.vector.lib.multipicker` --- CHANGES.md | 1 + multipicker/src/main/AndroidManifest.xml | 2 +- .../vector/{riotx => lib}/multipicker/AudioPicker.kt | 4 ++-- .../{riotx => lib}/multipicker/CameraPicker.kt | 6 +++--- .../{riotx => lib}/multipicker/ContactPicker.kt | 4 ++-- .../vector/{riotx => lib}/multipicker/FilePicker.kt | 4 ++-- .../vector/{riotx => lib}/multipicker/ImagePicker.kt | 6 +++--- .../vector/{riotx => lib}/multipicker/MultiPicker.kt | 2 +- .../im/vector/{riotx => lib}/multipicker/Picker.kt | 2 +- .../vector/{riotx => lib}/multipicker/VideoPicker.kt | 4 ++-- .../multipicker/entity/MultiPickerAudioType.kt | 2 +- .../multipicker/entity/MultiPickerBaseType.kt | 2 +- .../multipicker/entity/MultiPickerContactType.kt | 2 +- .../multipicker/entity/MultiPickerFileType.kt | 2 +- .../multipicker/entity/MultiPickerImageType.kt | 2 +- .../multipicker/entity/MultiPickerVideoType.kt | 2 +- .../multipicker/provider/MultiPickerFileProvider.kt | 2 +- .../{riotx => lib}/multipicker/utils/ImageUtils.kt | 2 +- .../riotx/features/attachments/AttachmentsHelper.kt | 2 +- .../riotx/features/attachments/AttachmentsMapper.kt | 12 ++++++------ .../riotx/features/media/BigImageViewerActivity.kt | 4 ++-- .../features/roomprofile/RoomProfileFragment.kt | 4 ++-- .../settings/VectorSettingsGeneralFragment.kt | 4 ++-- 23 files changed, 39 insertions(+), 38 deletions(-) rename multipicker/src/main/java/im/vector/{riotx => lib}/multipicker/AudioPicker.kt (97%) rename multipicker/src/main/java/im/vector/{riotx => lib}/multipicker/CameraPicker.kt (96%) rename multipicker/src/main/java/im/vector/{riotx => lib}/multipicker/ContactPicker.kt (98%) rename multipicker/src/main/java/im/vector/{riotx => lib}/multipicker/FilePicker.kt (96%) rename multipicker/src/main/java/im/vector/{riotx => lib}/multipicker/ImagePicker.kt (95%) rename multipicker/src/main/java/im/vector/{riotx => lib}/multipicker/MultiPicker.kt (98%) rename multipicker/src/main/java/im/vector/{riotx => lib}/multipicker/Picker.kt (99%) rename multipicker/src/main/java/im/vector/{riotx => lib}/multipicker/VideoPicker.kt (97%) rename multipicker/src/main/java/im/vector/{riotx => lib}/multipicker/entity/MultiPickerAudioType.kt (95%) rename multipicker/src/main/java/im/vector/{riotx => lib}/multipicker/entity/MultiPickerBaseType.kt (94%) rename multipicker/src/main/java/im/vector/{riotx => lib}/multipicker/entity/MultiPickerContactType.kt (94%) rename multipicker/src/main/java/im/vector/{riotx => lib}/multipicker/entity/MultiPickerFileType.kt (95%) rename multipicker/src/main/java/im/vector/{riotx => lib}/multipicker/entity/MultiPickerImageType.kt (95%) rename multipicker/src/main/java/im/vector/{riotx => lib}/multipicker/entity/MultiPickerVideoType.kt (95%) rename multipicker/src/main/java/im/vector/{riotx => lib}/multipicker/provider/MultiPickerFileProvider.kt (93%) rename multipicker/src/main/java/im/vector/{riotx => lib}/multipicker/utils/ImageUtils.kt (97%) diff --git a/CHANGES.md b/CHANGES.md index a1eeb4904a..6fdc867d1d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -22,6 +22,7 @@ Build 🧱: Other changes: - Hide Flair settings, this is not implemented yet. - Rename package `im.vector.riotx.attachmentviewer` to `im.vector.lib.attachmentviewer` + - Rename package `im.vector.riotx.multipicker` to `im.vector.lib.multipicker` Changes in Element 1.0.4 (2020-08-03) =================================================== diff --git a/multipicker/src/main/AndroidManifest.xml b/multipicker/src/main/AndroidManifest.xml index e1f12697e0..c02a22d1d9 100644 --- a/multipicker/src/main/AndroidManifest.xml +++ b/multipicker/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="im.vector.lib.multipicker"> { diff --git a/multipicker/src/main/java/im/vector/riotx/multipicker/Picker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt similarity index 99% rename from multipicker/src/main/java/im/vector/riotx/multipicker/Picker.kt rename to multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt index 43ac5d5fdd..65ec77e02a 100644 --- a/multipicker/src/main/java/im/vector/riotx/multipicker/Picker.kt +++ b/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.multipicker +package im.vector.lib.multipicker import android.app.Activity import android.content.Context diff --git a/multipicker/src/main/java/im/vector/riotx/multipicker/VideoPicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt similarity index 97% rename from multipicker/src/main/java/im/vector/riotx/multipicker/VideoPicker.kt rename to multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt index b85ffacd48..7127e9defd 100644 --- a/multipicker/src/main/java/im/vector/riotx/multipicker/VideoPicker.kt +++ b/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.multipicker +package im.vector.lib.multipicker import android.app.Activity import android.content.Context import android.content.Intent import android.media.MediaMetadataRetriever import android.provider.MediaStore -import im.vector.riotx.multipicker.entity.MultiPickerVideoType +import im.vector.lib.multipicker.entity.MultiPickerVideoType /** * Video Picker implementation diff --git a/multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerAudioType.kt b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerAudioType.kt similarity index 95% rename from multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerAudioType.kt rename to multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerAudioType.kt index 6afe022024..a779923d46 100644 --- a/multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerAudioType.kt +++ b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerAudioType.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.multipicker.entity +package im.vector.lib.multipicker.entity import android.net.Uri diff --git a/multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerBaseType.kt b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerBaseType.kt similarity index 94% rename from multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerBaseType.kt rename to multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerBaseType.kt index 777e4d8441..c4d22c6a0c 100644 --- a/multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerBaseType.kt +++ b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerBaseType.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.multipicker.entity +package im.vector.lib.multipicker.entity import android.net.Uri diff --git a/multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerContactType.kt b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerContactType.kt similarity index 94% rename from multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerContactType.kt rename to multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerContactType.kt index a9135443a2..111e2a5350 100644 --- a/multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerContactType.kt +++ b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerContactType.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.multipicker.entity +package im.vector.lib.multipicker.entity data class MultiPickerContactType( val displayName: String, diff --git a/multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerFileType.kt b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerFileType.kt similarity index 95% rename from multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerFileType.kt rename to multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerFileType.kt index 5417520d28..9baebdeff3 100644 --- a/multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerFileType.kt +++ b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerFileType.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.multipicker.entity +package im.vector.lib.multipicker.entity import android.net.Uri diff --git a/multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerImageType.kt b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerImageType.kt similarity index 95% rename from multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerImageType.kt rename to multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerImageType.kt index b1aef171b4..a3f30fc0d5 100644 --- a/multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerImageType.kt +++ b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerImageType.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.multipicker.entity +package im.vector.lib.multipicker.entity import android.net.Uri diff --git a/multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerVideoType.kt b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerVideoType.kt similarity index 95% rename from multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerVideoType.kt rename to multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerVideoType.kt index ba9a8d233e..0015052c7c 100644 --- a/multipicker/src/main/java/im/vector/riotx/multipicker/entity/MultiPickerVideoType.kt +++ b/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerVideoType.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.multipicker.entity +package im.vector.lib.multipicker.entity import android.net.Uri diff --git a/multipicker/src/main/java/im/vector/riotx/multipicker/provider/MultiPickerFileProvider.kt b/multipicker/src/main/java/im/vector/lib/multipicker/provider/MultiPickerFileProvider.kt similarity index 93% rename from multipicker/src/main/java/im/vector/riotx/multipicker/provider/MultiPickerFileProvider.kt rename to multipicker/src/main/java/im/vector/lib/multipicker/provider/MultiPickerFileProvider.kt index 048b2ca199..c553b18acd 100644 --- a/multipicker/src/main/java/im/vector/riotx/multipicker/provider/MultiPickerFileProvider.kt +++ b/multipicker/src/main/java/im/vector/lib/multipicker/provider/MultiPickerFileProvider.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.multipicker.provider +package im.vector.lib.multipicker.provider import androidx.core.content.FileProvider diff --git a/multipicker/src/main/java/im/vector/riotx/multipicker/utils/ImageUtils.kt b/multipicker/src/main/java/im/vector/lib/multipicker/utils/ImageUtils.kt similarity index 97% rename from multipicker/src/main/java/im/vector/riotx/multipicker/utils/ImageUtils.kt rename to multipicker/src/main/java/im/vector/lib/multipicker/utils/ImageUtils.kt index c5171e7d84..a3d69ae8cf 100644 --- a/multipicker/src/main/java/im/vector/riotx/multipicker/utils/ImageUtils.kt +++ b/multipicker/src/main/java/im/vector/lib/multipicker/utils/ImageUtils.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.multipicker.utils +package im.vector.lib.multipicker.utils import android.content.Context import android.graphics.Bitmap diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/AttachmentsHelper.kt b/vector/src/main/java/im/vector/riotx/features/attachments/AttachmentsHelper.kt index daea538e12..149d5e2411 100644 --- a/vector/src/main/java/im/vector/riotx/features/attachments/AttachmentsHelper.kt +++ b/vector/src/main/java/im/vector/riotx/features/attachments/AttachmentsHelper.kt @@ -21,10 +21,10 @@ import android.content.Intent import android.net.Uri import android.os.Bundle import androidx.fragment.app.Fragment +import im.vector.lib.multipicker.MultiPicker import im.vector.matrix.android.BuildConfig import im.vector.matrix.android.api.session.content.ContentAttachmentData import im.vector.riotx.core.platform.Restorable -import im.vector.riotx.multipicker.MultiPicker import timber.log.Timber private const val CAPTURE_PATH_KEY = "CAPTURE_PATH_KEY" diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/AttachmentsMapper.kt b/vector/src/main/java/im/vector/riotx/features/attachments/AttachmentsMapper.kt index 02b712b8a7..9027931854 100644 --- a/vector/src/main/java/im/vector/riotx/features/attachments/AttachmentsMapper.kt +++ b/vector/src/main/java/im/vector/riotx/features/attachments/AttachmentsMapper.kt @@ -16,13 +16,13 @@ package im.vector.riotx.features.attachments +import im.vector.lib.multipicker.entity.MultiPickerAudioType +import im.vector.lib.multipicker.entity.MultiPickerBaseType +import im.vector.lib.multipicker.entity.MultiPickerContactType +import im.vector.lib.multipicker.entity.MultiPickerFileType +import im.vector.lib.multipicker.entity.MultiPickerImageType +import im.vector.lib.multipicker.entity.MultiPickerVideoType import im.vector.matrix.android.api.session.content.ContentAttachmentData -import im.vector.riotx.multipicker.entity.MultiPickerAudioType -import im.vector.riotx.multipicker.entity.MultiPickerBaseType -import im.vector.riotx.multipicker.entity.MultiPickerContactType -import im.vector.riotx.multipicker.entity.MultiPickerFileType -import im.vector.riotx.multipicker.entity.MultiPickerImageType -import im.vector.riotx.multipicker.entity.MultiPickerVideoType import timber.log.Timber fun MultiPickerContactType.toContactAttachment(): ContactAttachment { diff --git a/vector/src/main/java/im/vector/riotx/features/media/BigImageViewerActivity.kt b/vector/src/main/java/im/vector/riotx/features/media/BigImageViewerActivity.kt index e13bcf9dde..e3ff5e1513 100644 --- a/vector/src/main/java/im/vector/riotx/features/media/BigImageViewerActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/media/BigImageViewerActivity.kt @@ -27,6 +27,8 @@ import android.widget.Toast import androidx.appcompat.app.AlertDialog import androidx.core.net.toUri import com.yalantis.ucrop.UCrop +import im.vector.lib.multipicker.MultiPicker +import im.vector.lib.multipicker.entity.MultiPickerImageType import im.vector.riotx.R import im.vector.riotx.core.di.ActiveSessionHolder import im.vector.riotx.core.di.ScreenComponent @@ -37,8 +39,6 @@ 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.allGranted import im.vector.riotx.core.utils.checkPermissions -import im.vector.riotx.multipicker.MultiPicker -import im.vector.riotx.multipicker.entity.MultiPickerImageType import kotlinx.android.synthetic.main.activity_big_image_viewer.* import java.io.File import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileFragment.kt b/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileFragment.kt index d65ec82921..06773ed924 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileFragment.kt @@ -34,6 +34,8 @@ import com.airbnb.mvrx.args import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState import com.yalantis.ucrop.UCrop +import im.vector.lib.multipicker.MultiPicker +import im.vector.lib.multipicker.entity.MultiPickerImageType import im.vector.matrix.android.api.session.room.notification.RoomNotificationState import im.vector.matrix.android.api.util.MatrixItem import im.vector.matrix.android.api.util.toMatrixItem @@ -60,8 +62,6 @@ import im.vector.riotx.features.home.room.list.actions.RoomListQuickActionsShare import im.vector.riotx.features.home.room.list.actions.RoomListQuickActionsSharedActionViewModel import im.vector.riotx.features.media.BigImageViewerActivity import im.vector.riotx.features.media.createUCropWithDefaultSettings -import im.vector.riotx.multipicker.MultiPicker -import im.vector.riotx.multipicker.entity.MultiPickerImageType import kotlinx.android.parcel.Parcelize import kotlinx.android.synthetic.main.fragment_matrix_profile.* import kotlinx.android.synthetic.main.view_stub_room_profile_header.* diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt index 209cedda2c..879d4a3d0f 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt @@ -40,6 +40,8 @@ import com.bumptech.glide.load.engine.cache.DiskCache import com.google.android.material.textfield.TextInputEditText import com.google.android.material.textfield.TextInputLayout import com.yalantis.ucrop.UCrop +import im.vector.lib.multipicker.MultiPicker +import im.vector.lib.multipicker.entity.MultiPickerImageType import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.NoOpMatrixCallback import im.vector.matrix.android.api.failure.isInvalidPassword @@ -66,8 +68,6 @@ import im.vector.riotx.features.MainActivityArgs import im.vector.riotx.features.media.createUCropWithDefaultSettings import im.vector.riotx.features.themes.ThemeUtils import im.vector.riotx.features.workers.signout.SignOutUiWorker -import im.vector.riotx.multipicker.MultiPicker -import im.vector.riotx.multipicker.entity.MultiPickerImageType import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch From a1f90abcd20d2100e02767a6fd2cfb9969f12a4d Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 3 Aug 2020 18:23:05 +0200 Subject: [PATCH 3/6] Rename package `im.vector.riotx` to `im.vector.app` (IDE) --- CHANGES.md | 1 + vector/proguard-rules.pro | 2 +- .../vector/{riotx => app}/InstrumentedTest.kt | 4 +- .../core/utils/TemporaryStoreTest.kt | 2 +- .../reactions/data/EmojiDataSourceTest.kt | 4 +- vector/src/debug/AndroidManifest.xml | 2 +- .../debug/DebugMaterialThemeActivity.kt | 6 +- .../debug/DebugMaterialThemeDarkActivity.kt | 2 +- .../debug/DebugMaterialThemeLightActivity.kt | 2 +- .../features/debug/DebugMenuActivity.kt | 24 +-- .../features/debug/TestLinkifyActivity.kt | 4 +- .../debug/sas/DebugSasEmojiActivity.kt | 8 +- .../features/debug/sas/SasEmojiController.kt | 2 +- .../features/debug/sas/SasEmojiItem.kt | 16 +- .../{riotx => app}/receivers/DebugReceiver.kt | 6 +- .../debug/res/layout/activity_debug_menu.xml | 4 +- .../res/layout/activity_test_linkify.xml | 2 +- vector/src/fdroid/AndroidManifest.xml | 2 +- .../im/vector/{riotx => app}/FlavorCode.kt | 2 +- .../troubleshoot/TestAutoStartBoot.kt | 10 +- .../TestBackgroundRestrictions.kt | 8 +- .../troubleshoot/TestBatteryOptimization.kt | 12 +- .../{riotx => app}/fdroid/package-info.kt | 2 +- .../receiver/AlarmSyncBroadcastReceiver.kt | 6 +- .../OnApplicationUpgradeOrRebootReceiver.kt | 4 +- .../{riotx => app}/push/fcm/FcmHelper.kt | 10 +- ...ificationTroubleshootTestManagerFactory.kt | 16 +- vector/src/gplay/AndroidManifest.xml | 2 +- vector/src/main/AndroidManifest.xml | 100 +++++----- .../{riotx => app}/ActiveSessionDataSource.kt | 4 +- .../vector/{riotx => app}/AppStateHandler.kt | 10 +- .../{riotx => app}/EmojiCompatFontProvider.kt | 2 +- .../{riotx => app}/EmojiCompatWrapper.kt | 2 +- .../{riotx => app}/VectorApplication.kt | 36 ++-- .../animations/AppBarStateChangeListener.kt | 2 +- .../core/animations/Constants.kt | 2 +- .../MatrixItemAppBarStateChangeListener.kt | 2 +- .../core/animations/SimpleAnimatorListener.kt | 2 +- .../animations/SimpleTransitionListener.kt | 2 +- .../animations/VectorFullTransitionSet.kt | 2 +- .../behavior/PercentViewBehavior.kt | 4 +- .../core/contacts/ContactsDataSource.kt | 2 +- .../core/contacts/MappedContact.kt | 2 +- .../core/date/VectorDateFormatter.kt | 4 +- .../core/di/ActiveSessionHolder.kt | 14 +- .../core/di/AssistedInjectModule.kt | 2 +- .../{riotx => app}/core/di/FragmentKey.kt | 2 +- .../{riotx => app}/core/di/FragmentModule.kt | 174 +++++++++--------- .../core/di/HasScreenInjector.kt | 2 +- .../core/di/HasVectorInjector.kt | 2 +- .../{riotx => app}/core/di/ImageManager.kt | 6 +- .../{riotx => app}/core/di/ScreenComponent.kt | 110 +++++------ .../{riotx => app}/core/di/ScreenModule.kt | 4 +- .../{riotx => app}/core/di/ScreenScope.kt | 2 +- .../core/di/VectorAssistedModule.kt | 2 +- .../{riotx => app}/core/di/VectorComponent.kt | 72 ++++---- .../core/di/VectorFragmentFactory.kt | 2 +- .../{riotx => app}/core/di/VectorModule.kt | 18 +- .../core/di/VectorViewModelFactory.kt | 2 +- .../{riotx => app}/core/di/ViewModelKey.kt | 2 +- .../{riotx => app}/core/di/ViewModelModule.kt | 32 ++-- .../core/dialogs/ConfirmationDialogBuilder.kt | 4 +- .../core/dialogs/DialogLocker.kt | 4 +- .../core/dialogs/ExportKeysDialog.kt | 8 +- .../{riotx => app}/core/dialogs/Extensions.kt | 4 +- .../core/dialogs/ManuallyVerifyDialog.kt | 4 +- .../core/dialogs/PromptPasswordDialog.kt | 10 +- .../dialogs/UnrecognizedCertificateDialog.kt | 8 +- .../{riotx => app}/core/epoxy/DividerItem.kt | 4 +- .../{riotx => app}/core/epoxy/EmptyItem.kt | 4 +- .../core/epoxy/ErrorWithRetryItem.kt | 4 +- .../core/epoxy/HelpFooterItem.kt | 4 +- .../core/epoxy/LayoutManagerStateRestorer.kt | 6 +- .../{riotx => app}/core/epoxy/Listener.kt | 2 +- .../{riotx => app}/core/epoxy/LoadingItem.kt | 6 +- .../{riotx => app}/core/epoxy/NoResultItem.kt | 4 +- .../core/epoxy/SquareLoadingItem.kt | 4 +- .../core/epoxy/VectorEpoxyHolder.kt | 2 +- .../core/epoxy/VectorEpoxyModel.kt | 2 +- .../{riotx => app}/core/epoxy/ZeroItem.kt | 4 +- .../core/epoxy/attributes/ButtonStyle.kt | 2 +- .../core/epoxy/attributes/ButtonType.kt | 2 +- .../core/epoxy/attributes/IconMode.kt | 2 +- .../bottomsheet/BottomSheetActionItem.kt | 10 +- .../BottomSheetMessagePreviewItem.kt | 14 +- .../BottomSheetQuickReactionsItem.kt | 10 +- .../bottomsheet/BottomSheetRoomPreviewItem.kt | 20 +- .../bottomsheet/BottomSheetSendStateItem.kt | 8 +- .../epoxy/profiles/BaseProfileMatrixItem.kt | 10 +- .../core/epoxy/profiles/ProfileActionItem.kt | 14 +- .../epoxy/profiles/ProfileItemExtensions.kt | 8 +- .../core/epoxy/profiles/ProfileMatrixItem.kt | 6 +- .../profiles/ProfileMatrixItemWithProgress.kt | 4 +- .../core/epoxy/profiles/ProfileSectionItem.kt | 8 +- .../core/error/ErrorFormatter.kt | 6 +- .../core/error/ResourceLimitErrorFormatter.kt | 4 +- .../vector/{riotx => app}/core/error/fatal.kt | 2 +- .../core/extensions/Activity.kt | 4 +- .../core/extensions/BasicExtensions.kt | 2 +- .../core/extensions/Collections.kt | 2 +- .../{riotx => app}/core/extensions/Context.kt | 6 +- .../core/extensions/EditText.kt | 6 +- .../{riotx => app}/core/extensions/Event.kt | 4 +- .../core/extensions/Exhaustive.kt | 2 +- .../core/extensions/Fragment.kt | 8 +- .../core/extensions/FragmentManager.kt | 2 +- .../core/extensions/Iterable.kt | 2 +- .../core/extensions/LiveData.kt | 8 +- .../core/extensions/RecyclerView.kt | 6 +- .../{riotx => app}/core/extensions/Session.kt | 4 +- .../{riotx => app}/core/extensions/Set.kt | 2 +- .../core/extensions/TextView.kt | 6 +- .../core/extensions/TimelineEvent.kt | 2 +- .../core/extensions/UrlExtensions.kt | 2 +- .../{riotx => app}/core/extensions/View.kt | 2 +- .../core/extensions/ViewExtensions.kt | 4 +- .../{riotx => app}/core/files/FileSaver.kt | 2 +- .../core/glide/ElementToDecryptOption.kt | 2 +- .../{riotx => app}/core/glide/FactoryUrl.kt | 4 +- .../core/glide/MyAppGlideModule.kt | 6 +- .../core/glide/VectorGlideModelLoader.kt | 6 +- .../core/hardware/HardwareInfo.kt | 2 +- .../{riotx => app}/core/hardware/vibrator.kt | 2 +- .../core/intent/ExternalIntentAnalyser.kt | 2 +- .../{riotx => app}/core/intent/Filename.kt | 2 +- .../core/intent/VectorMimeType.kt | 4 +- .../core/linkify/VectorAutoLinkPatterns.kt | 2 +- .../core/linkify/VectorLinkify.kt | 2 +- .../platform/BadgeFloatingActionButton.kt | 4 +- .../core/platform/ButtonStateView.kt | 4 +- .../platform/CheckableConstraintLayout.kt | 2 +- .../core/platform/CheckableFrameLayout.kt | 2 +- .../core/platform/CheckableImageView.kt | 2 +- .../core/platform/CheckableView.kt | 2 +- .../core/platform/ConfigurationViewModel.kt | 8 +- .../platform/DefaultListUpdateCallback.kt | 2 +- .../core/platform/MaxHeightScrollView.kt | 4 +- .../core/platform/OnBackPressed.kt | 2 +- .../core/platform/Restorable.kt | 2 +- .../core/platform/SimpleFragmentActivity.kt | 8 +- .../core/platform/SimpleTextWatcher.kt | 2 +- .../{riotx => app}/core/platform/StateView.kt | 4 +- .../core/platform/ToolbarConfigurable.kt | 2 +- .../core/platform/VectorBaseActivity.kt | 66 +++---- .../VectorBaseBottomSheetDialogFragment.kt | 8 +- .../core/platform/VectorBaseFragment.kt | 16 +- .../core/platform/VectorEventViewModel.kt | 6 +- .../core/platform/VectorViewEvents.kt | 2 +- .../core/platform/VectorViewModel.kt | 6 +- .../core/platform/VectorViewModelAction.kt | 2 +- .../core/platform/ViewModelTask.kt | 2 +- .../core/platform/WaitingViewData.kt | 2 +- .../core/preference/AddressPreference.kt | 4 +- .../core/preference/ProgressBarPreference.kt | 4 +- .../core/preference/PushRulePreference.kt | 4 +- .../core/preference/RoomAvatarPreference.kt | 2 +- .../core/preference/UserAvatarPreference.kt | 8 +- .../preference/VectorEditTextPreference.kt | 4 +- .../core/preference/VectorGroupPreference.kt | 4 +- .../core/preference/VectorListPreference.kt | 4 +- .../core/preference/VectorPreference.kt | 6 +- .../preference/VectorPreferenceCategory.kt | 6 +- .../core/preference/VectorSwitchPreference.kt | 6 +- .../core/pushers/PushersManager.kt | 12 +- .../{riotx => app}/core/qrcode/QrCode.kt | 2 +- .../core/resources/AppNameProvider.kt | 2 +- .../core/resources/ColorProvider.kt | 4 +- .../core/resources/DateProvider.kt | 2 +- .../core/resources/DrawableProvider.kt | 4 +- .../core/resources/LocaleProvider.kt | 2 +- .../core/resources/ResourceUtils.kt | 4 +- .../core/resources/StringArrayProvider.kt | 2 +- .../core/resources/StringProvider.kt | 2 +- .../core/resources/UserPreferencesProvider.kt | 4 +- .../core/resources/VersionCodeProvider.kt | 2 +- .../vector/{riotx => app}/core/rx/RxConfig.kt | 4 +- .../core/services/BluetoothHeadsetReceiver.kt | 2 +- .../core/services/CallRingPlayer.kt | 4 +- .../core/services/CallService.kt | 10 +- .../core/services/VectorService.kt | 2 +- .../core/services/VectorSyncService.kt | 8 +- .../services/WiredHeadsetStateReceiver.kt | 2 +- .../core/ui/list/GenericButtonItem.kt | 10 +- .../core/ui/list/GenericFooterItem.kt | 12 +- .../core/ui/list/GenericItem.kt | 10 +- .../core/ui/list/GenericItemHeader.kt | 10 +- .../core/ui/list/GenericItemWithValue.kt | 14 +- .../core/ui/list/GenericLoaderItem.kt | 8 +- .../{riotx => app}/core/ui/model/Size.kt | 2 +- .../core/ui/views/ActiveCallView.kt | 6 +- .../core/ui/views/ActiveCallViewHolder.kt | 6 +- .../core/ui/views/BottomSheetActionButton.kt | 8 +- .../core/ui/views/JumpToReadMarkerView.kt | 4 +- .../core/ui/views/KeysBackupBanner.kt | 4 +- .../core/ui/views/NotificationAreaView.kt | 10 +- .../core/ui/views/PasswordStrengthBar.kt | 4 +- .../core/ui/views/QrCodeImageView.kt | 6 +- .../core/ui/views/ReadReceiptsView.kt | 12 +- .../{riotx => app}/core/utils/AssetReader.kt | 2 +- .../{riotx => app}/core/utils/DataSource.kt | 2 +- .../core/utils/DebouncedClickListener.kt | 2 +- .../{riotx => app}/core/utils/Debouncer.kt | 2 +- .../core/utils/DefaultSubscriber.kt | 2 +- .../{riotx => app}/core/utils/Dialogs.kt | 2 +- .../core/utils/DimensionConverter.kt | 2 +- .../vector/{riotx => app}/core/utils/Emoji.kt | 2 +- .../utils/EvenBetterLinkMovementMethod.kt | 2 +- .../core/utils/ExternalApplicationsUtil.kt | 8 +- .../{riotx => app}/core/utils/FileUtils.kt | 2 +- .../core/utils/FirstThrottler.kt | 2 +- .../{riotx => app}/core/utils/Handler.kt | 2 +- .../core/utils/JsonViewerStyler.kt | 6 +- .../core/utils/KeyboardStateUtils.kt | 2 +- .../{riotx => app}/core/utils/LiveEvent.kt | 2 +- .../core/utils/PermissionsTools.kt | 4 +- .../core/utils/RingtoneUtils.kt | 6 +- .../core/utils/SnapHelperUtils.kt | 2 +- .../core/utils/SpannableUtils.kt | 2 +- .../{riotx => app}/core/utils/SystemUtils.kt | 6 +- .../core/utils/TemporaryStore.kt | 2 +- .../{riotx => app}/core/utils/TextUtils.kt | 2 +- .../{riotx => app}/core/utils/UrlUtils.kt | 2 +- .../{riotx => app}/core/utils/UserColor.kt | 4 +- .../{riotx => app}/core/utils/ViewUtils.kt | 4 +- .../core/utils/WeakReferenceDelegate.kt | 2 +- .../{riotx => app}/features/MainActivity.kt | 38 ++-- .../attachments/AttachmentTypeSelectorView.kt | 16 +- .../features/attachments/AttachmentsHelper.kt | 4 +- .../features/attachments/AttachmentsMapper.kt | 2 +- .../features/attachments/ContactAttachment.kt | 2 +- .../attachments/ContentAttachmentData.kt | 2 +- .../preview/AttachmentPreviewControllers.kt | 2 +- .../preview/AttachmentPreviewItems.kt | 10 +- .../preview/AttachmentsPreviewAction.kt | 4 +- .../preview/AttachmentsPreviewActivity.kt | 12 +- .../preview/AttachmentsPreviewFragment.kt | 26 +-- .../preview/AttachmentsPreviewViewEvents.kt | 4 +- .../preview/AttachmentsPreviewViewModel.kt | 6 +- .../preview/AttachmentsPreviewViewState.kt | 2 +- .../attachments/preview/Extensions.kt | 2 +- .../autocomplete/AutocompleteClickListener.kt | 2 +- .../autocomplete/AutocompleteMatrixItem.kt | 12 +- .../autocomplete/RecyclerViewPresenter.kt | 2 +- .../command/AutocompleteCommandController.kt | 8 +- .../command/AutocompleteCommandItem.kt | 8 +- .../command/AutocompleteCommandPresenter.kt | 8 +- .../command/CommandAutocompletePolicy.kt | 2 +- .../emoji/AutocompleteEmojiController.kt | 10 +- .../emoji/AutocompleteEmojiItem.kt | 14 +- .../emoji/AutocompleteEmojiPresenter.kt | 8 +- .../emoji/AutocompleteMoreResultItem.kt | 8 +- .../group/AutocompleteGroupController.kt | 8 +- .../group/AutocompleteGroupPresenter.kt | 6 +- .../member/AutocompleteMemberController.kt | 8 +- .../member/AutocompleteMemberPresenter.kt | 6 +- .../room/AutocompleteRoomController.kt | 8 +- .../room/AutocompleteRoomPresenter.kt | 6 +- .../features/badge/BadgeProxy.kt | 2 +- .../features/call/CallAudioManager.kt | 4 +- .../features/call/CallControlsBottomSheet.kt | 6 +- .../features/call/CallControlsView.kt | 4 +- .../call/CameraEventsHandlerAdapter.kt | 2 +- .../{riotx => app}/features/call/Cameras.kt | 2 +- .../call/PeerConnectionObserverAdapter.kt | 2 +- .../features/call/SdpObserverAdapter.kt | 2 +- .../call/SharedActiveCallViewModel.kt | 2 +- .../features/call/VectorCallActivity.kt | 24 +-- .../features/call/VectorCallViewModel.kt | 10 +- .../call/WebRtcPeerConnectionManager.kt | 10 +- .../call/service/CallHeadsUpActionReceiver.kt | 10 +- .../features/call/telecom/CallConnection.kt | 6 +- .../features/call/telecom/TelecomUtils.kt | 2 +- .../call/telecom/VectorConnectionService.kt | 4 +- .../features/command/Command.kt | 4 +- .../features/command/CommandParser.kt | 6 +- .../features/command/ParsedCommand.kt | 2 +- .../configuration/VectorConfiguration.kt | 8 +- .../features/consent/ConsentNotGivenHelper.kt | 12 +- .../contactsbook/ContactDetailItem.kt | 14 +- .../features/contactsbook/ContactItem.kt | 12 +- .../contactsbook/ContactsBookAction.kt | 4 +- .../contactsbook/ContactsBookController.kt | 18 +- .../contactsbook/ContactsBookFragment.kt | 22 +-- .../contactsbook/ContactsBookViewModel.kt | 16 +- .../contactsbook/ContactsBookViewState.kt | 4 +- .../createdirect/CreateDirectRoomAction.kt | 6 +- .../createdirect/CreateDirectRoomActivity.kt | 42 ++--- .../CreateDirectRoomViewEvents.kt | 4 +- .../createdirect/CreateDirectRoomViewModel.kt | 8 +- .../createdirect/CreateDirectRoomViewState.kt | 2 +- .../features/crypto/keys/KeysExporter.kt | 2 +- .../features/crypto/keys/KeysImporter.kt | 6 +- .../restore/KeysBackupRestoreActivity.kt | 16 +- .../KeysBackupRestoreFromKeyFragment.kt | 8 +- .../KeysBackupRestoreFromKeyViewModel.kt | 8 +- ...KeysBackupRestoreFromPassphraseFragment.kt | 8 +- ...eysBackupRestoreFromPassphraseViewModel.kt | 6 +- .../KeysBackupRestoreSharedViewModel.kt | 10 +- .../KeysBackupRestoreSuccessFragment.kt | 8 +- .../settings/KeyBackupSettingsAction.kt | 4 +- .../settings/KeysBackupManageActivity.kt | 12 +- .../settings/KeysBackupSettingFooterItem.kt | 10 +- .../settings/KeysBackupSettingViewState.kt | 2 +- .../settings/KeysBackupSettingsFragment.kt | 14 +- ...eysBackupSettingsRecyclerViewController.kt | 16 +- .../settings/KeysBackupSettingsViewModel.kt | 6 +- .../setup/KeysBackupSetupActivity.kt | 18 +- .../setup/KeysBackupSetupSharedViewModel.kt | 8 +- .../setup/KeysBackupSetupStep1Fragment.kt | 8 +- .../setup/KeysBackupSetupStep2Fragment.kt | 12 +- .../setup/KeysBackupSetupStep3Fragment.kt | 14 +- .../crypto/keysrequest/KeyRequestHandler.kt | 8 +- .../crypto/quads/SharedSecureStorageAction.kt | 8 +- .../quads/SharedSecureStorageActivity.kt | 12 +- .../quads/SharedSecureStorageViewModel.kt | 12 +- .../quads/SharedSecuredStorageKeyFragment.kt | 8 +- .../SharedSecuredStoragePassphraseFragment.kt | 12 +- .../recover/BackupToQuadSMigrationTask.kt | 10 +- .../BootstrapAccountPasswordFragment.kt | 14 +- .../crypto/recover/BootstrapActions.kt | 4 +- .../crypto/recover/BootstrapBottomSheet.kt | 12 +- .../recover/BootstrapConclusionFragment.kt | 10 +- .../BootstrapConfirmPassphraseFragment.kt | 10 +- .../recover/BootstrapCrossSigningTask.kt | 11 +- .../BootstrapEnterPassphraseFragment.kt | 10 +- .../recover/BootstrapMigrateBackupFragment.kt | 16 +- .../BootstrapSaveRecoveryKeyFragment.kt | 12 +- .../BootstrapSetupRecoveryKeyFragment.kt | 6 +- .../recover/BootstrapSharedViewModel.kt | 16 +- .../features/crypto/recover/BootstrapStep.kt | 2 +- .../crypto/recover/BootstrapViewEvents.kt | 4 +- .../crypto/recover/BootstrapViewState.kt | 4 +- .../recover/BootstrapWaitingFragment.kt | 6 +- .../crypto/recover/KeepItSafeDialog.kt | 4 +- .../features/crypto/recover/RecoveryKeyExt.kt | 2 +- .../features/crypto/util/Extensions.kt | 6 +- .../IncomingVerificationRequestHandler.kt | 16 +- .../SupportedVerificationMethodsProvider.kt | 4 +- .../crypto/verification/VerificationAction.kt | 4 +- .../verification/VerificationBottomSheet.kt | 36 ++-- .../VerificationBottomSheetViewEvents.kt | 4 +- .../VerificationBottomSheetViewModel.kt | 10 +- .../cancel/VerificationCancelController.kt | 18 +- .../cancel/VerificationCancelFragment.kt | 12 +- .../cancel/VerificationNotMeController.kt | 18 +- .../cancel/VerificationNotMeFragment.kt | 12 +- .../VerificationChooseMethodController.kt | 16 +- .../VerificationChooseMethodFragment.kt | 24 +-- .../VerificationChooseMethodViewModel.kt | 14 +- .../VerificationConclusionController.kt | 18 +- .../VerificationConclusionFragment.kt | 14 +- .../VerificationConclusionViewModel.kt | 8 +- .../emoji/VerificationEmojiCodeController.kt | 24 +-- .../emoji/VerificationEmojiCodeFragment.kt | 14 +- .../emoji/VerificationEmojiCodeViewModel.kt | 12 +- .../epoxy/BottomSheetSelfWaitItem.kt | 8 +- .../BottomSheetVerificationActionItem.kt | 10 +- .../BottomSheetVerificationBigImageItem.kt | 8 +- .../BottomSheetVerificationDecimalCodeItem.kt | 8 +- .../BottomSheetVerificationEmojisItem.kt | 8 +- .../BottomSheetVerificationNoticeItem.kt | 8 +- .../BottomSheetVerificationQrCodeItem.kt | 10 +- .../BottomSheetVerificationWaitingItem.kt | 8 +- .../VerificationQRWaitingController.kt | 14 +- .../VerificationQRWaitingFragment.kt | 10 +- .../VerificationQrScannedByOtherController.kt | 18 +- .../VerificationQrScannedByOtherFragment.kt | 14 +- .../request/VerificationRequestController.kt | 22 +-- .../request/VerificationRequestFragment.kt | 14 +- .../features/disclaimer/DisclaimerDialog.kt | 8 +- .../discovery/DiscoverySettingsAction.kt | 4 +- .../discovery/DiscoverySettingsController.kt | 18 +- .../discovery/DiscoverySettingsFragment.kt | 22 +-- .../discovery/DiscoverySettingsState.kt | 2 +- .../discovery/DiscoverySettingsViewEvents.kt | 4 +- .../discovery/DiscoverySettingsViewModel.kt | 6 +- .../discovery/DiscoverySharedViewModel.kt | 6 +- .../DiscoverySharedViewModelAction.kt | 2 +- .../features/discovery/PidInfo.kt | 2 +- .../features/discovery/SettingsButtonItem.kt | 16 +- .../discovery/SettingsContinueCancelItem.kt | 6 +- .../discovery/SettingsEditTextItem.kt | 8 +- .../features/discovery/SettingsInfoItem.kt | 8 +- .../discovery/SettingsInformationItem.kt | 8 +- .../features/discovery/SettingsItem.kt | 8 +- .../discovery/SettingsProgressItem.kt | 6 +- .../discovery/SettingsSectionTitleItem.kt | 8 +- .../SettingsTextButtonSingleLineItem.kt | 26 +-- .../change/SetIdentityServerAction.kt | 4 +- .../change/SetIdentityServerFragment.kt | 20 +- .../change/SetIdentityServerState.kt | 2 +- .../change/SetIdentityServerViewEvents.kt | 4 +- .../change/SetIdentityServerViewModel.kt | 14 +- .../features/form/FormEditTextItem.kt | 10 +- .../form/FormEditTextWithButtonItem.kt | 10 +- .../features/form/FormSwitchItem.kt | 10 +- .../features/grouplist/GroupListAction.kt | 4 +- .../features/grouplist/GroupListFragment.kt | 18 +- .../features/grouplist/GroupListViewEvents.kt | 4 +- .../features/grouplist/GroupListViewModel.kt | 8 +- .../features/grouplist/GroupListViewState.kt | 2 +- .../grouplist/GroupSummaryController.kt | 4 +- .../features/grouplist/GroupSummaryItem.kt | 12 +- .../grouplist/SelectedGroupDataSource.kt | 4 +- .../features/home/AvatarRenderer.kt | 14 +- .../features/home/HomeActivity.kt | 44 ++--- .../features/home/HomeActivitySharedAction.kt | 4 +- .../features/home/HomeActivityViewActions.kt | 4 +- .../features/home/HomeActivityViewEvents.kt | 4 +- .../features/home/HomeActivityViewModel.kt | 12 +- .../features/home/HomeActivityViewState.kt | 2 +- .../features/home/HomeDetailAction.kt | 4 +- .../features/home/HomeDetailFragment.kt | 46 ++--- .../features/home/HomeDetailViewModel.kt | 14 +- .../features/home/HomeDetailViewState.kt | 2 +- .../features/home/HomeDrawerFragment.kt | 12 +- .../features/home/HomeModule.kt | 6 +- .../features/home/HomeRoomListDataSource.kt | 4 +- .../home/HomeSharedActionViewModel.kt | 4 +- .../features/home/LoadingFragment.kt | 6 +- .../{riotx => app}/features/home/RoomColor.kt | 4 +- .../features/home/RoomListDisplayMode.kt | 4 +- .../features/home/ShortcutsHandler.kt | 8 +- .../UnknownDeviceDetectorSharedViewModel.kt | 10 +- .../room/breadcrumbs/BreadcrumbsAnimator.kt | 2 +- .../room/breadcrumbs/BreadcrumbsController.kt | 8 +- .../room/breadcrumbs/BreadcrumbsFragment.kt | 14 +- .../home/room/breadcrumbs/BreadcrumbsItem.kt | 12 +- .../room/breadcrumbs/BreadcrumbsViewModel.kt | 8 +- .../room/breadcrumbs/BreadcrumbsViewState.kt | 2 +- .../home/room/detail/AutoCompleter.kt | 28 +-- .../JumpToBottomViewVisibilityManager.kt | 4 +- .../home/room/detail/RoomDetailAction.kt | 4 +- .../home/room/detail/RoomDetailActivity.kt | 24 +-- .../home/room/detail/RoomDetailFragment.kt | 174 +++++++++--------- .../room/detail/RoomDetailSharedAction.kt | 4 +- .../detail/RoomDetailSharedActionViewModel.kt | 4 +- .../home/room/detail/RoomDetailViewEvents.kt | 6 +- .../home/room/detail/RoomDetailViewModel.kt | 36 ++-- .../home/room/detail/RoomDetailViewState.kt | 2 +- .../detail/RoomMessageTouchHelperCallback.kt | 2 +- .../ScrollOnHighlightedEventCallback.kt | 6 +- .../room/detail/ScrollOnNewMessageCallback.kt | 8 +- .../room/detail/composer/ComposerEditText.kt | 8 +- .../room/detail/composer/TextComposerView.kt | 4 +- .../composer/rainbow/RainbowGenerator.kt | 4 +- .../room/detail/composer/rainbow/RgbColor.kt | 2 +- .../readreceipts/DisplayReadReceiptItem.kt | 8 +- .../DisplayReadReceiptsBottomSheet.kt | 18 +- .../DisplayReadReceiptsController.kt | 10 +- .../sticker/StickerPickerActionHandler.kt | 4 +- .../detail/timeline/MessageColorProvider.kt | 10 +- .../timeline/TimelineEventController.kt | 50 ++--- .../TimelineEventControllerHandler.kt | 2 +- .../timeline/action/EventSharedAction.kt | 8 +- .../timeline/action/MessageActionState.kt | 6 +- .../timeline/action/MessageActionsAction.kt | 4 +- .../timeline/action/MessageActionsAnimator.kt | 2 +- .../action/MessageActionsBottomSheet.kt | 14 +- .../action/MessageActionsEpoxyController.kt | 30 +-- .../action/MessageActionsViewModel.kt | 24 +-- .../action/MessageSharedActionViewModel.kt | 4 +- .../action/TimelineEventFragmentArgs.kt | 4 +- .../animation/TimelineItemAnimator.kt | 2 +- .../edithistory/ViewEditHistoryBottomSheet.kt | 18 +- .../ViewEditHistoryEpoxyController.kt | 18 +- .../edithistory/ViewEditHistoryViewModel.kt | 12 +- .../timeline/factory/DefaultItemFactory.kt | 20 +- .../timeline/factory/EncryptedItemFactory.kt | 26 +-- .../timeline/factory/EncryptionItemFactory.kt | 20 +- .../factory/MergedHeaderItemFactory.kt | 36 ++-- .../timeline/factory/MessageItemFactory.kt | 78 ++++---- .../timeline/factory/NoticeItemFactory.kt | 16 +- .../timeline/factory/RoomCreateItemFactory.kt | 14 +- .../timeline/factory/TimelineItemFactory.kt | 10 +- .../factory/VerificationItemFactory.kt | 24 +-- .../format/DisplayableEventFormatter.kt | 10 +- .../timeline/format/NoticeEventFormatter.kt | 8 +- .../format/RoomHistoryVisibilityFormatter.kt | 6 +- .../timeline/helper/AvatarSizeProvider.kt | 4 +- .../ContentDownloadStateTrackerBinder.kt | 14 +- .../helper/ContentUploadStateTrackerBinder.kt | 14 +- .../helper/MessageInformationDataFactory.kt | 20 +- .../helper/MessageItemAttributesFactory.kt | 16 +- .../timeline/helper/RoomSummaryHolder.kt | 4 +- .../timeline/helper/TimelineAsyncHelper.kt | 2 +- .../helper/TimelineDisplayableEvents.kt | 4 +- .../helper/TimelineEventDiffUtilCallback.kt | 2 +- .../helper/TimelineMediaSizeProvider.kt | 4 +- ...TimelineVisibilityStateChangedListeners.kt | 6 +- .../timeline/item/AbsBaseMessageItem.kt | 14 +- .../detail/timeline/item/AbsMessageItem.kt | 12 +- .../detail/timeline/item/BaseEventItem.kt | 14 +- .../detail/timeline/item/BasedMergedItem.kt | 8 +- .../room/detail/timeline/item/BlankItem.kt | 8 +- .../detail/timeline/item/DaySeparatorItem.kt | 6 +- .../room/detail/timeline/item/DefaultItem.kt | 10 +- .../timeline/item/EventItemAttributes.kt | 2 +- .../item/MergedMembershipEventsItem.kt | 8 +- .../timeline/item/MergedRoomCreationItem.kt | 8 +- .../detail/timeline/item/MergedUTDItem.kt | 8 +- .../timeline/item/MessageBlockCodeItem.kt | 6 +- .../detail/timeline/item/MessageFileItem.kt | 8 +- .../timeline/item/MessageImageVideoItem.kt | 10 +- .../timeline/item/MessageInformationData.kt | 2 +- .../timeline/item/MessageOptionsItem.kt | 10 +- .../detail/timeline/item/MessagePollItem.kt | 12 +- .../detail/timeline/item/MessageTextItem.kt | 6 +- .../room/detail/timeline/item/NoticeItem.kt | 14 +- .../timeline/item/PollResultLineView.kt | 6 +- .../timeline/item/RedactedMessageItem.kt | 4 +- .../detail/timeline/item/RoomCreateItem.kt | 8 +- .../timeline/item/StatusTileTimelineItem.kt | 10 +- .../timeline/item/TimelineReadMarkerItem.kt | 8 +- .../timeline/item/VerificationRequestItem.kt | 16 +- .../reactions/ReactionInfoSimpleItem.kt | 6 +- .../reactions/ViewReactionsBottomSheet.kt | 20 +- .../reactions/ViewReactionsEpoxyController.kt | 12 +- .../reactions/ViewReactionsViewModel.kt | 12 +- .../timeline/tools/EventRenderingTools.kt | 12 +- .../detail/widget/RoomWidgetController.kt | 2 +- .../home/room/detail/widget/RoomWidgetItem.kt | 10 +- .../detail/widget/RoomWidgetsBannerView.kt | 4 +- .../detail/widget/RoomWidgetsBottomSheet.kt | 20 +- .../room/detail/widget/WidgetRequestCodes.kt | 2 +- .../room/filtered/FilteredRoomFooterItem.kt | 10 +- .../room/filtered/FilteredRoomsActivity.kt | 16 +- .../room/list/AlphabeticalRoomComparator.kt | 2 +- .../room/list/BreadcrumbsRoomComparator.kt | 2 +- .../room/list/ChronologicalRoomComparator.kt | 2 +- .../home/room/list/RoomCategoryItem.kt | 10 +- .../home/room/list/RoomInvitationItem.kt | 16 +- .../features/home/room/list/RoomListAction.kt | 4 +- .../home/room/list/RoomListAnimator.kt | 2 +- .../room/list/RoomListDisplayModeFilter.kt | 4 +- .../home/room/list/RoomListFragment.kt | 30 +-- .../features/home/room/list/RoomListModule.kt | 2 +- .../home/room/list/RoomListNameFilter.kt | 2 +- .../home/room/list/RoomListViewEvents.kt | 4 +- .../home/room/list/RoomListViewModel.kt | 8 +- .../room/list/RoomListViewModelFactory.kt | 4 +- .../home/room/list/RoomListViewState.kt | 6 +- .../home/room/list/RoomSummaryController.kt | 16 +- .../home/room/list/RoomSummaryFormatter.kt | 2 +- .../home/room/list/RoomSummaryItem.kt | 14 +- .../home/room/list/RoomSummaryItemFactory.kt | 22 +-- .../home/room/list/UnreadCounterBadgeView.kt | 6 +- .../RoomListQuickActionsBottomSheet.kt | 14 +- .../RoomListQuickActionsEpoxyController.kt | 12 +- .../RoomListQuickActionsSharedAction.kt | 6 +- ...omListQuickActionsSharedActionViewModel.kt | 4 +- .../list/actions/RoomListQuickActionsState.kt | 2 +- .../actions/RoomListQuickActionsViewModel.kt | 8 +- .../home/room/list/widget/FabMenuView.kt | 6 +- .../features/home/room/typing/TypingHelper.kt | 6 +- .../HomeServerCapabilitiesViewModel.kt | 10 +- .../HomeServerCapabilitiesViewState.kt | 2 +- .../homeserver/ServerUrlsRepository.kt | 4 +- .../features/html/CodeVisitor.kt | 2 +- .../features/html/EventHtmlRenderer.kt | 10 +- .../features/html/FontTagHandler.kt | 2 +- .../features/html/MxLinkTagHandler.kt | 8 +- .../features/html/MxReplyTagHandler.kt | 2 +- .../features/html/PillImageSpan.kt | 8 +- .../features/html/SpanHandler.kt | 4 +- .../features/html/SpoilerSpan.kt | 6 +- .../features/html/VectorHtmlCompressor.kt | 2 +- .../invite/InviteButtonStateBinder.kt | 4 +- .../invite/InviteUsersToRoomAction.kt | 6 +- .../invite/InviteUsersToRoomActivity.kt | 44 ++--- .../invite/InviteUsersToRoomViewEvents.kt | 4 +- .../invite/InviteUsersToRoomViewModel.kt | 10 +- .../invite/InviteUsersToRoomViewState.kt | 2 +- .../features/invite/VectorInviteView.kt | 10 +- .../VectorActivityLifecycleCallbacks.kt | 4 +- .../features/link/LinkHandlerActivity.kt | 16 +- .../features/login/AbstractLoginFragment.kt | 12 +- .../{riotx => app}/features/login/Config.kt | 2 +- .../HomeServerConnectionConfigFactory.kt | 2 +- .../features/login/JavascriptResponse.kt | 2 +- .../features/login/LoginAction.kt | 4 +- .../features/login/LoginActivity.kt | 28 +-- .../features/login/LoginCaptchaFragment.kt | 6 +- .../features/login/LoginConfig.kt | 2 +- .../features/login/LoginFragment.kt | 12 +- .../LoginGenericTextInputFormFragment.kt | 10 +- .../features/login/LoginMode.kt | 2 +- .../login/LoginResetPasswordFragment.kt | 12 +- ...inResetPasswordMailConfirmationFragment.kt | 4 +- .../LoginResetPasswordSuccessFragment.kt | 4 +- .../login/LoginServerSelectionFragment.kt | 6 +- .../login/LoginServerUrlFormFragment.kt | 10 +- .../LoginSignUpSignInSelectionFragment.kt | 6 +- .../login/LoginSignUpSignInSsoFragment.kt | 6 +- .../features/login/LoginSplashFragment.kt | 4 +- .../features/login/LoginViewEvents.kt | 4 +- .../features/login/LoginViewModel.kt | 18 +- .../features/login/LoginViewState.kt | 4 +- .../login/LoginWaitForEmailFragment.kt | 4 +- .../features/login/LoginWebFragment.kt | 12 +- .../features/login/ReAuthHelper.kt | 4 +- .../features/login/ServerType.kt | 2 +- .../{riotx => app}/features/login/SignMode.kt | 2 +- .../features/login/SupportedStage.kt | 2 +- .../LocalizedFlowDataLoginTermsChecked.kt | 2 +- .../login/terms/LoginTermsFragment.kt | 18 +- .../login/terms/LoginTermsViewState.kt | 2 +- .../features/login/terms/PolicyController.kt | 2 +- .../features/login/terms/PolicyItem.kt | 6 +- .../features/login/terms/UrlAndName.kt | 2 +- .../features/login/terms/converter.kt | 2 +- .../features/media/AttachmentOverlayView.kt | 4 +- .../features/media/BaseAttachmentProvider.kt | 2 +- .../features/media/BigImageViewerActivity.kt | 22 +-- .../media/DataAttachmentRoomProvider.kt | 6 +- .../media/DefaultImageLoaderCallback.kt | 2 +- .../features/media/ImageContentRenderer.kt | 16 +- .../media/ImageMediaViewerActivity.kt | 16 +- .../media/RoomEventsAttachmentProvider.kt | 6 +- .../features/media/UCropHelper.kt | 6 +- .../media/VectorAttachmentViewerActivity.kt | 22 +-- .../features/media/VideoContentRenderer.kt | 8 +- .../media/VideoMediaViewerActivity.kt | 14 +- .../features/navigation/DefaultNavigator.kt | 72 ++++---- .../features/navigation/Navigator.kt | 16 +- .../features/notifications/BitmapLoader.kt | 2 +- .../features/notifications/IconLoader.kt | 2 +- .../notifications/InviteNotifiableEvent.kt | 2 +- .../features/notifications/NotifiableEvent.kt | 2 +- .../notifications/NotifiableEventResolver.kt | 12 +- .../notifications/NotifiableMessageEvent.kt | 2 +- .../notifications/NotificationAction.kt | 2 +- .../NotificationBroadcastReceiver.kt | 8 +- .../NotificationDrawerManager.kt | 12 +- .../notifications/NotificationUtils.kt | 24 +-- .../notifications/OutdatedEventDetector.kt | 4 +- .../notifications/PushRuleTriggerListener.kt | 2 +- .../notifications/RoomEventGroupInfo.kt | 2 +- .../notifications/SimpleNotifiableEvent.kt | 2 +- .../features/permalink/PermalinkHandler.kt | 6 +- .../permalink/PermalinkHandlerActivity.kt | 18 +- .../features/pin/PinActivity.kt | 10 +- .../features/pin/PinCodeStore.kt | 2 +- .../features/pin/PinFragment.kt | 12 +- .../{riotx => app}/features/pin/PinLocker.kt | 2 +- .../{riotx => app}/features/pin/PinMode.kt | 2 +- .../features/pin/UnlockedActivity.kt | 2 +- .../features/popup/PopupAlertManager.kt | 12 +- .../features/popup/VectorAlert.kt | 2 +- .../PowerLevelsObservableFactory.kt | 2 +- .../features/qrcode/QrCodeScannerActivity.kt | 10 +- .../features/qrcode/QrCodeScannerFragment.kt | 6 +- .../features/rageshake/BugReportActivity.kt | 8 +- .../features/rageshake/BugReporter.kt | 22 +-- .../rageshake/BugReporterMultipartBody.java | 2 +- .../features/rageshake/RageShake.kt | 12 +- .../features/rageshake/VectorFileLogger.kt | 4 +- .../VectorUncaughtExceptionHandler.kt | 6 +- .../reactions/EmojiChooserFragment.kt | 8 +- .../reactions/EmojiChooserViewModel.kt | 4 +- .../features/reactions/EmojiDrawView.kt | 2 +- .../reactions/EmojiReactionPickerActivity.kt | 14 +- .../reactions/EmojiRecyclerAdapter.kt | 6 +- .../features/reactions/EmojiSearchAction.kt | 4 +- .../reactions/EmojiSearchResultController.kt | 10 +- .../reactions/EmojiSearchResultFragment.kt | 12 +- .../reactions/EmojiSearchResultItem.kt | 10 +- .../reactions/EmojiSearchResultViewModel.kt | 10 +- .../reactions/ReactionClickListener.kt | 2 +- .../features/reactions/data/EmojiCategory.kt | 2 +- .../features/reactions/data/EmojiData.kt | 2 +- .../reactions/data/EmojiDataSource.kt | 4 +- .../features/reactions/data/EmojiItem.kt | 2 +- .../features/reactions/widget/CircleView.kt | 2 +- .../features/reactions/widget/DotsView.kt | 2 +- .../reactions/widget/ReactionButton.kt | 10 +- .../room/RequireActiveMembershipAction.kt | 4 +- .../room/RequireActiveMembershipViewEvents.kt | 4 +- .../room/RequireActiveMembershipViewModel.kt | 10 +- .../room/RequireActiveMembershipViewState.kt | 6 +- .../features/roomdirectory/JoinState.kt | 2 +- .../features/roomdirectory/PublicRoomItem.kt | 14 +- .../roomdirectory/PublicRoomsController.kt | 16 +- .../roomdirectory/PublicRoomsFragment.kt | 14 +- .../roomdirectory/PublicRoomsViewState.kt | 2 +- .../roomdirectory/RoomDirectoryAction.kt | 4 +- .../roomdirectory/RoomDirectoryActivity.kt | 20 +- .../RoomDirectorySharedAction.kt | 4 +- .../RoomDirectorySharedActionViewModel.kt | 4 +- .../roomdirectory/RoomDirectoryViewEvents.kt | 4 +- .../roomdirectory/RoomDirectoryViewModel.kt | 4 +- .../createroom/CreateRoomAction.kt | 4 +- .../createroom/CreateRoomActivity.kt | 16 +- .../createroom/CreateRoomController.kt | 16 +- .../createroom/CreateRoomFragment.kt | 14 +- .../createroom/CreateRoomViewModel.kt | 8 +- .../createroom/CreateRoomViewState.kt | 2 +- .../roomdirectory/picker/RoomDirectoryItem.kt | 12 +- .../picker/RoomDirectoryListCreator.kt | 6 +- .../picker/RoomDirectoryPickerAction.kt | 4 +- .../picker/RoomDirectoryPickerController.kt | 12 +- .../picker/RoomDirectoryPickerFragment.kt | 20 +- .../picker/RoomDirectoryPickerViewModel.kt | 6 +- .../picker/RoomDirectoryPickerViewState.kt | 2 +- .../roompreview/RoomPreviewAction.kt | 4 +- .../roompreview/RoomPreviewActivity.kt | 10 +- .../RoomPreviewNoPreviewFragment.kt | 14 +- .../roompreview/RoomPreviewViewModel.kt | 10 +- .../roompreview/RoomPreviewViewState.kt | 4 +- .../RoomMemberProfileAction.kt | 4 +- .../RoomMemberProfileActivity.kt | 18 +- .../RoomMemberProfileController.kt | 14 +- .../RoomMemberProfileFragment.kt | 32 ++-- .../RoomMemberProfileViewEvents.kt | 4 +- .../RoomMemberProfileViewModel.kt | 10 +- .../RoomMemberProfileViewState.kt | 2 +- .../devices/DeviceListAction.kt | 4 +- .../devices/DeviceListBottomSheet.kt | 14 +- .../DeviceListBottomSheetViewEvents.kt | 4 +- .../devices/DeviceListBottomSheetViewModel.kt | 8 +- .../devices/DeviceListEpoxyController.kt | 24 +-- .../devices/DeviceListFragment.kt | 12 +- .../devices/DeviceTrustInfoActionFragment.kt | 12 +- .../devices/DeviceTrustInfoEpoxyController.kt | 22 +-- .../powerlevel/EditPowerLevelDialogs.kt | 6 +- .../features/roomprofile/RoomProfileAction.kt | 4 +- .../roomprofile/RoomProfileActivity.kt | 28 +-- .../roomprofile/RoomProfileController.kt | 16 +- .../roomprofile/RoomProfileFragment.kt | 48 ++--- .../roomprofile/RoomProfileSharedAction.kt | 4 +- .../RoomProfileSharedActionViewModel.kt | 4 +- .../roomprofile/RoomProfileViewEvents.kt | 4 +- .../roomprofile/RoomProfileViewModel.kt | 10 +- .../roomprofile/RoomProfileViewState.kt | 2 +- .../banned/RoomBannedListMemberAction.kt | 4 +- .../banned/RoomBannedListMemberViewModel.kt | 10 +- .../banned/RoomBannedMemberListController.kt | 20 +- .../banned/RoomBannedMemberListFragment.kt | 16 +- .../banned/RoomBannedMemberListViewState.kt | 4 +- .../banned/RoomBannedViewEvents.kt | 4 +- .../members/RoomMemberListAction.kt | 4 +- .../members/RoomMemberListController.kt | 18 +- .../members/RoomMemberListFragment.kt | 14 +- .../members/RoomMemberListViewModel.kt | 10 +- .../members/RoomMemberListViewState.kt | 6 +- .../members/RoomMemberSummaryComparator.kt | 2 +- .../settings/RoomSettingsAction.kt | 4 +- .../settings/RoomSettingsController.kt | 16 +- .../settings/RoomSettingsFragment.kt | 20 +- .../settings/RoomSettingsViewEvents.kt | 4 +- .../settings/RoomSettingsViewModel.kt | 8 +- .../settings/RoomSettingsViewState.kt | 4 +- .../roomprofile/uploads/RoomUploadsAction.kt | 4 +- .../uploads/RoomUploadsFragment.kt | 22 +-- .../uploads/RoomUploadsPagerAdapter.kt | 6 +- .../uploads/RoomUploadsViewEvents.kt | 4 +- .../uploads/RoomUploadsViewModel.kt | 6 +- .../uploads/RoomUploadsViewState.kt | 4 +- .../uploads/files/RoomUploadsFilesFragment.kt | 18 +- .../uploads/files/UploadsFileController.kt | 12 +- .../uploads/files/UploadsFileItem.kt | 10 +- .../roomprofile/uploads/media/Config.kt | 2 +- .../uploads/media/RoomUploadsMediaFragment.kt | 28 +-- .../uploads/media/UploadsImageItem.kt | 12 +- .../uploads/media/UploadsMediaController.kt | 16 +- .../uploads/media/UploadsVideoItem.kt | 14 +- .../features/session/SessionListener.kt | 6 +- .../features/settings/FontScale.kt | 4 +- .../features/settings/VectorLocale.kt | 6 +- .../features/settings/VectorPreferences.kt | 10 +- .../settings/VectorSettingsActivity.kt | 12 +- ...sAdvancedNotificationPreferenceFragment.kt | 10 +- .../VectorSettingsAdvancedSettingsFragment.kt | 10 +- .../settings/VectorSettingsBaseFragment.kt | 16 +- .../settings/VectorSettingsFlairFragment.kt | 6 +- ...ctorSettingsFragmentInteractionListener.kt | 2 +- .../settings/VectorSettingsGeneralFragment.kt | 44 ++--- .../VectorSettingsHelpAboutFragment.kt | 16 +- .../settings/VectorSettingsLabsFragment.kt | 6 +- ...rSettingsNotificationPreferenceFragment.kt | 16 +- ...ttingsNotificationsTroubleshootFragment.kt | 18 +- .../VectorSettingsPreferencesFragment.kt | 14 +- .../settings/VectorSettingsRootFragment.kt | 4 +- .../VectorSettingsSecurityPrivacyFragment.kt | 46 ++--- .../features/settings/VectorSettingsUrls.kt | 2 +- .../VectorSettingsVoiceVideoFragment.kt | 14 +- .../deactivation/DeactivateAccountFragment.kt | 18 +- .../DeactivateAccountViewEvents.kt | 4 +- .../DeactivateAccountViewModel.kt | 8 +- .../CrossSigningSettingsAction.kt | 4 +- .../CrossSigningSettingsController.kt | 16 +- .../CrossSigningSettingsFragment.kt | 14 +- .../CrossSigningSettingsViewEvents.kt | 4 +- .../CrossSigningSettingsViewModel.kt | 6 +- .../CrossSigningSettingsViewState.kt | 2 +- .../features/settings/devices/DeviceItem.kt | 12 +- .../DeviceVerificationInfoBottomSheet.kt | 12 +- ...iceVerificationInfoBottomSheetViewModel.kt | 8 +- .../DeviceVerificationInfoEpoxyController.kt | 20 +- .../settings/devices/DevicesAction.kt | 4 +- .../settings/devices/DevicesController.kt | 20 +- .../settings/devices/DevicesViewEvents.kt | 4 +- .../settings/devices/DevicesViewModel.kt | 4 +- .../features/settings/devices/TrustUtils.kt | 4 +- .../devices/VectorSettingsDevicesFragment.kt | 20 +- .../devtools/AccountDataEpoxyController.kt | 14 +- .../settings/devtools/AccountDataFragment.kt | 16 +- .../settings/devtools/AccountDataViewModel.kt | 8 +- .../GossipingEventsEpoxyController.kt | 24 +-- .../GossipingEventsPaperTrailFragment.kt | 14 +- .../GossipingEventsPaperTrailViewModel.kt | 8 +- .../IncomingKeyRequestListFragment.kt | 12 +- .../devtools/KeyRequestEpoxyController.kt | 16 +- .../devtools/KeyRequestListViewModel.kt | 8 +- .../settings/devtools/KeyRequestsFragment.kt | 8 +- .../OutgoingKeyRequestListFragment.kt | 12 +- .../ignored/IgnoredUsersController.kt | 10 +- .../ignored/IgnoredUsersViewEvents.kt | 4 +- .../settings/ignored/IgnoredUsersViewModel.kt | 6 +- .../features/settings/ignored/UserItem.kt | 12 +- .../VectorSettingsIgnoredUsersFragment.kt | 14 +- .../features/settings/locale/LocaleItem.kt | 14 +- .../settings/locale/LocalePickerAction.kt | 4 +- .../settings/locale/LocalePickerController.kt | 16 +- .../settings/locale/LocalePickerFragment.kt | 16 +- .../settings/locale/LocalePickerViewEvents.kt | 4 +- .../settings/locale/LocalePickerViewModel.kt | 8 +- .../settings/locale/LocalePickerViewState.kt | 4 +- .../settings/locale/SystemLocaleProvider.kt | 2 +- .../settings/push/PushGateWayController.kt | 8 +- .../settings/push/PushGatewayAction.kt | 4 +- .../features/settings/push/PushGatewayItem.kt | 6 +- .../settings/push/PushGatewaysFragment.kt | 12 +- .../settings/push/PushGatewaysViewModel.kt | 8 +- .../features/settings/push/PushRuleItem.kt | 8 +- .../settings/push/PushRulesFragment.kt | 16 +- .../settings/push/PushRulesViewModel.kt | 10 +- ...ficationTroubleshootRecyclerViewAdapter.kt | 6 +- .../NotificationTroubleshootTestManager.kt | 2 +- .../troubleshoot/TestAccountSettings.kt | 8 +- .../troubleshoot/TestDeviceSettings.kt | 8 +- .../troubleshoot/TestPushRulesSettings.kt | 10 +- .../troubleshoot/TestSystemSettings.kt | 8 +- .../settings/troubleshoot/TroubleshootTest.kt | 2 +- .../features/share/IncomingShareAction.kt | 4 +- .../features/share/IncomingShareActivity.kt | 10 +- .../features/share/IncomingShareController.kt | 12 +- .../features/share/IncomingShareFragment.kt | 30 +-- .../features/share/IncomingShareViewEvents.kt | 4 +- .../features/share/IncomingShareViewModel.kt | 14 +- .../features/share/IncomingShareViewState.kt | 2 +- .../features/share/SharedData.kt | 2 +- .../signout/hard/SignedOutActivity.kt | 10 +- .../features/signout/soft/SoftLogoutAction.kt | 4 +- .../signout/soft/SoftLogoutActivity.kt | 16 +- .../signout/soft/SoftLogoutController.kt | 28 +-- .../signout/soft/SoftLogoutFragment.kt | 20 +- .../signout/soft/SoftLogoutViewEvents.kt | 4 +- .../signout/soft/SoftLogoutViewModel.kt | 10 +- .../signout/soft/SoftLogoutViewState.kt | 4 +- .../soft/epoxy/LoginCenterButtonItem.kt | 10 +- .../soft/epoxy/LoginErrorWithRetryItem.kt | 8 +- .../soft/epoxy/LoginPasswordFormItem.kt | 14 +- .../signout/soft/epoxy/LoginRedButtonItem.kt | 10 +- .../signout/soft/epoxy/LoginTextItem.kt | 10 +- .../signout/soft/epoxy/LoginTitleItem.kt | 10 +- .../signout/soft/epoxy/LoginTitleSmallItem.kt | 10 +- .../features/sync/widget/SyncStateView.kt | 6 +- .../features/terms/ReviewTermsAction.kt | 4 +- .../features/terms/ReviewTermsActivity.kt | 14 +- .../features/terms/ReviewTermsFragment.kt | 18 +- .../features/terms/ReviewTermsViewEvents.kt | 4 +- .../features/terms/ReviewTermsViewModel.kt | 6 +- .../features/terms/ReviewTermsViewState.kt | 2 +- .../features/terms/ServiceTermsArgs.kt | 2 +- .../{riotx => app}/features/terms/Term.kt | 2 +- .../{riotx => app}/features/terms/TermItem.kt | 6 +- .../features/terms/TermsController.kt | 12 +- .../features/themes/ActivityOtherThemes.kt | 4 +- .../features/themes/ThemeUtils.kt | 4 +- .../ui/SharedPreferencesUiStateRepository.kt | 6 +- .../features/ui/UiStateRepository.kt | 4 +- .../userdirectory/DirectoryUsersController.kt | 16 +- .../userdirectory/KnownUsersController.kt | 16 +- .../userdirectory/KnownUsersFragment.kt | 18 +- .../userdirectory/KnownUsersFragmentArgs.kt | 2 +- .../features/userdirectory/PendingInvitee.kt | 2 +- .../userdirectory/UserDirectoryAction.kt | 4 +- .../userdirectory/UserDirectoryFragment.kt | 16 +- .../UserDirectoryLetterHeaderItem.kt | 8 +- .../UserDirectorySharedAction.kt | 4 +- .../UserDirectorySharedActionViewModel.kt | 4 +- .../userdirectory/UserDirectoryUserItem.kt | 10 +- .../userdirectory/UserDirectoryViewEvents.kt | 4 +- .../userdirectory/UserDirectoryViewModel.kt | 12 +- .../userdirectory/UserDirectoryViewState.kt | 2 +- .../features/version/VersionProvider.kt | 6 +- .../webview/ConsentWebViewEventListener.kt | 6 +- .../webview/DefaultWebViewEventListener.kt | 2 +- .../features/webview/VectorWebViewActivity.kt | 8 +- .../features/webview/VectorWebViewClient.kt | 2 +- .../features/webview/WebViewEventListener.kt | 2 +- .../webview/WebViewEventListenerFactory.kt | 4 +- .../features/webview/WebViewMode.kt | 4 +- .../features/widgets/WidgetAPICallback.kt | 6 +- .../features/widgets/WidgetAction.kt | 4 +- .../features/widgets/WidgetActivity.kt | 20 +- .../features/widgets/WidgetArgsBuilder.kt | 4 +- .../features/widgets/WidgetFragment.kt | 20 +- .../features/widgets/WidgetPostAPIHandler.kt | 6 +- .../features/widgets/WidgetViewEvents.kt | 4 +- .../features/widgets/WidgetViewModel.kt | 8 +- .../features/widgets/WidgetViewState.kt | 4 +- .../RoomWidgetPermissionActions.kt | 4 +- .../RoomWidgetPermissionBottomSheet.kt | 14 +- .../RoomWidgetPermissionViewEvents.kt | 4 +- .../RoomWidgetPermissionViewModel.kt | 6 +- .../RoomWidgetPermissionViewState.kt | 4 +- .../permissions/WidgetPermissionsHelper.kt | 2 +- .../widgets/webview/WebviewPermissionUtils.kt | 4 +- .../features/widgets/webview/WidgetWebView.kt | 10 +- .../signout/ServerBackupStatusViewModel.kt | 8 +- .../SignOutBottomSheetDialogFragment.kt | 16 +- .../workers/signout/SignOutUiWorker.kt | 14 +- .../signout/SignoutBottomSheetActionButton.kt | 8 +- .../workers/signout/SignoutCheckViewModel.kt | 12 +- vector/src/main/res/layout/activity_call.xml | 2 +- .../layout/activity_emoji_reaction_picker.xml | 2 +- .../res/layout/activity_vector_web_view.xml | 2 +- .../res/layout/bottom_sheet_call_controls.xml | 6 +- .../layout/bottom_sheet_logout_and_backup.xml | 10 +- ...constraint_set_composer_layout_compact.xml | 2 +- ...onstraint_set_composer_layout_expanded.xml | 2 +- .../res/layout/emoji_chooser_fragment.xml | 2 +- .../layout/fragment_bootstrap_conclusion.xml | 2 +- .../fragment_bootstrap_enter_passphrase.xml | 2 +- .../layout/fragment_bootstrap_save_key.xml | 6 +- .../fragment_bootstrap_setup_recovery.xml | 6 +- .../layout/fragment_create_direct_room.xml | 4 +- .../fragment_generic_state_view_recycler.xml | 4 +- .../main/res/layout/fragment_group_list.xml | 4 +- .../main/res/layout/fragment_home_detail.xml | 6 +- .../fragment_keys_backup_setup_step2.xml | 2 +- .../main/res/layout/fragment_known_users.xml | 4 +- .../fragment_login_server_selection.xml | 4 +- .../main/res/layout/fragment_room_detail.xml | 16 +- .../main/res/layout/fragment_room_list.xml | 6 +- .../fragment_room_preview_no_preview.xml | 2 +- .../src/main/res/layout/grid_item_emoji.xml | 2 +- .../item_attachment_miniature_preview.xml | 2 +- .../src/main/res/layout/item_breadcrumbs.xml | 2 +- vector/src/main/res/layout/item_group.xml | 4 +- .../src/main/res/layout/item_public_room.xml | 2 +- vector/src/main/res/layout/item_room.xml | 2 +- .../main/res/layout/item_room_category.xml | 2 +- .../main/res/layout/item_room_invitation.xml | 4 +- .../res/layout/item_timeline_event_base.xml | 4 +- .../item_timeline_event_base_noinfo.xml | 4 +- .../layout/item_timeline_event_base_state.xml | 4 +- .../layout/item_timeline_event_poll_stub.xml | 10 +- .../res/layout/item_verification_qr_code.xml | 2 +- .../main/res/layout/merge_composer_layout.xml | 2 +- .../src/main/res/layout/reaction_button.xml | 4 +- .../vector_home_badge_unread_layout.xml | 2 +- .../main/res/layout/vector_invite_view.xml | 4 +- .../view_stub_room_member_profile_header.xml | 4 +- .../xml/vector_settings_advanced_settings.xml | 34 ++-- .../main/res/xml/vector_settings_flair.xml | 2 +- .../main/res/xml/vector_settings_general.xml | 60 +++--- .../res/xml/vector_settings_help_about.xml | 18 +- .../src/main/res/xml/vector_settings_labs.xml | 8 +- ...ings_notification_advanced_preferences.xml | 26 +-- .../res/xml/vector_settings_notifications.xml | 28 +-- .../res/xml/vector_settings_preferences.xml | 66 +++---- .../src/main/res/xml/vector_settings_root.xml | 36 ++-- .../xml/vector_settings_security_privacy.xml | 50 ++--- .../res/xml/vector_settings_voice_video.xml | 12 +- .../{riotx => app}/test/shared/TestRules.kt | 2 +- .../features/home/UserColorTest.kt | 6 +- .../composer/rainbow/RainbowGeneratorTest.kt | 4 +- .../vector/{riotx => app}/test/Extensions.kt | 2 +- 981 files changed, 4434 insertions(+), 4426 deletions(-) rename vector/src/androidTest/java/im/vector/{riotx => app}/InstrumentedTest.kt (91%) rename vector/src/androidTest/java/im/vector/{riotx => app}/core/utils/TemporaryStoreTest.kt (96%) rename vector/src/androidTest/java/im/vector/{riotx => app}/features/reactions/data/EmojiDataSourceTest.kt (97%) rename vector/src/debug/java/im/vector/{riotx => app}/features/debug/DebugMaterialThemeActivity.kt (95%) rename vector/src/debug/java/im/vector/{riotx => app}/features/debug/DebugMaterialThemeDarkActivity.kt (94%) rename vector/src/debug/java/im/vector/{riotx => app}/features/debug/DebugMaterialThemeLightActivity.kt (94%) rename vector/src/debug/java/im/vector/{riotx => app}/features/debug/DebugMenuActivity.kt (93%) rename vector/src/debug/java/im/vector/{riotx => app}/features/debug/TestLinkifyActivity.kt (98%) rename vector/src/debug/java/im/vector/{riotx => app}/features/debug/sas/DebugSasEmojiActivity.kt (88%) rename vector/src/debug/java/im/vector/{riotx => app}/features/debug/sas/SasEmojiController.kt (96%) rename vector/src/debug/java/im/vector/{riotx => app}/features/debug/sas/SasEmojiItem.kt (77%) rename vector/src/debug/java/im/vector/{riotx => app}/receivers/DebugReceiver.kt (97%) rename vector/src/fdroid/java/im/vector/{riotx => app}/FlavorCode.kt (96%) rename vector/src/fdroid/java/im/vector/{riotx => app}/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt (86%) rename vector/src/fdroid/java/im/vector/{riotx => app}/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt (94%) rename vector/src/fdroid/java/im/vector/{riotx => app}/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt (81%) rename vector/src/fdroid/java/im/vector/{riotx => app}/fdroid/package-info.kt (95%) rename vector/src/fdroid/java/im/vector/{riotx => app}/fdroid/receiver/AlarmSyncBroadcastReceiver.kt (96%) rename vector/src/fdroid/java/im/vector/{riotx => app}/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt (93%) rename vector/src/fdroid/java/im/vector/{riotx => app}/push/fcm/FcmHelper.kt (89%) rename vector/src/fdroid/java/im/vector/{riotx => app}/push/fcm/NotificationTroubleshootTestManagerFactory.kt (75%) rename vector/src/main/java/im/vector/{riotx => app}/ActiveSessionDataSource.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/AppStateHandler.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/EmojiCompatFontProvider.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/EmojiCompatWrapper.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/VectorApplication.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/core/animations/AppBarStateChangeListener.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/animations/Constants.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/core/animations/MatrixItemAppBarStateChangeListener.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/animations/SimpleAnimatorListener.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/animations/SimpleTransitionListener.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/animations/VectorFullTransitionSet.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/animations/behavior/PercentViewBehavior.kt (99%) rename vector/src/main/java/im/vector/{riotx => app}/core/contacts/ContactsDataSource.kt (99%) rename vector/src/main/java/im/vector/{riotx => app}/core/contacts/MappedContact.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/date/VectorDateFormatter.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/core/di/ActiveSessionHolder.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/core/di/AssistedInjectModule.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/di/FragmentKey.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/di/FragmentModule.kt (70%) rename vector/src/main/java/im/vector/{riotx => app}/core/di/HasScreenInjector.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/core/di/HasVectorInjector.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/core/di/ImageManager.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/core/di/ScreenComponent.kt (58%) rename vector/src/main/java/im/vector/{riotx => app}/core/di/ScreenModule.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/core/di/ScreenScope.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/core/di/VectorAssistedModule.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/core/di/VectorComponent.kt (60%) rename vector/src/main/java/im/vector/{riotx => app}/core/di/VectorFragmentFactory.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/di/VectorModule.kt (84%) rename vector/src/main/java/im/vector/{riotx => app}/core/di/VectorViewModelFactory.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/core/di/ViewModelKey.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/di/ViewModelModule.kt (75%) rename vector/src/main/java/im/vector/{riotx => app}/core/dialogs/ConfirmationDialogBuilder.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/dialogs/DialogLocker.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/core/dialogs/ExportKeysDialog.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/core/dialogs/Extensions.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/core/dialogs/ManuallyVerifyDialog.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/dialogs/PromptPasswordDialog.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/core/dialogs/UnrecognizedCertificateDialog.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/epoxy/DividerItem.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/core/epoxy/EmptyItem.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/core/epoxy/ErrorWithRetryItem.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/core/epoxy/HelpFooterItem.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/core/epoxy/LayoutManagerStateRestorer.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/core/epoxy/Listener.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/epoxy/LoadingItem.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/core/epoxy/NoResultItem.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/core/epoxy/SquareLoadingItem.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/core/epoxy/VectorEpoxyHolder.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/core/epoxy/VectorEpoxyModel.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/core/epoxy/ZeroItem.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/core/epoxy/attributes/ButtonStyle.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/core/epoxy/attributes/ButtonType.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/core/epoxy/attributes/IconMode.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/core/epoxy/bottomsheet/BottomSheetActionItem.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/core/epoxy/bottomsheet/BottomSheetQuickReactionsItem.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt (87%) rename vector/src/main/java/im/vector/{riotx => app}/core/epoxy/bottomsheet/BottomSheetSendStateItem.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/core/epoxy/profiles/BaseProfileMatrixItem.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/core/epoxy/profiles/ProfileActionItem.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/core/epoxy/profiles/ProfileItemExtensions.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/core/epoxy/profiles/ProfileMatrixItem.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/core/epoxy/profiles/ProfileMatrixItemWithProgress.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/core/epoxy/profiles/ProfileSectionItem.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/core/error/ErrorFormatter.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/core/error/ResourceLimitErrorFormatter.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/error/fatal.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/extensions/Activity.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/extensions/BasicExtensions.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/extensions/Collections.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/core/extensions/Context.kt (87%) rename vector/src/main/java/im/vector/{riotx => app}/core/extensions/EditText.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/core/extensions/Event.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/core/extensions/Exhaustive.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/core/extensions/Fragment.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/extensions/FragmentManager.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/extensions/Iterable.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/extensions/LiveData.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/core/extensions/RecyclerView.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/core/extensions/Session.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/extensions/Set.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/core/extensions/TextView.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/core/extensions/TimelineEvent.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/extensions/UrlExtensions.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/extensions/View.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/extensions/ViewExtensions.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/files/FileSaver.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/core/glide/ElementToDecryptOption.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/glide/FactoryUrl.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/core/glide/MyAppGlideModule.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/core/glide/VectorGlideModelLoader.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/hardware/HardwareInfo.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/hardware/vibrator.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/intent/ExternalIntentAnalyser.kt (99%) rename vector/src/main/java/im/vector/{riotx => app}/core/intent/Filename.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/intent/VectorMimeType.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/core/linkify/VectorAutoLinkPatterns.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/linkify/VectorLinkify.kt (99%) rename vector/src/main/java/im/vector/{riotx => app}/core/platform/BadgeFloatingActionButton.kt (99%) rename vector/src/main/java/im/vector/{riotx => app}/core/platform/ButtonStateView.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/core/platform/CheckableConstraintLayout.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/platform/CheckableFrameLayout.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/platform/CheckableImageView.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/platform/CheckableView.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/platform/ConfigurationViewModel.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/core/platform/DefaultListUpdateCallback.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/platform/MaxHeightScrollView.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/platform/OnBackPressed.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/core/platform/Restorable.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/core/platform/SimpleFragmentActivity.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/core/platform/SimpleTextWatcher.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/platform/StateView.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/platform/ToolbarConfigurable.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/core/platform/VectorBaseActivity.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/core/platform/VectorBaseBottomSheetDialogFragment.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/platform/VectorBaseFragment.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/platform/VectorEventViewModel.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/core/platform/VectorViewEvents.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/core/platform/VectorViewModel.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/core/platform/VectorViewModelAction.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/core/platform/ViewModelTask.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/platform/WaitingViewData.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/core/preference/AddressPreference.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/preference/ProgressBarPreference.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/core/preference/PushRulePreference.kt (99%) rename vector/src/main/java/im/vector/{riotx => app}/core/preference/RoomAvatarPreference.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/preference/UserAvatarPreference.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/core/preference/VectorEditTextPreference.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/preference/VectorGroupPreference.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/core/preference/VectorListPreference.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/core/preference/VectorPreference.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/preference/VectorPreferenceCategory.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/core/preference/VectorSwitchPreference.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/pushers/PushersManager.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/core/qrcode/QrCode.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/resources/AppNameProvider.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/resources/ColorProvider.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/core/resources/DateProvider.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/resources/DrawableProvider.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/core/resources/LocaleProvider.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/core/resources/ResourceUtils.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/resources/StringArrayProvider.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/resources/StringProvider.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/core/resources/UserPreferencesProvider.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/core/resources/VersionCodeProvider.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/rx/RxConfig.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/core/services/BluetoothHeadsetReceiver.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/core/services/CallRingPlayer.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/services/CallService.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/core/services/VectorService.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/services/VectorSyncService.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/core/services/WiredHeadsetStateReceiver.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/core/ui/list/GenericButtonItem.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/core/ui/list/GenericFooterItem.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/core/ui/list/GenericItem.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/core/ui/list/GenericItemHeader.kt (84%) rename vector/src/main/java/im/vector/{riotx => app}/core/ui/list/GenericItemWithValue.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/core/ui/list/GenericLoaderItem.kt (68%) rename vector/src/main/java/im/vector/{riotx => app}/core/ui/model/Size.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/core/ui/views/ActiveCallView.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/core/ui/views/ActiveCallViewHolder.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/core/ui/views/BottomSheetActionButton.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/ui/views/JumpToReadMarkerView.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/ui/views/KeysBackupBanner.kt (99%) rename vector/src/main/java/im/vector/{riotx => app}/core/ui/views/NotificationAreaView.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/ui/views/PasswordStrengthBar.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/core/ui/views/QrCodeImageView.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/ui/views/ReadReceiptsView.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/core/utils/AssetReader.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/core/utils/DataSource.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/core/utils/DebouncedClickListener.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/utils/Debouncer.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/utils/DefaultSubscriber.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/utils/Dialogs.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/utils/DimensionConverter.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/utils/Emoji.kt (99%) rename vector/src/main/java/im/vector/{riotx => app}/core/utils/EvenBetterLinkMovementMethod.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/core/utils/ExternalApplicationsUtil.kt (99%) rename vector/src/main/java/im/vector/{riotx => app}/core/utils/FileUtils.kt (99%) rename vector/src/main/java/im/vector/{riotx => app}/core/utils/FirstThrottler.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/utils/Handler.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/core/utils/JsonViewerStyler.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/core/utils/KeyboardStateUtils.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/utils/LiveEvent.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/utils/PermissionsTools.kt (99%) rename vector/src/main/java/im/vector/{riotx => app}/core/utils/RingtoneUtils.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/utils/SnapHelperUtils.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/core/utils/SpannableUtils.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/core/utils/SystemUtils.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/core/utils/TemporaryStore.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/utils/TextUtils.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/core/utils/UrlUtils.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/core/utils/UserColor.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/core/utils/ViewUtils.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/core/utils/WeakReferenceDelegate.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/MainActivity.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/attachments/AttachmentTypeSelectorView.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/attachments/AttachmentsHelper.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/attachments/AttachmentsMapper.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/attachments/ContactAttachment.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/attachments/ContentAttachmentData.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/attachments/preview/AttachmentPreviewControllers.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/attachments/preview/AttachmentPreviewItems.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/attachments/preview/AttachmentsPreviewAction.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/attachments/preview/AttachmentsPreviewActivity.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/attachments/preview/AttachmentsPreviewFragment.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/attachments/preview/AttachmentsPreviewViewEvents.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/attachments/preview/AttachmentsPreviewViewModel.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/attachments/preview/AttachmentsPreviewViewState.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/attachments/preview/Extensions.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/autocomplete/AutocompleteClickListener.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/autocomplete/AutocompleteMatrixItem.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/autocomplete/RecyclerViewPresenter.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/autocomplete/command/AutocompleteCommandController.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/autocomplete/command/AutocompleteCommandItem.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/autocomplete/command/AutocompleteCommandPresenter.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/autocomplete/command/CommandAutocompletePolicy.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/autocomplete/emoji/AutocompleteEmojiController.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/autocomplete/emoji/AutocompleteEmojiItem.kt (83%) rename vector/src/main/java/im/vector/{riotx => app}/features/autocomplete/emoji/AutocompleteEmojiPresenter.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/autocomplete/emoji/AutocompleteMoreResultItem.kt (82%) rename vector/src/main/java/im/vector/{riotx => app}/features/autocomplete/group/AutocompleteGroupController.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/autocomplete/group/AutocompleteGroupPresenter.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/autocomplete/member/AutocompleteMemberController.kt (85%) rename vector/src/main/java/im/vector/{riotx => app}/features/autocomplete/member/AutocompleteMemberPresenter.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/autocomplete/room/AutocompleteRoomController.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/autocomplete/room/AutocompleteRoomPresenter.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/badge/BadgeProxy.kt (99%) rename vector/src/main/java/im/vector/{riotx => app}/features/call/CallAudioManager.kt (99%) rename vector/src/main/java/im/vector/{riotx => app}/features/call/CallControlsBottomSheet.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/call/CallControlsView.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/call/CameraEventsHandlerAdapter.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/call/Cameras.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/call/PeerConnectionObserverAdapter.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/call/SdpObserverAdapter.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/call/SharedActiveCallViewModel.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/call/VectorCallActivity.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/call/VectorCallViewModel.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/call/WebRtcPeerConnectionManager.kt (99%) rename vector/src/main/java/im/vector/{riotx => app}/features/call/service/CallHeadsUpActionReceiver.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/call/telecom/CallConnection.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/call/telecom/TelecomUtils.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/call/telecom/VectorConnectionService.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/command/Command.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/command/CommandParser.kt (99%) rename vector/src/main/java/im/vector/{riotx => app}/features/command/ParsedCommand.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/configuration/VectorConfiguration.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/consent/ConsentNotGivenHelper.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/contactsbook/ContactDetailItem.kt (81%) rename vector/src/main/java/im/vector/{riotx => app}/features/contactsbook/ContactItem.kt (84%) rename vector/src/main/java/im/vector/{riotx => app}/features/contactsbook/ContactsBookAction.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/contactsbook/ContactsBookController.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/contactsbook/ContactsBookFragment.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/contactsbook/ContactsBookViewModel.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/contactsbook/ContactsBookViewState.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/createdirect/CreateDirectRoomAction.kt (82%) rename vector/src/main/java/im/vector/{riotx => app}/features/createdirect/CreateDirectRoomActivity.kt (82%) rename vector/src/main/java/im/vector/{riotx => app}/features/createdirect/CreateDirectRoomViewEvents.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/createdirect/CreateDirectRoomViewModel.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/createdirect/CreateDirectRoomViewState.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/keys/KeysExporter.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/keys/KeysImporter.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/keysbackup/settings/KeyBackupSettingsAction.kt (87%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt (87%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/keysrequest/KeyRequestHandler.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/quads/SharedSecureStorageAction.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/quads/SharedSecureStorageActivity.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/quads/SharedSecureStorageViewModel.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/quads/SharedSecuredStorageKeyFragment.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/recover/BackupToQuadSMigrationTask.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/recover/BootstrapAccountPasswordFragment.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/recover/BootstrapActions.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/recover/BootstrapBottomSheet.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/recover/BootstrapConclusionFragment.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/recover/BootstrapCrossSigningTask.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/recover/BootstrapEnterPassphraseFragment.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/recover/BootstrapMigrateBackupFragment.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/recover/BootstrapSharedViewModel.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/recover/BootstrapStep.kt (99%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/recover/BootstrapViewEvents.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/recover/BootstrapViewState.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/recover/BootstrapWaitingFragment.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/recover/KeepItSafeDialog.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/recover/RecoveryKeyExt.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/util/Extensions.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/IncomingVerificationRequestHandler.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/SupportedVerificationMethodsProvider.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/VerificationAction.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/VerificationBottomSheet.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/VerificationBottomSheetViewEvents.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/VerificationBottomSheetViewModel.kt (99%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/cancel/VerificationCancelController.kt (85%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/cancel/VerificationCancelFragment.kt (85%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/cancel/VerificationNotMeController.kt (80%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/cancel/VerificationNotMeFragment.kt (85%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/choose/VerificationChooseMethodController.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/choose/VerificationChooseMethodFragment.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/conclusion/VerificationConclusionController.kt (87%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/conclusion/VerificationConclusionFragment.kt (85%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/conclusion/VerificationConclusionViewModel.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/emoji/VerificationEmojiCodeController.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/emoji/VerificationEmojiCodeFragment.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/epoxy/BottomSheetSelfWaitItem.kt (82%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/epoxy/BottomSheetVerificationActionItem.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/epoxy/BottomSheetVerificationDecimalCodeItem.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/epoxy/BottomSheetVerificationNoticeItem.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/epoxy/BottomSheetVerificationQrCodeItem.kt (83%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/epoxy/BottomSheetVerificationWaitingItem.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/qrconfirmation/VerificationQRWaitingController.kt (77%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/qrconfirmation/VerificationQRWaitingFragment.kt (87%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherController.kt (82%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherFragment.kt (84%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/request/VerificationRequestController.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/crypto/verification/request/VerificationRequestFragment.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/disclaimer/DisclaimerDialog.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/discovery/DiscoverySettingsAction.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/discovery/DiscoverySettingsController.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/discovery/DiscoverySettingsFragment.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/discovery/DiscoverySettingsState.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/discovery/DiscoverySettingsViewEvents.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/discovery/DiscoverySettingsViewModel.kt (99%) rename vector/src/main/java/im/vector/{riotx => app}/features/discovery/DiscoverySharedViewModel.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/discovery/DiscoverySharedViewModelAction.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/discovery/PidInfo.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/discovery/SettingsButtonItem.kt (84%) rename vector/src/main/java/im/vector/{riotx => app}/features/discovery/SettingsContinueCancelItem.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/discovery/SettingsEditTextItem.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/discovery/SettingsInfoItem.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/discovery/SettingsInformationItem.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/discovery/SettingsItem.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/discovery/SettingsProgressItem.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/discovery/SettingsSectionTitleItem.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/discovery/SettingsTextButtonSingleLineItem.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/discovery/change/SetIdentityServerAction.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/discovery/change/SetIdentityServerFragment.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/discovery/change/SetIdentityServerState.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/discovery/change/SetIdentityServerViewEvents.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/discovery/change/SetIdentityServerViewModel.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/form/FormEditTextItem.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/form/FormEditTextWithButtonItem.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/form/FormSwitchItem.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/grouplist/GroupListAction.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/grouplist/GroupListFragment.kt (85%) rename vector/src/main/java/im/vector/{riotx => app}/features/grouplist/GroupListViewEvents.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/grouplist/GroupListViewModel.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/grouplist/GroupListViewState.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/grouplist/GroupSummaryController.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/grouplist/GroupSummaryItem.kt (85%) rename vector/src/main/java/im/vector/{riotx => app}/features/grouplist/SelectedGroupDataSource.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/AvatarRenderer.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/HomeActivity.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/HomeActivitySharedAction.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/HomeActivityViewActions.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/HomeActivityViewEvents.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/HomeActivityViewModel.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/HomeActivityViewState.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/HomeDetailAction.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/HomeDetailFragment.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/HomeDetailViewModel.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/HomeDetailViewState.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/HomeDrawerFragment.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/HomeModule.kt (80%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/HomeRoomListDataSource.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/HomeSharedActionViewModel.kt (87%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/LoadingFragment.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/RoomColor.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/RoomListDisplayMode.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/ShortcutsHandler.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/UnknownDeviceDetectorSharedViewModel.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/breadcrumbs/BreadcrumbsAnimator.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/breadcrumbs/BreadcrumbsController.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/breadcrumbs/BreadcrumbsFragment.kt (85%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/breadcrumbs/BreadcrumbsItem.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/breadcrumbs/BreadcrumbsViewModel.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/breadcrumbs/BreadcrumbsViewState.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/AutoCompleter.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/JumpToBottomViewVisibilityManager.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/RoomDetailAction.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/RoomDetailActivity.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/RoomDetailFragment.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/RoomDetailSharedAction.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/RoomDetailSharedActionViewModel.kt (87%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/RoomDetailViewEvents.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/RoomDetailViewModel.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/RoomDetailViewState.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/RoomMessageTouchHelperCallback.kt (99%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/ScrollOnHighlightedEventCallback.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/ScrollOnNewMessageCallback.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/composer/ComposerEditText.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/composer/TextComposerView.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/composer/rainbow/RainbowGenerator.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/composer/rainbow/RgbColor.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/readreceipts/DisplayReadReceiptItem.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/readreceipts/DisplayReadReceiptsBottomSheet.kt (84%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/readreceipts/DisplayReadReceiptsController.kt (84%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/sticker/StickerPickerActionHandler.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/MessageColorProvider.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/TimelineEventController.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/TimelineEventControllerHandler.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/action/EventSharedAction.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/action/MessageActionState.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/action/MessageActionsAction.kt (85%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/action/MessageActionsAnimator.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/action/MessageActionsViewModel.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/action/MessageSharedActionViewModel.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt (84%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/animation/TimelineItemAnimator.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt (83%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/factory/DefaultItemFactory.kt (78%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt (82%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/factory/MessageItemFactory.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/factory/NoticeItemFactory.kt (77%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt (85%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/factory/TimelineItemFactory.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/factory/VerificationItemFactory.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/format/NoticeEventFormatter.kt (99%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/format/RoomHistoryVisibilityFormatter.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/helper/AvatarSizeProvider.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/helper/ContentDownloadStateTrackerBinder.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt (80%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/helper/RoomSummaryHolder.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/helper/TimelineVisibilityStateChangedListeners.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/item/AbsMessageItem.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/item/BaseEventItem.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/item/BasedMergedItem.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/item/BlankItem.kt (81%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/item/DaySeparatorItem.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/item/DefaultItem.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/item/EventItemAttributes.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/item/MergedUTDItem.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/item/MessageBlockCodeItem.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/item/MessageFileItem.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/item/MessageImageVideoItem.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/item/MessageInformationData.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/item/MessageOptionsItem.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/item/MessagePollItem.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/item/MessageTextItem.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/item/NoticeItem.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/item/PollResultLineView.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/item/RedactedMessageItem.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/item/RoomCreateItem.kt (87%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/item/StatusTileTimelineItem.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/item/TimelineReadMarkerItem.kt (81%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/item/VerificationRequestItem.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/reactions/ReactionInfoSimpleItem.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt (82%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.kt (87%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/reactions/ViewReactionsViewModel.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/timeline/tools/EventRenderingTools.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/widget/RoomWidgetController.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/widget/RoomWidgetItem.kt (85%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/widget/RoomWidgetsBannerView.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt (83%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/detail/widget/WidgetRequestCodes.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/filtered/FilteredRoomFooterItem.kt (87%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/filtered/FilteredRoomsActivity.kt (84%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/list/AlphabeticalRoomComparator.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/list/BreadcrumbsRoomComparator.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/list/ChronologicalRoomComparator.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/list/RoomCategoryItem.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/list/RoomInvitationItem.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/list/RoomListAction.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/list/RoomListAnimator.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/list/RoomListDisplayModeFilter.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/list/RoomListFragment.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/list/RoomListModule.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/list/RoomListNameFilter.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/list/RoomListViewEvents.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/list/RoomListViewModel.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/list/RoomListViewModelFactory.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/list/RoomListViewState.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/list/RoomSummaryController.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/list/RoomSummaryFormatter.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/list/RoomSummaryItem.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/list/RoomSummaryItemFactory.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/list/UnreadCounterBadgeView.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/list/actions/RoomListQuickActionsSharedActionViewModel.kt (87%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/list/actions/RoomListQuickActionsState.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/list/actions/RoomListQuickActionsViewModel.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/list/widget/FabMenuView.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/home/room/typing/TypingHelper.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/homeserver/HomeServerCapabilitiesViewModel.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/homeserver/HomeServerCapabilitiesViewState.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/homeserver/ServerUrlsRepository.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/html/CodeVisitor.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/html/EventHtmlRenderer.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/html/FontTagHandler.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/html/MxLinkTagHandler.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/html/MxReplyTagHandler.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/html/PillImageSpan.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/html/SpanHandler.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/html/SpoilerSpan.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/html/VectorHtmlCompressor.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/invite/InviteButtonStateBinder.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/invite/InviteUsersToRoomAction.kt (82%) rename vector/src/main/java/im/vector/{riotx => app}/features/invite/InviteUsersToRoomActivity.kt (82%) rename vector/src/main/java/im/vector/{riotx => app}/features/invite/InviteUsersToRoomViewEvents.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/invite/InviteUsersToRoomViewModel.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/invite/InviteUsersToRoomViewState.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/invite/VectorInviteView.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/lifecycle/VectorActivityLifecycleCallbacks.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/link/LinkHandlerActivity.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/AbstractLoginFragment.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/Config.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/HomeServerConnectionConfigFactory.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/JavascriptResponse.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/LoginAction.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/LoginActivity.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/LoginCaptchaFragment.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/LoginConfig.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/LoginFragment.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/LoginGenericTextInputFormFragment.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/LoginMode.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/LoginResetPasswordFragment.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/LoginResetPasswordMailConfirmationFragment.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/LoginResetPasswordSuccessFragment.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/LoginServerSelectionFragment.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/LoginServerUrlFormFragment.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/LoginSignUpSignInSelectionFragment.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/LoginSignUpSignInSsoFragment.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/LoginSplashFragment.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/LoginViewEvents.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/LoginViewModel.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/LoginViewState.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/LoginWaitForEmailFragment.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/LoginWebFragment.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/ReAuthHelper.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/ServerType.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/SignMode.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/SupportedStage.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/terms/LocalizedFlowDataLoginTermsChecked.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/terms/LoginTermsFragment.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/terms/LoginTermsViewState.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/terms/PolicyController.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/terms/PolicyItem.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/terms/UrlAndName.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/login/terms/converter.kt (99%) rename vector/src/main/java/im/vector/{riotx => app}/features/media/AttachmentOverlayView.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/media/BaseAttachmentProvider.kt (99%) rename vector/src/main/java/im/vector/{riotx => app}/features/media/BigImageViewerActivity.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/media/DataAttachmentRoomProvider.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/media/DefaultImageLoaderCallback.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/media/ImageContentRenderer.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/media/ImageMediaViewerActivity.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/media/RoomEventsAttachmentProvider.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/media/UCropHelper.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/media/VectorAttachmentViewerActivity.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/media/VideoContentRenderer.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/media/VideoMediaViewerActivity.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/navigation/DefaultNavigator.kt (85%) rename vector/src/main/java/im/vector/{riotx => app}/features/navigation/Navigator.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/notifications/BitmapLoader.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/notifications/IconLoader.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/notifications/InviteNotifiableEvent.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/notifications/NotifiableEvent.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/notifications/NotifiableEventResolver.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/notifications/NotifiableMessageEvent.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/notifications/NotificationAction.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/notifications/NotificationBroadcastReceiver.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/notifications/NotificationDrawerManager.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/notifications/NotificationUtils.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/notifications/OutdatedEventDetector.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/notifications/PushRuleTriggerListener.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/notifications/RoomEventGroupInfo.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/notifications/SimpleNotifiableEvent.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/permalink/PermalinkHandler.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/permalink/PermalinkHandlerActivity.kt (84%) rename vector/src/main/java/im/vector/{riotx => app}/features/pin/PinActivity.kt (87%) rename vector/src/main/java/im/vector/{riotx => app}/features/pin/PinCodeStore.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/pin/PinFragment.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/pin/PinLocker.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/pin/PinMode.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/pin/UnlockedActivity.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/popup/PopupAlertManager.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/popup/VectorAlert.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/powerlevel/PowerLevelsObservableFactory.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/qrcode/QrCodeScannerActivity.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/qrcode/QrCodeScannerFragment.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/rageshake/BugReportActivity.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/rageshake/BugReporter.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/rageshake/BugReporterMultipartBody.java (99%) rename vector/src/main/java/im/vector/{riotx => app}/features/rageshake/RageShake.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/rageshake/VectorFileLogger.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/rageshake/VectorUncaughtExceptionHandler.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/reactions/EmojiChooserFragment.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/reactions/EmojiChooserViewModel.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/reactions/EmojiDrawView.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/reactions/EmojiReactionPickerActivity.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/reactions/EmojiRecyclerAdapter.kt (99%) rename vector/src/main/java/im/vector/{riotx => app}/features/reactions/EmojiSearchAction.kt (87%) rename vector/src/main/java/im/vector/{riotx => app}/features/reactions/EmojiSearchResultController.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/reactions/EmojiSearchResultFragment.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/reactions/EmojiSearchResultItem.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/reactions/EmojiSearchResultViewModel.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/reactions/ReactionClickListener.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/reactions/data/EmojiCategory.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/reactions/data/EmojiData.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/reactions/data/EmojiDataSource.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/reactions/data/EmojiItem.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/reactions/widget/CircleView.kt (99%) rename vector/src/main/java/im/vector/{riotx => app}/features/reactions/widget/DotsView.kt (99%) rename vector/src/main/java/im/vector/{riotx => app}/features/reactions/widget/ReactionButton.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/room/RequireActiveMembershipAction.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/room/RequireActiveMembershipViewEvents.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/room/RequireActiveMembershipViewModel.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/room/RequireActiveMembershipViewState.kt (84%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomdirectory/JoinState.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomdirectory/PublicRoomItem.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomdirectory/PublicRoomsController.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomdirectory/PublicRoomsFragment.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomdirectory/PublicRoomsViewState.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomdirectory/RoomDirectoryAction.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomdirectory/RoomDirectoryActivity.kt (84%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomdirectory/RoomDirectorySharedAction.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomdirectory/RoomDirectorySharedActionViewModel.kt (87%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomdirectory/RoomDirectoryViewEvents.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomdirectory/RoomDirectoryViewModel.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomdirectory/createroom/CreateRoomAction.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomdirectory/createroom/CreateRoomActivity.kt (85%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomdirectory/createroom/CreateRoomController.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomdirectory/createroom/CreateRoomFragment.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomdirectory/createroom/CreateRoomViewModel.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomdirectory/createroom/CreateRoomViewState.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomdirectory/picker/RoomDirectoryItem.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomdirectory/picker/RoomDirectoryListCreator.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomdirectory/picker/RoomDirectoryPickerAction.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomdirectory/picker/RoomDirectoryPickerController.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomdirectory/roompreview/RoomPreviewAction.kt (85%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomdirectory/roompreview/RoomPreviewActivity.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomdirectory/roompreview/RoomPreviewViewModel.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomdirectory/roompreview/RoomPreviewViewState.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/roommemberprofile/RoomMemberProfileAction.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/roommemberprofile/RoomMemberProfileActivity.kt (84%) rename vector/src/main/java/im/vector/{riotx => app}/features/roommemberprofile/RoomMemberProfileController.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/roommemberprofile/RoomMemberProfileFragment.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/roommemberprofile/RoomMemberProfileViewEvents.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/roommemberprofile/RoomMemberProfileViewModel.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/roommemberprofile/RoomMemberProfileViewState.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/roommemberprofile/devices/DeviceListAction.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/roommemberprofile/devices/DeviceListBottomSheet.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/roommemberprofile/devices/DeviceListBottomSheetViewEvents.kt (87%) rename vector/src/main/java/im/vector/{riotx => app}/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/roommemberprofile/devices/DeviceListEpoxyController.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/roommemberprofile/devices/DeviceListFragment.kt (87%) rename vector/src/main/java/im/vector/{riotx => app}/features/roommemberprofile/devices/DeviceTrustInfoActionFragment.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/RoomProfileAction.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/RoomProfileActivity.kt (83%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/RoomProfileController.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/RoomProfileFragment.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/RoomProfileSharedAction.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/RoomProfileSharedActionViewModel.kt (87%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/RoomProfileViewEvents.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/RoomProfileViewModel.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/RoomProfileViewState.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/banned/RoomBannedListMemberAction.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/banned/RoomBannedListMemberViewModel.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/banned/RoomBannedMemberListController.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/banned/RoomBannedMemberListFragment.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/banned/RoomBannedMemberListViewState.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/banned/RoomBannedViewEvents.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/members/RoomMemberListAction.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/members/RoomMemberListController.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/members/RoomMemberListFragment.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/members/RoomMemberListViewModel.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/members/RoomMemberListViewState.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/members/RoomMemberSummaryComparator.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/settings/RoomSettingsAction.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/settings/RoomSettingsController.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/settings/RoomSettingsFragment.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/settings/RoomSettingsViewEvents.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/settings/RoomSettingsViewModel.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/settings/RoomSettingsViewState.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/uploads/RoomUploadsAction.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/uploads/RoomUploadsFragment.kt (85%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/uploads/RoomUploadsPagerAdapter.kt (85%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/uploads/RoomUploadsViewEvents.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/uploads/RoomUploadsViewModel.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/uploads/RoomUploadsViewState.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/uploads/files/RoomUploadsFilesFragment.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/uploads/files/UploadsFileController.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/uploads/files/UploadsFileItem.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/uploads/media/Config.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/uploads/media/UploadsImageItem.kt (85%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/uploads/media/UploadsMediaController.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/roomprofile/uploads/media/UploadsVideoItem.kt (82%) rename vector/src/main/java/im/vector/{riotx => app}/features/session/SessionListener.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/FontScale.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/VectorLocale.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/VectorPreferences.kt (99%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/VectorSettingsActivity.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/VectorSettingsAdvancedSettingsFragment.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/VectorSettingsBaseFragment.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/VectorSettingsFlairFragment.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/VectorSettingsFragmentInteractionListener.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/VectorSettingsGeneralFragment.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/VectorSettingsHelpAboutFragment.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/VectorSettingsLabsFragment.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/VectorSettingsNotificationPreferenceFragment.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/VectorSettingsPreferencesFragment.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/VectorSettingsRootFragment.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/VectorSettingsSecurityPrivacyFragment.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/VectorSettingsUrls.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/VectorSettingsVoiceVideoFragment.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/account/deactivation/DeactivateAccountFragment.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/account/deactivation/DeactivateAccountViewEvents.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/account/deactivation/DeactivateAccountViewModel.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/crosssigning/CrossSigningSettingsAction.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/crosssigning/CrossSigningSettingsController.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/crosssigning/CrossSigningSettingsFragment.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/crosssigning/CrossSigningSettingsViewEvents.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/crosssigning/CrossSigningSettingsViewModel.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/crosssigning/CrossSigningSettingsViewState.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/devices/DeviceItem.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/devices/DeviceVerificationInfoBottomSheet.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/devices/DeviceVerificationInfoEpoxyController.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/devices/DevicesAction.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/devices/DevicesController.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/devices/DevicesViewEvents.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/devices/DevicesViewModel.kt (99%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/devices/TrustUtils.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/devices/VectorSettingsDevicesFragment.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/devtools/AccountDataEpoxyController.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/devtools/AccountDataFragment.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/devtools/AccountDataViewModel.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/devtools/GossipingEventsEpoxyController.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/devtools/GossipingEventsPaperTrailFragment.kt (87%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/devtools/IncomingKeyRequestListFragment.kt (85%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/devtools/KeyRequestEpoxyController.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/devtools/KeyRequestListViewModel.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/devtools/KeyRequestsFragment.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/devtools/OutgoingKeyRequestListFragment.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/ignored/IgnoredUsersController.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/ignored/IgnoredUsersViewEvents.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/ignored/IgnoredUsersViewModel.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/ignored/UserItem.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/ignored/VectorSettingsIgnoredUsersFragment.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/locale/LocaleItem.kt (81%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/locale/LocalePickerAction.kt (87%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/locale/LocalePickerController.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/locale/LocalePickerFragment.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/locale/LocalePickerViewEvents.kt (87%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/locale/LocalePickerViewModel.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/locale/LocalePickerViewState.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/locale/SystemLocaleProvider.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/push/PushGateWayController.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/push/PushGatewayAction.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/push/PushGatewayItem.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/push/PushGatewaysFragment.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/push/PushGatewaysViewModel.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/push/PushRuleItem.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/push/PushRulesFragment.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/push/PushRulesViewModel.kt (85%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/troubleshoot/TestAccountSettings.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/troubleshoot/TestDeviceSettings.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/troubleshoot/TestPushRulesSettings.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/troubleshoot/TestSystemSettings.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/settings/troubleshoot/TroubleshootTest.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/share/IncomingShareAction.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/share/IncomingShareActivity.kt (82%) rename vector/src/main/java/im/vector/{riotx => app}/features/share/IncomingShareController.kt (87%) rename vector/src/main/java/im/vector/{riotx => app}/features/share/IncomingShareFragment.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/share/IncomingShareViewEvents.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/share/IncomingShareViewModel.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/share/IncomingShareViewState.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/share/SharedData.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/signout/hard/SignedOutActivity.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/signout/soft/SoftLogoutAction.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/signout/soft/SoftLogoutActivity.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/signout/soft/SoftLogoutController.kt (87%) rename vector/src/main/java/im/vector/{riotx => app}/features/signout/soft/SoftLogoutFragment.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/signout/soft/SoftLogoutViewEvents.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/signout/soft/SoftLogoutViewModel.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/signout/soft/SoftLogoutViewState.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/signout/soft/epoxy/LoginCenterButtonItem.kt (84%) rename vector/src/main/java/im/vector/{riotx => app}/features/signout/soft/epoxy/LoginErrorWithRetryItem.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/signout/soft/epoxy/LoginPasswordFormItem.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/signout/soft/epoxy/LoginRedButtonItem.kt (84%) rename vector/src/main/java/im/vector/{riotx => app}/features/signout/soft/epoxy/LoginTextItem.kt (82%) rename vector/src/main/java/im/vector/{riotx => app}/features/signout/soft/epoxy/LoginTitleItem.kt (82%) rename vector/src/main/java/im/vector/{riotx => app}/features/signout/soft/epoxy/LoginTitleSmallItem.kt (82%) rename vector/src/main/java/im/vector/{riotx => app}/features/sync/widget/SyncStateView.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/terms/ReviewTermsAction.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/terms/ReviewTermsActivity.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/terms/ReviewTermsFragment.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/terms/ReviewTermsViewEvents.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/terms/ReviewTermsViewModel.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/terms/ReviewTermsViewState.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/terms/ServiceTermsArgs.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/terms/Term.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/terms/TermItem.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/terms/TermsController.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/themes/ActivityOtherThemes.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/themes/ThemeUtils.kt (99%) rename vector/src/main/java/im/vector/{riotx => app}/features/ui/SharedPreferencesUiStateRepository.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/ui/UiStateRepository.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/userdirectory/DirectoryUsersController.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/userdirectory/KnownUsersController.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/userdirectory/KnownUsersFragment.kt (93%) rename vector/src/main/java/im/vector/{riotx => app}/features/userdirectory/KnownUsersFragmentArgs.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/userdirectory/PendingInvitee.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/userdirectory/UserDirectoryAction.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/userdirectory/UserDirectoryFragment.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/userdirectory/UserDirectoryLetterHeaderItem.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/userdirectory/UserDirectorySharedAction.kt (90%) rename vector/src/main/java/im/vector/{riotx => app}/features/userdirectory/UserDirectorySharedActionViewModel.kt (87%) rename vector/src/main/java/im/vector/{riotx => app}/features/userdirectory/UserDirectoryUserItem.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/userdirectory/UserDirectoryViewEvents.kt (87%) rename vector/src/main/java/im/vector/{riotx => app}/features/userdirectory/UserDirectoryViewModel.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/userdirectory/UserDirectoryViewState.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/version/VersionProvider.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/webview/ConsentWebViewEventListener.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/webview/DefaultWebViewEventListener.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/webview/VectorWebViewActivity.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/webview/VectorWebViewClient.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/webview/WebViewEventListener.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/webview/WebViewEventListenerFactory.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/webview/WebViewMode.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/widgets/WidgetAPICallback.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/widgets/WidgetAction.kt (91%) rename vector/src/main/java/im/vector/{riotx => app}/features/widgets/WidgetActivity.kt (89%) rename vector/src/main/java/im/vector/{riotx => app}/features/widgets/WidgetArgsBuilder.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/widgets/WidgetFragment.kt (95%) rename vector/src/main/java/im/vector/{riotx => app}/features/widgets/WidgetPostAPIHandler.kt (99%) rename vector/src/main/java/im/vector/{riotx => app}/features/widgets/WidgetViewEvents.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/widgets/WidgetViewModel.kt (98%) rename vector/src/main/java/im/vector/{riotx => app}/features/widgets/WidgetViewState.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/widgets/permissions/RoomWidgetPermissionActions.kt (88%) rename vector/src/main/java/im/vector/{riotx => app}/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/widgets/permissions/RoomWidgetPermissionViewEvents.kt (87%) rename vector/src/main/java/im/vector/{riotx => app}/features/widgets/permissions/RoomWidgetPermissionViewModel.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/widgets/permissions/RoomWidgetPermissionViewState.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/widgets/permissions/WidgetPermissionsHelper.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/widgets/webview/WebviewPermissionUtils.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/widgets/webview/WidgetWebView.kt (92%) rename vector/src/main/java/im/vector/{riotx => app}/features/workers/signout/ServerBackupStatusViewModel.kt (97%) rename vector/src/main/java/im/vector/{riotx => app}/features/workers/signout/SignOutBottomSheetDialogFragment.kt (96%) rename vector/src/main/java/im/vector/{riotx => app}/features/workers/signout/SignOutUiWorker.kt (86%) rename vector/src/main/java/im/vector/{riotx => app}/features/workers/signout/SignoutBottomSheetActionButton.kt (94%) rename vector/src/main/java/im/vector/{riotx => app}/features/workers/signout/SignoutCheckViewModel.kt (94%) rename vector/src/sharedTest/java/im/vector/{riotx => app}/test/shared/TestRules.kt (96%) rename vector/src/test/java/im/vector/{riotx => app}/features/home/UserColorTest.kt (91%) rename vector/src/test/java/im/vector/{riotx => app}/features/home/room/detail/composer/rainbow/RainbowGeneratorTest.kt (97%) rename vector/src/test/java/im/vector/{riotx => app}/test/Extensions.kt (95%) diff --git a/CHANGES.md b/CHANGES.md index 6fdc867d1d..8f8d66df40 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -23,6 +23,7 @@ Other changes: - Hide Flair settings, this is not implemented yet. - Rename package `im.vector.riotx.attachmentviewer` to `im.vector.lib.attachmentviewer` - Rename package `im.vector.riotx.multipicker` to `im.vector.lib.multipicker` + - Rename package `im.vector.riotx` to `im.vector.app` Changes in Element 1.0.4 (2020-08-03) =================================================== diff --git a/vector/proguard-rules.pro b/vector/proguard-rules.pro index bc27767d8a..7fcfce61b8 100644 --- a/vector/proguard-rules.pro +++ b/vector/proguard-rules.pro @@ -20,7 +20,7 @@ # hide the original source file name. #-renamesourcefileattribute SourceFile --keep class im.vector.riotx.features.** { *; } +-keep class im.vector.app.features.** { *; } ## print all the rules in a file # -printconfiguration ../proguard_files/full-r8-config.txt diff --git a/vector/src/androidTest/java/im/vector/riotx/InstrumentedTest.kt b/vector/src/androidTest/java/im/vector/app/InstrumentedTest.kt similarity index 91% rename from vector/src/androidTest/java/im/vector/riotx/InstrumentedTest.kt rename to vector/src/androidTest/java/im/vector/app/InstrumentedTest.kt index c34a3ef67b..363c99397d 100644 --- a/vector/src/androidTest/java/im/vector/riotx/InstrumentedTest.kt +++ b/vector/src/androidTest/java/im/vector/app/InstrumentedTest.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package im.vector.riotx +package im.vector.app import android.content.Context import androidx.test.core.app.ApplicationProvider -import im.vector.riotx.test.shared.createTimberTestRule +import im.vector.app.test.shared.createTimberTestRule import org.junit.Rule interface InstrumentedTest { diff --git a/vector/src/androidTest/java/im/vector/riotx/core/utils/TemporaryStoreTest.kt b/vector/src/androidTest/java/im/vector/app/core/utils/TemporaryStoreTest.kt similarity index 96% rename from vector/src/androidTest/java/im/vector/riotx/core/utils/TemporaryStoreTest.kt rename to vector/src/androidTest/java/im/vector/app/core/utils/TemporaryStoreTest.kt index 020899204d..d8619f1824 100644 --- a/vector/src/androidTest/java/im/vector/riotx/core/utils/TemporaryStoreTest.kt +++ b/vector/src/androidTest/java/im/vector/app/core/utils/TemporaryStoreTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.utils +package im.vector.app.core.utils import org.amshove.kluent.shouldBe import org.junit.Test diff --git a/vector/src/androidTest/java/im/vector/riotx/features/reactions/data/EmojiDataSourceTest.kt b/vector/src/androidTest/java/im/vector/app/features/reactions/data/EmojiDataSourceTest.kt similarity index 97% rename from vector/src/androidTest/java/im/vector/riotx/features/reactions/data/EmojiDataSourceTest.kt rename to vector/src/androidTest/java/im/vector/app/features/reactions/data/EmojiDataSourceTest.kt index a3e45c3cf2..8959416445 100644 --- a/vector/src/androidTest/java/im/vector/riotx/features/reactions/data/EmojiDataSourceTest.kt +++ b/vector/src/androidTest/java/im/vector/app/features/reactions/data/EmojiDataSourceTest.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.reactions.data +package im.vector.app.features.reactions.data -import im.vector.riotx.InstrumentedTest +import im.vector.app.InstrumentedTest import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue import org.junit.FixMethodOrder diff --git a/vector/src/debug/AndroidManifest.xml b/vector/src/debug/AndroidManifest.xml index 8bb571902a..36e9ac73df 100644 --- a/vector/src/debug/AndroidManifest.xml +++ b/vector/src/debug/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="im.vector.app"> diff --git a/vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeActivity.kt similarity index 95% rename from vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeActivity.kt rename to vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeActivity.kt index 542b0a1cbb..6c4bb925dd 100644 --- a/vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeActivity.kt +++ b/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.debug +package im.vector.app.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.riotx.R -import im.vector.riotx.core.utils.toast +import im.vector.app.R +import im.vector.app.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/riotx/features/debug/DebugMaterialThemeDarkActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeDarkActivity.kt similarity index 94% rename from vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeDarkActivity.kt rename to vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeDarkActivity.kt index f925c7b2c3..e6e1bf04ee 100644 --- a/vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeDarkActivity.kt +++ b/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeDarkActivity.kt @@ -14,6 +14,6 @@ * limitations under the License. */ -package im.vector.riotx.features.debug +package im.vector.app.features.debug class DebugMaterialThemeDarkActivity : DebugMaterialThemeActivity() diff --git a/vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeLightActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeLightActivity.kt similarity index 94% rename from vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeLightActivity.kt rename to vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeLightActivity.kt index 1602bb0553..d1d3061cad 100644 --- a/vector/src/debug/java/im/vector/riotx/features/debug/DebugMaterialThemeLightActivity.kt +++ b/vector/src/debug/java/im/vector/app/features/debug/DebugMaterialThemeLightActivity.kt @@ -14,6 +14,6 @@ * limitations under the License. */ -package im.vector.riotx.features.debug +package im.vector.app.features.debug class DebugMaterialThemeLightActivity : DebugMaterialThemeActivity() diff --git a/vector/src/debug/java/im/vector/riotx/features/debug/DebugMenuActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt similarity index 93% rename from vector/src/debug/java/im/vector/riotx/features/debug/DebugMenuActivity.kt rename to vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt index a197a6f93e..349ee977de 100644 --- a/vector/src/debug/java/im/vector/riotx/features/debug/DebugMenuActivity.kt +++ b/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.debug +package im.vector.app.features.debug import android.app.Activity import android.app.NotificationChannel @@ -25,18 +25,18 @@ import android.os.Build import androidx.core.app.NotificationCompat import androidx.core.app.Person import butterknife.OnClick +import im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO +import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA +import im.vector.app.core.utils.allGranted +import im.vector.app.core.utils.checkPermissions +import im.vector.app.core.utils.toast +import im.vector.app.features.debug.sas.DebugSasEmojiActivity +import im.vector.app.features.qrcode.QrCodeScannerActivity import im.vector.matrix.android.internal.crypto.verification.qrcode.toQrCodeData -import im.vector.riotx.R -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.core.utils.PERMISSIONS_FOR_TAKING_PHOTO -import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA -import im.vector.riotx.core.utils.allGranted -import im.vector.riotx.core.utils.checkPermissions -import im.vector.riotx.core.utils.toast -import im.vector.riotx.features.debug.sas.DebugSasEmojiActivity -import im.vector.riotx.features.qrcode.QrCodeScannerActivity import kotlinx.android.synthetic.debug.activity_debug_menu.* import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/debug/java/im/vector/riotx/features/debug/TestLinkifyActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt similarity index 98% rename from vector/src/debug/java/im/vector/riotx/features/debug/TestLinkifyActivity.kt rename to vector/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt index 6af4317094..fd28aabd49 100644 --- a/vector/src/debug/java/im/vector/riotx/features/debug/TestLinkifyActivity.kt +++ b/vector/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.debug +package im.vector.app.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.riotx.R +import im.vector.app.R class TestLinkifyActivity : AppCompatActivity() { diff --git a/vector/src/debug/java/im/vector/riotx/features/debug/sas/DebugSasEmojiActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt similarity index 88% rename from vector/src/debug/java/im/vector/riotx/features/debug/sas/DebugSasEmojiActivity.kt rename to vector/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt index 170c156858..0e9b9938ca 100644 --- a/vector/src/debug/java/im/vector/riotx/features/debug/sas/DebugSasEmojiActivity.kt +++ b/vector/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.features.debug.sas +package im.vector.app.features.debug.sas import android.os.Bundle import androidx.appcompat.app.AppCompatActivity +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith import im.vector.matrix.android.api.crypto.getAllVerificationEmojis -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith import kotlinx.android.synthetic.main.fragment_generic_recycler.* class DebugSasEmojiActivity : AppCompatActivity() { diff --git a/vector/src/debug/java/im/vector/riotx/features/debug/sas/SasEmojiController.kt b/vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiController.kt similarity index 96% rename from vector/src/debug/java/im/vector/riotx/features/debug/sas/SasEmojiController.kt rename to vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiController.kt index 5629497de8..cc61828049 100644 --- a/vector/src/debug/java/im/vector/riotx/features/debug/sas/SasEmojiController.kt +++ b/vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiController.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.debug.sas +package im.vector.app.features.debug.sas import com.airbnb.epoxy.TypedEpoxyController import im.vector.matrix.android.api.session.crypto.verification.EmojiRepresentation diff --git a/vector/src/debug/java/im/vector/riotx/features/debug/sas/SasEmojiItem.kt b/vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt similarity index 77% rename from vector/src/debug/java/im/vector/riotx/features/debug/sas/SasEmojiItem.kt rename to vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt index cf9ca1032c..86b8ab302b 100644 --- a/vector/src/debug/java/im/vector/riotx/features/debug/sas/SasEmojiItem.kt +++ b/vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt @@ -14,20 +14,20 @@ * limitations under the License. */ -package im.vector.riotx.features.debug.sas +package im.vector.app.features.debug.sas import android.annotation.SuppressLint import android.widget.TextView import androidx.core.content.ContextCompat import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel import im.vector.matrix.android.api.session.crypto.verification.EmojiRepresentation -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel import me.gujun.android.span.image import me.gujun.android.span.span -@EpoxyModelClass(layout = im.vector.riotx.R.layout.item_sas_emoji) +@EpoxyModelClass(layout = im.vector.app.R.layout.item_sas_emoji) abstract class SasEmojiItem : VectorEpoxyModel() { @EpoxyAttribute @@ -50,9 +50,9 @@ abstract class SasEmojiItem : VectorEpoxyModel() { } class Holder : VectorEpoxyHolder() { - val indexView by bind(im.vector.riotx.R.id.sas_emoji_index) - val emojiView by bind(im.vector.riotx.R.id.sas_emoji) - val textView by bind(im.vector.riotx.R.id.sas_emoji_text) - val idView by bind(im.vector.riotx.R.id.sas_emoji_text_id) + val indexView by bind(im.vector.app.R.id.sas_emoji_index) + val emojiView by bind(im.vector.app.R.id.sas_emoji) + val textView by bind(im.vector.app.R.id.sas_emoji_text) + val idView by bind(im.vector.app.R.id.sas_emoji_text_id) } } diff --git a/vector/src/debug/java/im/vector/riotx/receivers/DebugReceiver.kt b/vector/src/debug/java/im/vector/app/receivers/DebugReceiver.kt similarity index 97% rename from vector/src/debug/java/im/vector/riotx/receivers/DebugReceiver.kt rename to vector/src/debug/java/im/vector/app/receivers/DebugReceiver.kt index 914d7923df..7b64bed08e 100644 --- a/vector/src/debug/java/im/vector/riotx/receivers/DebugReceiver.kt +++ b/vector/src/debug/java/im/vector/app/receivers/DebugReceiver.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package im.vector.riotx.receivers +package im.vector.app.receivers import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.content.IntentFilter import android.content.SharedPreferences -import androidx.preference.PreferenceManager import androidx.core.content.edit -import im.vector.riotx.core.utils.lsFiles +import androidx.preference.PreferenceManager +import im.vector.app.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 6578258e70..18d231ed21 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.riotx.features.debug.DebugMenuActivity" + tools:context="im.vector.app.features.debug.DebugMenuActivity" tools:ignore="HardcodedText"> - + tools:context="im.vector.app.features.debug.TestLinkifyActivity"> + package="im.vector.app"> diff --git a/vector/src/fdroid/java/im/vector/riotx/FlavorCode.kt b/vector/src/fdroid/java/im/vector/app/FlavorCode.kt similarity index 96% rename from vector/src/fdroid/java/im/vector/riotx/FlavorCode.kt rename to vector/src/fdroid/java/im/vector/app/FlavorCode.kt index de1ee2290b..7d8ef22b44 100644 --- a/vector/src/fdroid/java/im/vector/riotx/FlavorCode.kt +++ b/vector/src/fdroid/java/im/vector/app/FlavorCode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx +package im.vector.app import android.content.Context diff --git a/vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt b/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt similarity index 86% rename from vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt rename to vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt index 3cbd6699fd..b7834ecf45 100644 --- a/vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt +++ b/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.fdroid.features.settings.troubleshoot +package im.vector.app.fdroid.features.settings.troubleshoot -import im.vector.riotx.R -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.settings.VectorPreferences -import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest +import im.vector.app.R +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.settings.VectorPreferences +import im.vector.app.features.settings.troubleshoot.TroubleshootTest import javax.inject.Inject /** diff --git a/vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt b/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt similarity index 94% rename from vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt rename to vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt index 67ca2627bc..b3c972ae8b 100644 --- a/vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt +++ b/vector/src/fdroid/java/im/vector/app/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.riotx.fdroid.features.settings.troubleshoot +package im.vector.app.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.riotx.R -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest +import im.vector.app.R +import im.vector.app.core.resources.StringProvider +import im.vector.app.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/riotx/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt b/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt similarity index 81% rename from vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt rename to vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt index 2abbf7a419..19a6870b2b 100644 --- a/vector/src/fdroid/java/im/vector/riotx/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt +++ b/vector/src/fdroid/java/im/vector/app/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.riotx.fdroid.features.settings.troubleshoot +package im.vector.app.fdroid.features.settings.troubleshoot import androidx.fragment.app.Fragment -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 +import im.vector.app.R +import im.vector.app.core.utils.isIgnoringBatteryOptimizations +import im.vector.app.core.utils.requestDisablingBatteryOptimization +import im.vector.app.features.settings.troubleshoot.NotificationTroubleshootTestManager +import im.vector.app.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/riotx/fdroid/package-info.kt b/vector/src/fdroid/java/im/vector/app/fdroid/package-info.kt similarity index 95% rename from vector/src/fdroid/java/im/vector/riotx/fdroid/package-info.kt rename to vector/src/fdroid/java/im/vector/app/fdroid/package-info.kt index cd72d705e0..a9574c3bfe 100644 --- a/vector/src/fdroid/java/im/vector/riotx/fdroid/package-info.kt +++ b/vector/src/fdroid/java/im/vector/app/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.riotx.fdroid +package im.vector.app.fdroid diff --git a/vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/AlarmSyncBroadcastReceiver.kt b/vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt similarity index 96% rename from vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/AlarmSyncBroadcastReceiver.kt rename to vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt index 8c9cdbf63b..44d437fe39 100644 --- a/vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/AlarmSyncBroadcastReceiver.kt +++ b/vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.fdroid.receiver +package im.vector.app.fdroid.receiver import android.app.AlarmManager import android.app.PendingIntent @@ -24,9 +24,9 @@ import android.content.Intent import android.os.Build import android.os.PowerManager import androidx.core.content.ContextCompat +import im.vector.app.core.di.HasVectorInjector +import im.vector.app.core.services.VectorSyncService import im.vector.matrix.android.internal.session.sync.job.SyncService -import im.vector.riotx.core.di.HasVectorInjector -import im.vector.riotx.core.services.VectorSyncService import timber.log.Timber class AlarmSyncBroadcastReceiver : BroadcastReceiver() { diff --git a/vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt b/vector/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt similarity index 93% rename from vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt rename to vector/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt index 031c2bc5e7..a8a394576b 100644 --- a/vector/src/fdroid/java/im/vector/riotx/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt +++ b/vector/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt @@ -15,12 +15,12 @@ * limitations under the License. */ -package im.vector.riotx.fdroid.receiver +package im.vector.app.fdroid.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import im.vector.riotx.core.di.HasVectorInjector +import im.vector.app.core.di.HasVectorInjector import timber.log.Timber class OnApplicationUpgradeOrRebootReceiver : BroadcastReceiver() { diff --git a/vector/src/fdroid/java/im/vector/riotx/push/fcm/FcmHelper.kt b/vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt similarity index 89% rename from vector/src/fdroid/java/im/vector/riotx/push/fcm/FcmHelper.kt rename to vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt index 9205434438..7a8c5fa134 100755 --- a/vector/src/fdroid/java/im/vector/riotx/push/fcm/FcmHelper.kt +++ b/vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt @@ -16,14 +16,14 @@ */ @file:Suppress("UNUSED_PARAMETER") -package im.vector.riotx.push.fcm +package im.vector.app.push.fcm import android.app.Activity import android.content.Context -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.VectorPreferences +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.pushers.PushersManager +import im.vector.app.fdroid.receiver.AlarmSyncBroadcastReceiver +import im.vector.app.features.settings.VectorPreferences import timber.log.Timber /** diff --git a/vector/src/fdroid/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt b/vector/src/fdroid/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt similarity index 75% rename from vector/src/fdroid/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt rename to vector/src/fdroid/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt index b88a379450..ce9bad6c26 100644 --- a/vector/src/fdroid/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt +++ b/vector/src/fdroid/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.push.fcm +package im.vector.app.push.fcm import androidx.fragment.app.Fragment -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.NotificationTroubleshootTestManager -import im.vector.riotx.features.settings.troubleshoot.TestAccountSettings -import im.vector.riotx.features.settings.troubleshoot.TestPushRulesSettings -import im.vector.riotx.features.settings.troubleshoot.TestDeviceSettings -import im.vector.riotx.features.settings.troubleshoot.TestSystemSettings +import im.vector.app.fdroid.features.settings.troubleshoot.TestAutoStartBoot +import im.vector.app.fdroid.features.settings.troubleshoot.TestBackgroundRestrictions +import im.vector.app.features.settings.troubleshoot.NotificationTroubleshootTestManager +import im.vector.app.features.settings.troubleshoot.TestAccountSettings +import im.vector.app.features.settings.troubleshoot.TestDeviceSettings +import im.vector.app.features.settings.troubleshoot.TestPushRulesSettings +import im.vector.app.features.settings.troubleshoot.TestSystemSettings 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 db30f21f7a..d849d5fb2d 100755 --- a/vector/src/gplay/AndroidManifest.xml +++ b/vector/src/gplay/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="im.vector.app"> diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml index 32ba828d36..16fc952419 100644 --- a/vector/src/main/AndroidManifest.xml +++ b/vector/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="im.vector.app"> @@ -38,7 +38,7 @@ android:required="false" /> + android:targetActivity="im.vector.app.features.MainActivity"> @@ -68,9 +68,9 @@ - + @@ -84,50 +84,50 @@ - + - + - + - - - - + + + + + android:name="im.vector.app.features.home.room.detail.RoomDetailActivity" + android:parentActivityName="im.vector.app.features.home.HomeActivity"> + android:value="im.vector.app.features.home.HomeActivity" /> - - - - - + + + + + @@ -142,11 +142,11 @@ + android:name="im.vector.app.features.share.IncomingShareActivity" + android:parentActivityName="im.vector.app.features.home.HomeActivity"> + android:value="im.vector.app.features.home.HomeActivity" /> @@ -164,13 +164,13 @@ - + - + - + @@ -184,33 +184,33 @@ + android:name="im.vector.app.features.roommemberprofile.RoomMemberProfileActivity" + android:parentActivityName="im.vector.app.features.home.HomeActivity"> + android:value="im.vector.app.features.home.HomeActivity" /> - + - + - + - - - + + + @@ -219,11 +219,11 @@ @@ -233,12 +233,12 @@ diff --git a/vector/src/main/java/im/vector/riotx/ActiveSessionDataSource.kt b/vector/src/main/java/im/vector/app/ActiveSessionDataSource.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/ActiveSessionDataSource.kt rename to vector/src/main/java/im/vector/app/ActiveSessionDataSource.kt index 4cafdb8d11..2372fc1a69 100644 --- a/vector/src/main/java/im/vector/riotx/ActiveSessionDataSource.kt +++ b/vector/src/main/java/im/vector/app/ActiveSessionDataSource.kt @@ -15,11 +15,11 @@ * */ -package im.vector.riotx +package im.vector.app import arrow.core.Option import im.vector.matrix.android.api.session.Session -import im.vector.riotx.core.utils.BehaviorDataSource +import im.vector.app.core.utils.BehaviorDataSource import javax.inject.Inject import javax.inject.Singleton diff --git a/vector/src/main/java/im/vector/riotx/AppStateHandler.kt b/vector/src/main/java/im/vector/app/AppStateHandler.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/AppStateHandler.kt rename to vector/src/main/java/im/vector/app/AppStateHandler.kt index cf700cded8..5148d2e2ff 100644 --- a/vector/src/main/java/im/vector/riotx/AppStateHandler.kt +++ b/vector/src/main/java/im/vector/app/AppStateHandler.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx +package im.vector.app import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleObserver @@ -24,10 +24,10 @@ 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.roomSummaryQueryParams import im.vector.matrix.rx.rx -import im.vector.riotx.features.grouplist.ALL_COMMUNITIES_GROUP_ID -import im.vector.riotx.features.grouplist.SelectedGroupDataSource -import im.vector.riotx.features.home.HomeRoomListDataSource -import im.vector.riotx.features.home.room.list.ChronologicalRoomComparator +import im.vector.app.features.grouplist.ALL_COMMUNITIES_GROUP_ID +import im.vector.app.features.grouplist.SelectedGroupDataSource +import im.vector.app.features.home.HomeRoomListDataSource +import im.vector.app.features.home.room.list.ChronologicalRoomComparator import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable diff --git a/vector/src/main/java/im/vector/riotx/EmojiCompatFontProvider.kt b/vector/src/main/java/im/vector/app/EmojiCompatFontProvider.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/EmojiCompatFontProvider.kt rename to vector/src/main/java/im/vector/app/EmojiCompatFontProvider.kt index 0a338ce042..3aad81529c 100644 --- a/vector/src/main/java/im/vector/riotx/EmojiCompatFontProvider.kt +++ b/vector/src/main/java/im/vector/app/EmojiCompatFontProvider.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx +package im.vector.app import android.graphics.Typeface import androidx.core.provider.FontsContractCompat diff --git a/vector/src/main/java/im/vector/riotx/EmojiCompatWrapper.kt b/vector/src/main/java/im/vector/app/EmojiCompatWrapper.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/EmojiCompatWrapper.kt rename to vector/src/main/java/im/vector/app/EmojiCompatWrapper.kt index 945ddaec5a..dbb0848e74 100644 --- a/vector/src/main/java/im/vector/riotx/EmojiCompatWrapper.kt +++ b/vector/src/main/java/im/vector/app/EmojiCompatWrapper.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx +package im.vector.app import android.content.Context import androidx.core.provider.FontRequest diff --git a/vector/src/main/java/im/vector/riotx/VectorApplication.kt b/vector/src/main/java/im/vector/app/VectorApplication.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/VectorApplication.kt rename to vector/src/main/java/im/vector/app/VectorApplication.kt index cbed51607c..a52430263b 100644 --- a/vector/src/main/java/im/vector/riotx/VectorApplication.kt +++ b/vector/src/main/java/im/vector/app/VectorApplication.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx +package im.vector.app import android.app.Application import android.content.Context @@ -36,23 +36,23 @@ import im.vector.matrix.android.api.Matrix import im.vector.matrix.android.api.MatrixConfiguration import im.vector.matrix.android.api.auth.AuthenticationService import im.vector.matrix.android.api.legacy.LegacySessionImporter -import im.vector.riotx.core.di.ActiveSessionHolder -import im.vector.riotx.core.di.DaggerVectorComponent -import im.vector.riotx.core.di.HasVectorInjector -import im.vector.riotx.core.di.VectorComponent -import im.vector.riotx.core.extensions.configureAndStart -import im.vector.riotx.core.rx.RxConfig -import im.vector.riotx.features.configuration.VectorConfiguration -import im.vector.riotx.features.disclaimer.doNotShowDisclaimerDialog -import im.vector.riotx.features.lifecycle.VectorActivityLifecycleCallbacks -import im.vector.riotx.features.notifications.NotificationDrawerManager -import im.vector.riotx.features.notifications.NotificationUtils -import im.vector.riotx.features.pin.PinLocker -import im.vector.riotx.features.popup.PopupAlertManager -import im.vector.riotx.features.rageshake.VectorUncaughtExceptionHandler -import im.vector.riotx.features.settings.VectorPreferences -import im.vector.riotx.features.version.VersionProvider -import im.vector.riotx.push.fcm.FcmHelper +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.di.DaggerVectorComponent +import im.vector.app.core.di.HasVectorInjector +import im.vector.app.core.di.VectorComponent +import im.vector.app.core.extensions.configureAndStart +import im.vector.app.core.rx.RxConfig +import im.vector.app.features.configuration.VectorConfiguration +import im.vector.app.features.disclaimer.doNotShowDisclaimerDialog +import im.vector.app.features.lifecycle.VectorActivityLifecycleCallbacks +import im.vector.app.features.notifications.NotificationDrawerManager +import im.vector.app.features.notifications.NotificationUtils +import im.vector.app.features.pin.PinLocker +import im.vector.app.features.popup.PopupAlertManager +import im.vector.app.features.rageshake.VectorUncaughtExceptionHandler +import im.vector.app.features.settings.VectorPreferences +import im.vector.app.features.version.VersionProvider +import im.vector.app.push.fcm.FcmHelper import timber.log.Timber import java.text.SimpleDateFormat import java.util.Date diff --git a/vector/src/main/java/im/vector/riotx/core/animations/AppBarStateChangeListener.kt b/vector/src/main/java/im/vector/app/core/animations/AppBarStateChangeListener.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/animations/AppBarStateChangeListener.kt rename to vector/src/main/java/im/vector/app/core/animations/AppBarStateChangeListener.kt index bbc78d7937..9402888818 100644 --- a/vector/src/main/java/im/vector/riotx/core/animations/AppBarStateChangeListener.kt +++ b/vector/src/main/java/im/vector/app/core/animations/AppBarStateChangeListener.kt @@ -15,7 +15,7 @@ * */ -package im.vector.riotx.core.animations +package im.vector.app.core.animations import com.google.android.material.appbar.AppBarLayout import com.google.android.material.appbar.AppBarLayout.OnOffsetChangedListener diff --git a/vector/src/main/java/im/vector/riotx/core/animations/Constants.kt b/vector/src/main/java/im/vector/app/core/animations/Constants.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/core/animations/Constants.kt rename to vector/src/main/java/im/vector/app/core/animations/Constants.kt index ccc18c4915..dae65dc319 100644 --- a/vector/src/main/java/im/vector/riotx/core/animations/Constants.kt +++ b/vector/src/main/java/im/vector/app/core/animations/Constants.kt @@ -14,6 +14,6 @@ * limitations under the License. */ -package im.vector.riotx.core.animations +package im.vector.app.core.animations const val ANIMATION_DURATION_SHORT = 200L diff --git a/vector/src/main/java/im/vector/riotx/core/animations/MatrixItemAppBarStateChangeListener.kt b/vector/src/main/java/im/vector/app/core/animations/MatrixItemAppBarStateChangeListener.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/animations/MatrixItemAppBarStateChangeListener.kt rename to vector/src/main/java/im/vector/app/core/animations/MatrixItemAppBarStateChangeListener.kt index 427f37ba49..2172ed19ce 100644 --- a/vector/src/main/java/im/vector/riotx/core/animations/MatrixItemAppBarStateChangeListener.kt +++ b/vector/src/main/java/im/vector/app/core/animations/MatrixItemAppBarStateChangeListener.kt @@ -15,7 +15,7 @@ * */ -package im.vector.riotx.core.animations +package im.vector.app.core.animations import android.view.View import com.google.android.material.appbar.AppBarLayout diff --git a/vector/src/main/java/im/vector/riotx/core/animations/SimpleAnimatorListener.kt b/vector/src/main/java/im/vector/app/core/animations/SimpleAnimatorListener.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/animations/SimpleAnimatorListener.kt rename to vector/src/main/java/im/vector/app/core/animations/SimpleAnimatorListener.kt index 1819e003f9..d8ffde20ef 100644 --- a/vector/src/main/java/im/vector/riotx/core/animations/SimpleAnimatorListener.kt +++ b/vector/src/main/java/im/vector/app/core/animations/SimpleAnimatorListener.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.animations +package im.vector.app.core.animations import android.animation.Animator diff --git a/vector/src/main/java/im/vector/riotx/core/animations/SimpleTransitionListener.kt b/vector/src/main/java/im/vector/app/core/animations/SimpleTransitionListener.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/animations/SimpleTransitionListener.kt rename to vector/src/main/java/im/vector/app/core/animations/SimpleTransitionListener.kt index 728127b374..66afd1a269 100644 --- a/vector/src/main/java/im/vector/riotx/core/animations/SimpleTransitionListener.kt +++ b/vector/src/main/java/im/vector/app/core/animations/SimpleTransitionListener.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.animations +package im.vector.app.core.animations import androidx.transition.Transition diff --git a/vector/src/main/java/im/vector/riotx/core/animations/VectorFullTransitionSet.kt b/vector/src/main/java/im/vector/app/core/animations/VectorFullTransitionSet.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/animations/VectorFullTransitionSet.kt rename to vector/src/main/java/im/vector/app/core/animations/VectorFullTransitionSet.kt index 83bc6f0d01..bfcac8a066 100644 --- a/vector/src/main/java/im/vector/riotx/core/animations/VectorFullTransitionSet.kt +++ b/vector/src/main/java/im/vector/app/core/animations/VectorFullTransitionSet.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.animations +package im.vector.app.core.animations import android.content.Context import android.util.AttributeSet diff --git a/vector/src/main/java/im/vector/riotx/core/animations/behavior/PercentViewBehavior.kt b/vector/src/main/java/im/vector/app/core/animations/behavior/PercentViewBehavior.kt similarity index 99% rename from vector/src/main/java/im/vector/riotx/core/animations/behavior/PercentViewBehavior.kt rename to vector/src/main/java/im/vector/app/core/animations/behavior/PercentViewBehavior.kt index 37c07b8293..8b42485cb6 100644 --- a/vector/src/main/java/im/vector/riotx/core/animations/behavior/PercentViewBehavior.kt +++ b/vector/src/main/java/im/vector/app/core/animations/behavior/PercentViewBehavior.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.animations.behavior +package im.vector.app.core.animations.behavior import android.animation.ArgbEvaluator import android.content.Context @@ -24,7 +24,7 @@ import android.view.View import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.core.content.withStyledAttributes -import im.vector.riotx.R +import im.vector.app.R import kotlin.math.abs private const val UNSPECIFIED_INT = Integer.MAX_VALUE diff --git a/vector/src/main/java/im/vector/riotx/core/contacts/ContactsDataSource.kt b/vector/src/main/java/im/vector/app/core/contacts/ContactsDataSource.kt similarity index 99% rename from vector/src/main/java/im/vector/riotx/core/contacts/ContactsDataSource.kt rename to vector/src/main/java/im/vector/app/core/contacts/ContactsDataSource.kt index fd23e495b9..f5a5e240c6 100644 --- a/vector/src/main/java/im/vector/riotx/core/contacts/ContactsDataSource.kt +++ b/vector/src/main/java/im/vector/app/core/contacts/ContactsDataSource.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.contacts +package im.vector.app.core.contacts import android.content.Context import android.database.Cursor diff --git a/vector/src/main/java/im/vector/riotx/core/contacts/MappedContact.kt b/vector/src/main/java/im/vector/app/core/contacts/MappedContact.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/contacts/MappedContact.kt rename to vector/src/main/java/im/vector/app/core/contacts/MappedContact.kt index c89a3d4b01..6bff1f7da9 100644 --- a/vector/src/main/java/im/vector/riotx/core/contacts/MappedContact.kt +++ b/vector/src/main/java/im/vector/app/core/contacts/MappedContact.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.contacts +package im.vector.app.core.contacts import android.net.Uri diff --git a/vector/src/main/java/im/vector/riotx/core/date/VectorDateFormatter.kt b/vector/src/main/java/im/vector/app/core/date/VectorDateFormatter.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/core/date/VectorDateFormatter.kt rename to vector/src/main/java/im/vector/app/core/date/VectorDateFormatter.kt index 344398b91e..f383ea8216 100644 --- a/vector/src/main/java/im/vector/riotx/core/date/VectorDateFormatter.kt +++ b/vector/src/main/java/im/vector/app/core/date/VectorDateFormatter.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package im.vector.riotx.core.date +package im.vector.app.core.date import android.content.Context import android.text.format.DateUtils -import im.vector.riotx.core.resources.LocaleProvider +import im.vector.app.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/riotx/core/di/ActiveSessionHolder.kt b/vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/core/di/ActiveSessionHolder.kt rename to vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt index 2dc7b24ebf..65d773d33e 100644 --- a/vector/src/main/java/im/vector/riotx/core/di/ActiveSessionHolder.kt +++ b/vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotx.core.di +package im.vector.app.core.di import arrow.core.Option +import im.vector.app.ActiveSessionDataSource +import im.vector.app.features.call.WebRtcPeerConnectionManager +import im.vector.app.features.crypto.keysrequest.KeyRequestHandler +import im.vector.app.features.crypto.verification.IncomingVerificationRequestHandler +import im.vector.app.features.notifications.PushRuleTriggerListener +import im.vector.app.features.session.SessionListener import im.vector.matrix.android.api.auth.AuthenticationService import im.vector.matrix.android.api.session.Session -import im.vector.riotx.ActiveSessionDataSource -import im.vector.riotx.features.call.WebRtcPeerConnectionManager -import im.vector.riotx.features.crypto.keysrequest.KeyRequestHandler -import im.vector.riotx.features.crypto.verification.IncomingVerificationRequestHandler -import im.vector.riotx.features.notifications.PushRuleTriggerListener -import im.vector.riotx.features.session.SessionListener import timber.log.Timber import java.util.concurrent.atomic.AtomicReference import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/core/di/AssistedInjectModule.kt b/vector/src/main/java/im/vector/app/core/di/AssistedInjectModule.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/di/AssistedInjectModule.kt rename to vector/src/main/java/im/vector/app/core/di/AssistedInjectModule.kt index 17e0bd71e5..0ba4bedb92 100644 --- a/vector/src/main/java/im/vector/riotx/core/di/AssistedInjectModule.kt +++ b/vector/src/main/java/im/vector/app/core/di/AssistedInjectModule.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.di +package im.vector.app.core.di import com.squareup.inject.assisted.dagger2.AssistedModule import dagger.Module diff --git a/vector/src/main/java/im/vector/riotx/core/di/FragmentKey.kt b/vector/src/main/java/im/vector/app/core/di/FragmentKey.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/di/FragmentKey.kt rename to vector/src/main/java/im/vector/app/core/di/FragmentKey.kt index 57b5c902e5..bc2dc40a15 100644 --- a/vector/src/main/java/im/vector/riotx/core/di/FragmentKey.kt +++ b/vector/src/main/java/im/vector/app/core/di/FragmentKey.kt @@ -15,7 +15,7 @@ * */ -package im.vector.riotx.core.di +package im.vector.app.core.di import androidx.fragment.app.Fragment import dagger.MapKey diff --git a/vector/src/main/java/im/vector/riotx/core/di/FragmentModule.kt b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt similarity index 70% rename from vector/src/main/java/im/vector/riotx/core/di/FragmentModule.kt rename to vector/src/main/java/im/vector/app/core/di/FragmentModule.kt index fbb4cad78b..1aa9902137 100644 --- a/vector/src/main/java/im/vector/riotx/core/di/FragmentModule.kt +++ b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt @@ -15,99 +15,99 @@ * */ -package im.vector.riotx.core.di +package im.vector.app.core.di import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentFactory import dagger.Binds import dagger.Module import dagger.multibindings.IntoMap -import im.vector.riotx.features.attachments.preview.AttachmentsPreviewFragment -import im.vector.riotx.features.contactsbook.ContactsBookFragment -import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupSettingsFragment -import im.vector.riotx.features.crypto.quads.SharedSecuredStorageKeyFragment -import im.vector.riotx.features.crypto.quads.SharedSecuredStoragePassphraseFragment -import im.vector.riotx.features.crypto.recover.BootstrapAccountPasswordFragment -import im.vector.riotx.features.crypto.recover.BootstrapConclusionFragment -import im.vector.riotx.features.crypto.recover.BootstrapConfirmPassphraseFragment -import im.vector.riotx.features.crypto.recover.BootstrapEnterPassphraseFragment -import im.vector.riotx.features.crypto.recover.BootstrapMigrateBackupFragment -import im.vector.riotx.features.crypto.recover.BootstrapSaveRecoveryKeyFragment -import im.vector.riotx.features.crypto.recover.BootstrapSetupRecoveryKeyFragment -import im.vector.riotx.features.crypto.recover.BootstrapWaitingFragment -import im.vector.riotx.features.crypto.verification.cancel.VerificationCancelFragment -import im.vector.riotx.features.crypto.verification.cancel.VerificationNotMeFragment -import im.vector.riotx.features.crypto.verification.choose.VerificationChooseMethodFragment -import im.vector.riotx.features.crypto.verification.conclusion.VerificationConclusionFragment -import im.vector.riotx.features.crypto.verification.emoji.VerificationEmojiCodeFragment -import im.vector.riotx.features.crypto.verification.qrconfirmation.VerificationQRWaitingFragment -import im.vector.riotx.features.crypto.verification.qrconfirmation.VerificationQrScannedByOtherFragment -import im.vector.riotx.features.crypto.verification.request.VerificationRequestFragment -import im.vector.riotx.features.discovery.DiscoverySettingsFragment -import im.vector.riotx.features.discovery.change.SetIdentityServerFragment -import im.vector.riotx.features.grouplist.GroupListFragment -import im.vector.riotx.features.home.HomeDetailFragment -import im.vector.riotx.features.home.HomeDrawerFragment -import im.vector.riotx.features.home.LoadingFragment -import im.vector.riotx.features.home.room.breadcrumbs.BreadcrumbsFragment -import im.vector.riotx.features.home.room.detail.RoomDetailFragment -import im.vector.riotx.features.home.room.list.RoomListFragment -import im.vector.riotx.features.login.LoginCaptchaFragment -import im.vector.riotx.features.login.LoginFragment -import im.vector.riotx.features.login.LoginGenericTextInputFormFragment -import im.vector.riotx.features.login.LoginResetPasswordFragment -import im.vector.riotx.features.login.LoginResetPasswordMailConfirmationFragment -import im.vector.riotx.features.login.LoginResetPasswordSuccessFragment -import im.vector.riotx.features.login.LoginServerSelectionFragment -import im.vector.riotx.features.login.LoginServerUrlFormFragment -import im.vector.riotx.features.login.LoginSignUpSignInSelectionFragment -import im.vector.riotx.features.login.LoginSignUpSignInSsoFragment -import im.vector.riotx.features.login.LoginSplashFragment -import im.vector.riotx.features.login.LoginWaitForEmailFragment -import im.vector.riotx.features.login.LoginWebFragment -import im.vector.riotx.features.login.terms.LoginTermsFragment -import im.vector.riotx.features.pin.PinFragment -import im.vector.riotx.features.qrcode.QrCodeScannerFragment -import im.vector.riotx.features.reactions.EmojiChooserFragment -import im.vector.riotx.features.reactions.EmojiSearchResultFragment -import im.vector.riotx.features.roomdirectory.PublicRoomsFragment -import im.vector.riotx.features.roomdirectory.createroom.CreateRoomFragment -import im.vector.riotx.features.roomdirectory.picker.RoomDirectoryPickerFragment -import im.vector.riotx.features.roomdirectory.roompreview.RoomPreviewNoPreviewFragment -import im.vector.riotx.features.roommemberprofile.RoomMemberProfileFragment -import im.vector.riotx.features.roommemberprofile.devices.DeviceListFragment -import im.vector.riotx.features.roommemberprofile.devices.DeviceTrustInfoActionFragment -import im.vector.riotx.features.roomprofile.RoomProfileFragment -import im.vector.riotx.features.roomprofile.banned.RoomBannedMemberListFragment -import im.vector.riotx.features.roomprofile.members.RoomMemberListFragment -import im.vector.riotx.features.roomprofile.settings.RoomSettingsFragment -import im.vector.riotx.features.roomprofile.uploads.RoomUploadsFragment -import im.vector.riotx.features.roomprofile.uploads.files.RoomUploadsFilesFragment -import im.vector.riotx.features.roomprofile.uploads.media.RoomUploadsMediaFragment -import im.vector.riotx.features.settings.VectorSettingsAdvancedNotificationPreferenceFragment -import im.vector.riotx.features.settings.VectorSettingsHelpAboutFragment -import im.vector.riotx.features.settings.VectorSettingsLabsFragment -import im.vector.riotx.features.settings.VectorSettingsNotificationPreferenceFragment -import im.vector.riotx.features.settings.VectorSettingsNotificationsTroubleshootFragment -import im.vector.riotx.features.settings.VectorSettingsPreferencesFragment -import im.vector.riotx.features.settings.VectorSettingsSecurityPrivacyFragment -import im.vector.riotx.features.settings.account.deactivation.DeactivateAccountFragment -import im.vector.riotx.features.settings.crosssigning.CrossSigningSettingsFragment -import im.vector.riotx.features.settings.devices.VectorSettingsDevicesFragment -import im.vector.riotx.features.settings.devtools.AccountDataFragment -import im.vector.riotx.features.settings.devtools.GossipingEventsPaperTrailFragment -import im.vector.riotx.features.settings.devtools.IncomingKeyRequestListFragment -import im.vector.riotx.features.settings.devtools.KeyRequestsFragment -import im.vector.riotx.features.settings.devtools.OutgoingKeyRequestListFragment -import im.vector.riotx.features.settings.ignored.VectorSettingsIgnoredUsersFragment -import im.vector.riotx.features.settings.locale.LocalePickerFragment -import im.vector.riotx.features.settings.push.PushGatewaysFragment -import im.vector.riotx.features.share.IncomingShareFragment -import im.vector.riotx.features.signout.soft.SoftLogoutFragment -import im.vector.riotx.features.terms.ReviewTermsFragment -import im.vector.riotx.features.userdirectory.KnownUsersFragment -import im.vector.riotx.features.userdirectory.UserDirectoryFragment -import im.vector.riotx.features.widgets.WidgetFragment +import im.vector.app.features.attachments.preview.AttachmentsPreviewFragment +import im.vector.app.features.contactsbook.ContactsBookFragment +import im.vector.app.features.crypto.keysbackup.settings.KeysBackupSettingsFragment +import im.vector.app.features.crypto.quads.SharedSecuredStorageKeyFragment +import im.vector.app.features.crypto.quads.SharedSecuredStoragePassphraseFragment +import im.vector.app.features.crypto.recover.BootstrapAccountPasswordFragment +import im.vector.app.features.crypto.recover.BootstrapConclusionFragment +import im.vector.app.features.crypto.recover.BootstrapConfirmPassphraseFragment +import im.vector.app.features.crypto.recover.BootstrapEnterPassphraseFragment +import im.vector.app.features.crypto.recover.BootstrapMigrateBackupFragment +import im.vector.app.features.crypto.recover.BootstrapSaveRecoveryKeyFragment +import im.vector.app.features.crypto.recover.BootstrapSetupRecoveryKeyFragment +import im.vector.app.features.crypto.recover.BootstrapWaitingFragment +import im.vector.app.features.crypto.verification.cancel.VerificationCancelFragment +import im.vector.app.features.crypto.verification.cancel.VerificationNotMeFragment +import im.vector.app.features.crypto.verification.choose.VerificationChooseMethodFragment +import im.vector.app.features.crypto.verification.conclusion.VerificationConclusionFragment +import im.vector.app.features.crypto.verification.emoji.VerificationEmojiCodeFragment +import im.vector.app.features.crypto.verification.qrconfirmation.VerificationQRWaitingFragment +import im.vector.app.features.crypto.verification.qrconfirmation.VerificationQrScannedByOtherFragment +import im.vector.app.features.crypto.verification.request.VerificationRequestFragment +import im.vector.app.features.discovery.DiscoverySettingsFragment +import im.vector.app.features.discovery.change.SetIdentityServerFragment +import im.vector.app.features.grouplist.GroupListFragment +import im.vector.app.features.home.HomeDetailFragment +import im.vector.app.features.home.HomeDrawerFragment +import im.vector.app.features.home.LoadingFragment +import im.vector.app.features.home.room.breadcrumbs.BreadcrumbsFragment +import im.vector.app.features.home.room.detail.RoomDetailFragment +import im.vector.app.features.home.room.list.RoomListFragment +import im.vector.app.features.login.LoginCaptchaFragment +import im.vector.app.features.login.LoginFragment +import im.vector.app.features.login.LoginGenericTextInputFormFragment +import im.vector.app.features.login.LoginResetPasswordFragment +import im.vector.app.features.login.LoginResetPasswordMailConfirmationFragment +import im.vector.app.features.login.LoginResetPasswordSuccessFragment +import im.vector.app.features.login.LoginServerSelectionFragment +import im.vector.app.features.login.LoginServerUrlFormFragment +import im.vector.app.features.login.LoginSignUpSignInSelectionFragment +import im.vector.app.features.login.LoginSignUpSignInSsoFragment +import im.vector.app.features.login.LoginSplashFragment +import im.vector.app.features.login.LoginWaitForEmailFragment +import im.vector.app.features.login.LoginWebFragment +import im.vector.app.features.login.terms.LoginTermsFragment +import im.vector.app.features.pin.PinFragment +import im.vector.app.features.qrcode.QrCodeScannerFragment +import im.vector.app.features.reactions.EmojiChooserFragment +import im.vector.app.features.reactions.EmojiSearchResultFragment +import im.vector.app.features.roomdirectory.PublicRoomsFragment +import im.vector.app.features.roomdirectory.createroom.CreateRoomFragment +import im.vector.app.features.roomdirectory.picker.RoomDirectoryPickerFragment +import im.vector.app.features.roomdirectory.roompreview.RoomPreviewNoPreviewFragment +import im.vector.app.features.roommemberprofile.RoomMemberProfileFragment +import im.vector.app.features.roommemberprofile.devices.DeviceListFragment +import im.vector.app.features.roommemberprofile.devices.DeviceTrustInfoActionFragment +import im.vector.app.features.roomprofile.RoomProfileFragment +import im.vector.app.features.roomprofile.banned.RoomBannedMemberListFragment +import im.vector.app.features.roomprofile.members.RoomMemberListFragment +import im.vector.app.features.roomprofile.settings.RoomSettingsFragment +import im.vector.app.features.roomprofile.uploads.RoomUploadsFragment +import im.vector.app.features.roomprofile.uploads.files.RoomUploadsFilesFragment +import im.vector.app.features.roomprofile.uploads.media.RoomUploadsMediaFragment +import im.vector.app.features.settings.VectorSettingsAdvancedNotificationPreferenceFragment +import im.vector.app.features.settings.VectorSettingsHelpAboutFragment +import im.vector.app.features.settings.VectorSettingsLabsFragment +import im.vector.app.features.settings.VectorSettingsNotificationPreferenceFragment +import im.vector.app.features.settings.VectorSettingsNotificationsTroubleshootFragment +import im.vector.app.features.settings.VectorSettingsPreferencesFragment +import im.vector.app.features.settings.VectorSettingsSecurityPrivacyFragment +import im.vector.app.features.settings.account.deactivation.DeactivateAccountFragment +import im.vector.app.features.settings.crosssigning.CrossSigningSettingsFragment +import im.vector.app.features.settings.devices.VectorSettingsDevicesFragment +import im.vector.app.features.settings.devtools.AccountDataFragment +import im.vector.app.features.settings.devtools.GossipingEventsPaperTrailFragment +import im.vector.app.features.settings.devtools.IncomingKeyRequestListFragment +import im.vector.app.features.settings.devtools.KeyRequestsFragment +import im.vector.app.features.settings.devtools.OutgoingKeyRequestListFragment +import im.vector.app.features.settings.ignored.VectorSettingsIgnoredUsersFragment +import im.vector.app.features.settings.locale.LocalePickerFragment +import im.vector.app.features.settings.push.PushGatewaysFragment +import im.vector.app.features.share.IncomingShareFragment +import im.vector.app.features.signout.soft.SoftLogoutFragment +import im.vector.app.features.terms.ReviewTermsFragment +import im.vector.app.features.userdirectory.KnownUsersFragment +import im.vector.app.features.userdirectory.UserDirectoryFragment +import im.vector.app.features.widgets.WidgetFragment @Module interface FragmentModule { diff --git a/vector/src/main/java/im/vector/riotx/core/di/HasScreenInjector.kt b/vector/src/main/java/im/vector/app/core/di/HasScreenInjector.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/core/di/HasScreenInjector.kt rename to vector/src/main/java/im/vector/app/core/di/HasScreenInjector.kt index 62e359c0ae..4618bd04d1 100644 --- a/vector/src/main/java/im/vector/riotx/core/di/HasScreenInjector.kt +++ b/vector/src/main/java/im/vector/app/core/di/HasScreenInjector.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.di +package im.vector.app.core.di interface HasScreenInjector { diff --git a/vector/src/main/java/im/vector/riotx/core/di/HasVectorInjector.kt b/vector/src/main/java/im/vector/app/core/di/HasVectorInjector.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/core/di/HasVectorInjector.kt rename to vector/src/main/java/im/vector/app/core/di/HasVectorInjector.kt index c141f0e9e1..79254defcc 100644 --- a/vector/src/main/java/im/vector/riotx/core/di/HasVectorInjector.kt +++ b/vector/src/main/java/im/vector/app/core/di/HasVectorInjector.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.di +package im.vector.app.core.di interface HasVectorInjector { diff --git a/vector/src/main/java/im/vector/riotx/core/di/ImageManager.kt b/vector/src/main/java/im/vector/app/core/di/ImageManager.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/core/di/ImageManager.kt rename to vector/src/main/java/im/vector/app/core/di/ImageManager.kt index 74a01e76ec..7d8102aa7e 100644 --- a/vector/src/main/java/im/vector/riotx/core/di/ImageManager.kt +++ b/vector/src/main/java/im/vector/app/core/di/ImageManager.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package im.vector.riotx.core.di +package im.vector.app.core.di import android.content.Context import com.bumptech.glide.Glide import com.bumptech.glide.load.model.GlideUrl import com.github.piasy.biv.BigImageViewer import com.github.piasy.biv.loader.glide.GlideImageLoader +import im.vector.app.ActiveSessionDataSource +import im.vector.app.core.glide.FactoryUrl import im.vector.matrix.android.api.session.Session -import im.vector.riotx.ActiveSessionDataSource -import im.vector.riotx.core.glide.FactoryUrl import java.io.InputStream import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/core/di/ScreenComponent.kt b/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt similarity index 58% rename from vector/src/main/java/im/vector/riotx/core/di/ScreenComponent.kt rename to vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt index 2d51a6b6cb..265c0ec4fc 100644 --- a/vector/src/main/java/im/vector/riotx/core/di/ScreenComponent.kt +++ b/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt @@ -14,67 +14,67 @@ * limitations under the License. */ -package im.vector.riotx.core.di +package im.vector.app.core.di import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.FragmentFactory import androidx.lifecycle.ViewModelProvider import dagger.BindsInstance import dagger.Component -import im.vector.riotx.core.dialogs.UnrecognizedCertificateDialog -import im.vector.riotx.core.error.ErrorFormatter -import im.vector.riotx.core.preference.UserAvatarPreference -import im.vector.riotx.features.MainActivity -import im.vector.riotx.features.call.CallControlsBottomSheet -import im.vector.riotx.features.call.VectorCallActivity -import im.vector.riotx.features.createdirect.CreateDirectRoomActivity -import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupManageActivity -import im.vector.riotx.features.crypto.quads.SharedSecureStorageActivity -import im.vector.riotx.features.crypto.recover.BootstrapBottomSheet -import im.vector.riotx.features.crypto.verification.VerificationBottomSheet -import im.vector.riotx.features.debug.DebugMenuActivity -import im.vector.riotx.features.home.HomeActivity -import im.vector.riotx.features.home.HomeModule -import im.vector.riotx.features.home.room.detail.RoomDetailActivity -import im.vector.riotx.features.home.room.detail.readreceipts.DisplayReadReceiptsBottomSheet -import im.vector.riotx.features.home.room.detail.timeline.action.MessageActionsBottomSheet -import im.vector.riotx.features.home.room.detail.timeline.edithistory.ViewEditHistoryBottomSheet -import im.vector.riotx.features.home.room.detail.timeline.reactions.ViewReactionsBottomSheet -import im.vector.riotx.features.home.room.detail.widget.RoomWidgetsBottomSheet -import im.vector.riotx.features.home.room.filtered.FilteredRoomsActivity -import im.vector.riotx.features.home.room.list.RoomListModule -import im.vector.riotx.features.home.room.list.actions.RoomListQuickActionsBottomSheet -import im.vector.riotx.features.invite.InviteUsersToRoomActivity -import im.vector.riotx.features.invite.VectorInviteView -import im.vector.riotx.features.link.LinkHandlerActivity -import im.vector.riotx.features.login.LoginActivity -import im.vector.riotx.features.media.VectorAttachmentViewerActivity -import im.vector.riotx.features.media.BigImageViewerActivity -import im.vector.riotx.features.media.ImageMediaViewerActivity -import im.vector.riotx.features.media.VideoMediaViewerActivity -import im.vector.riotx.features.navigation.Navigator -import im.vector.riotx.features.permalink.PermalinkHandlerActivity -import im.vector.riotx.features.pin.PinLocker -import im.vector.riotx.features.qrcode.QrCodeScannerActivity -import im.vector.riotx.features.rageshake.BugReportActivity -import im.vector.riotx.features.rageshake.BugReporter -import im.vector.riotx.features.rageshake.RageShake -import im.vector.riotx.features.reactions.EmojiReactionPickerActivity -import im.vector.riotx.features.reactions.widget.ReactionButton -import im.vector.riotx.features.roomdirectory.RoomDirectoryActivity -import im.vector.riotx.features.roomdirectory.createroom.CreateRoomActivity -import im.vector.riotx.features.roommemberprofile.RoomMemberProfileActivity -import im.vector.riotx.features.roommemberprofile.devices.DeviceListBottomSheet -import im.vector.riotx.features.roomprofile.RoomProfileActivity -import im.vector.riotx.features.settings.VectorSettingsActivity -import im.vector.riotx.features.settings.devices.DeviceVerificationInfoBottomSheet -import im.vector.riotx.features.share.IncomingShareActivity -import im.vector.riotx.features.signout.soft.SoftLogoutActivity -import im.vector.riotx.features.terms.ReviewTermsActivity -import im.vector.riotx.features.ui.UiStateRepository -import im.vector.riotx.features.widgets.WidgetActivity -import im.vector.riotx.features.widgets.permissions.RoomWidgetPermissionBottomSheet -import im.vector.riotx.features.workers.signout.SignOutBottomSheetDialogFragment +import im.vector.app.core.dialogs.UnrecognizedCertificateDialog +import im.vector.app.core.error.ErrorFormatter +import im.vector.app.core.preference.UserAvatarPreference +import im.vector.app.features.MainActivity +import im.vector.app.features.call.CallControlsBottomSheet +import im.vector.app.features.call.VectorCallActivity +import im.vector.app.features.createdirect.CreateDirectRoomActivity +import im.vector.app.features.crypto.keysbackup.settings.KeysBackupManageActivity +import im.vector.app.features.crypto.quads.SharedSecureStorageActivity +import im.vector.app.features.crypto.recover.BootstrapBottomSheet +import im.vector.app.features.crypto.verification.VerificationBottomSheet +import im.vector.app.features.debug.DebugMenuActivity +import im.vector.app.features.home.HomeActivity +import im.vector.app.features.home.HomeModule +import im.vector.app.features.home.room.detail.RoomDetailActivity +import im.vector.app.features.home.room.detail.readreceipts.DisplayReadReceiptsBottomSheet +import im.vector.app.features.home.room.detail.timeline.action.MessageActionsBottomSheet +import im.vector.app.features.home.room.detail.timeline.edithistory.ViewEditHistoryBottomSheet +import im.vector.app.features.home.room.detail.timeline.reactions.ViewReactionsBottomSheet +import im.vector.app.features.home.room.detail.widget.RoomWidgetsBottomSheet +import im.vector.app.features.home.room.filtered.FilteredRoomsActivity +import im.vector.app.features.home.room.list.RoomListModule +import im.vector.app.features.home.room.list.actions.RoomListQuickActionsBottomSheet +import im.vector.app.features.invite.InviteUsersToRoomActivity +import im.vector.app.features.invite.VectorInviteView +import im.vector.app.features.link.LinkHandlerActivity +import im.vector.app.features.login.LoginActivity +import im.vector.app.features.media.BigImageViewerActivity +import im.vector.app.features.media.ImageMediaViewerActivity +import im.vector.app.features.media.VectorAttachmentViewerActivity +import im.vector.app.features.media.VideoMediaViewerActivity +import im.vector.app.features.navigation.Navigator +import im.vector.app.features.permalink.PermalinkHandlerActivity +import im.vector.app.features.pin.PinLocker +import im.vector.app.features.qrcode.QrCodeScannerActivity +import im.vector.app.features.rageshake.BugReportActivity +import im.vector.app.features.rageshake.BugReporter +import im.vector.app.features.rageshake.RageShake +import im.vector.app.features.reactions.EmojiReactionPickerActivity +import im.vector.app.features.reactions.widget.ReactionButton +import im.vector.app.features.roomdirectory.RoomDirectoryActivity +import im.vector.app.features.roomdirectory.createroom.CreateRoomActivity +import im.vector.app.features.roommemberprofile.RoomMemberProfileActivity +import im.vector.app.features.roommemberprofile.devices.DeviceListBottomSheet +import im.vector.app.features.roomprofile.RoomProfileActivity +import im.vector.app.features.settings.VectorSettingsActivity +import im.vector.app.features.settings.devices.DeviceVerificationInfoBottomSheet +import im.vector.app.features.share.IncomingShareActivity +import im.vector.app.features.signout.soft.SoftLogoutActivity +import im.vector.app.features.terms.ReviewTermsActivity +import im.vector.app.features.ui.UiStateRepository +import im.vector.app.features.widgets.WidgetActivity +import im.vector.app.features.widgets.permissions.RoomWidgetPermissionBottomSheet +import im.vector.app.features.workers.signout.SignOutBottomSheetDialogFragment @Component( dependencies = [ diff --git a/vector/src/main/java/im/vector/riotx/core/di/ScreenModule.kt b/vector/src/main/java/im/vector/app/core/di/ScreenModule.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/core/di/ScreenModule.kt rename to vector/src/main/java/im/vector/app/core/di/ScreenModule.kt index 56fac34f1e..5f50f186d0 100644 --- a/vector/src/main/java/im/vector/riotx/core/di/ScreenModule.kt +++ b/vector/src/main/java/im/vector/app/core/di/ScreenModule.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package im.vector.riotx.core.di +package im.vector.app.core.di import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.RecyclerView import dagger.Module import dagger.Provides -import im.vector.riotx.core.glide.GlideApp +import im.vector.app.core.glide.GlideApp @Module object ScreenModule { diff --git a/vector/src/main/java/im/vector/riotx/core/di/ScreenScope.kt b/vector/src/main/java/im/vector/app/core/di/ScreenScope.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/core/di/ScreenScope.kt rename to vector/src/main/java/im/vector/app/core/di/ScreenScope.kt index 27f39b1e73..c39d6a947e 100644 --- a/vector/src/main/java/im/vector/riotx/core/di/ScreenScope.kt +++ b/vector/src/main/java/im/vector/app/core/di/ScreenScope.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.di +package im.vector.app.core.di import javax.inject.Scope diff --git a/vector/src/main/java/im/vector/riotx/core/di/VectorAssistedModule.kt b/vector/src/main/java/im/vector/app/core/di/VectorAssistedModule.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/core/di/VectorAssistedModule.kt rename to vector/src/main/java/im/vector/app/core/di/VectorAssistedModule.kt index 9d04521d49..78a935a1d4 100644 --- a/vector/src/main/java/im/vector/riotx/core/di/VectorAssistedModule.kt +++ b/vector/src/main/java/im/vector/app/core/di/VectorAssistedModule.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.di +package im.vector.app.core.di /* @Module(includes = [AssistedInject_VectorAssistedModule::class]) diff --git a/vector/src/main/java/im/vector/riotx/core/di/VectorComponent.kt b/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt similarity index 60% rename from vector/src/main/java/im/vector/riotx/core/di/VectorComponent.kt rename to vector/src/main/java/im/vector/app/core/di/VectorComponent.kt index fe627a0d04..77ed34c4c9 100644 --- a/vector/src/main/java/im/vector/riotx/core/di/VectorComponent.kt +++ b/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt @@ -14,50 +14,50 @@ * limitations under the License. */ -package im.vector.riotx.core.di +package im.vector.app.core.di import android.content.Context import android.content.res.Resources import dagger.BindsInstance import dagger.Component +import im.vector.app.ActiveSessionDataSource +import im.vector.app.EmojiCompatFontProvider +import im.vector.app.EmojiCompatWrapper +import im.vector.app.VectorApplication +import im.vector.app.core.dialogs.UnrecognizedCertificateDialog +import im.vector.app.core.error.ErrorFormatter +import im.vector.app.core.pushers.PushersManager +import im.vector.app.core.utils.AssetReader +import im.vector.app.core.utils.DimensionConverter +import im.vector.app.features.call.WebRtcPeerConnectionManager +import im.vector.app.features.configuration.VectorConfiguration +import im.vector.app.features.crypto.keysrequest.KeyRequestHandler +import im.vector.app.features.crypto.verification.IncomingVerificationRequestHandler +import im.vector.app.features.grouplist.SelectedGroupDataSource +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.home.HomeRoomListDataSource +import im.vector.app.features.html.EventHtmlRenderer +import im.vector.app.features.html.VectorHtmlCompressor +import im.vector.app.features.login.ReAuthHelper +import im.vector.app.features.navigation.Navigator +import im.vector.app.features.notifications.NotifiableEventResolver +import im.vector.app.features.notifications.NotificationBroadcastReceiver +import im.vector.app.features.notifications.NotificationDrawerManager +import im.vector.app.features.notifications.NotificationUtils +import im.vector.app.features.notifications.PushRuleTriggerListener +import im.vector.app.features.pin.PinCodeStore +import im.vector.app.features.pin.PinLocker +import im.vector.app.features.popup.PopupAlertManager +import im.vector.app.features.rageshake.BugReporter +import im.vector.app.features.rageshake.VectorFileLogger +import im.vector.app.features.rageshake.VectorUncaughtExceptionHandler +import im.vector.app.features.reactions.data.EmojiDataSource +import im.vector.app.features.session.SessionListener +import im.vector.app.features.settings.VectorPreferences +import im.vector.app.features.ui.UiStateRepository import im.vector.matrix.android.api.Matrix import im.vector.matrix.android.api.auth.AuthenticationService import im.vector.matrix.android.api.session.Session -import im.vector.riotx.ActiveSessionDataSource -import im.vector.riotx.EmojiCompatFontProvider -import im.vector.riotx.EmojiCompatWrapper -import im.vector.riotx.VectorApplication -import im.vector.riotx.core.dialogs.UnrecognizedCertificateDialog -import im.vector.riotx.core.error.ErrorFormatter -import im.vector.riotx.core.pushers.PushersManager -import im.vector.riotx.core.utils.AssetReader -import im.vector.riotx.core.utils.DimensionConverter -import im.vector.riotx.features.call.WebRtcPeerConnectionManager -import im.vector.riotx.features.configuration.VectorConfiguration -import im.vector.riotx.features.crypto.keysrequest.KeyRequestHandler -import im.vector.riotx.features.crypto.verification.IncomingVerificationRequestHandler -import im.vector.riotx.features.grouplist.SelectedGroupDataSource -import im.vector.riotx.features.home.AvatarRenderer -import im.vector.riotx.features.home.HomeRoomListDataSource -import im.vector.riotx.features.html.EventHtmlRenderer -import im.vector.riotx.features.html.VectorHtmlCompressor -import im.vector.riotx.features.login.ReAuthHelper -import im.vector.riotx.features.navigation.Navigator -import im.vector.riotx.features.notifications.NotifiableEventResolver -import im.vector.riotx.features.notifications.NotificationBroadcastReceiver -import im.vector.riotx.features.notifications.NotificationDrawerManager -import im.vector.riotx.features.notifications.NotificationUtils -import im.vector.riotx.features.notifications.PushRuleTriggerListener -import im.vector.riotx.features.pin.PinCodeStore -import im.vector.riotx.features.pin.PinLocker -import im.vector.riotx.features.popup.PopupAlertManager -import im.vector.riotx.features.rageshake.BugReporter -import im.vector.riotx.features.rageshake.VectorFileLogger -import im.vector.riotx.features.rageshake.VectorUncaughtExceptionHandler -import im.vector.riotx.features.reactions.data.EmojiDataSource -import im.vector.riotx.features.session.SessionListener -import im.vector.riotx.features.settings.VectorPreferences -import im.vector.riotx.features.ui.UiStateRepository import javax.inject.Singleton @Component(modules = [VectorModule::class]) diff --git a/vector/src/main/java/im/vector/riotx/core/di/VectorFragmentFactory.kt b/vector/src/main/java/im/vector/app/core/di/VectorFragmentFactory.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/di/VectorFragmentFactory.kt rename to vector/src/main/java/im/vector/app/core/di/VectorFragmentFactory.kt index 6b33b9e2a7..f761d99114 100644 --- a/vector/src/main/java/im/vector/riotx/core/di/VectorFragmentFactory.kt +++ b/vector/src/main/java/im/vector/app/core/di/VectorFragmentFactory.kt @@ -15,7 +15,7 @@ * */ -package im.vector.riotx.core.di +package im.vector.app.core.di import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentFactory diff --git a/vector/src/main/java/im/vector/riotx/core/di/VectorModule.kt b/vector/src/main/java/im/vector/app/core/di/VectorModule.kt similarity index 84% rename from vector/src/main/java/im/vector/riotx/core/di/VectorModule.kt rename to vector/src/main/java/im/vector/app/core/di/VectorModule.kt index 663e5dbe79..12058918a3 100644 --- a/vector/src/main/java/im/vector/riotx/core/di/VectorModule.kt +++ b/vector/src/main/java/im/vector/app/core/di/VectorModule.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.di +package im.vector.app.core.di import android.content.Context import android.content.Context.MODE_PRIVATE @@ -23,18 +23,18 @@ import android.content.res.Resources import dagger.Binds import dagger.Module import dagger.Provides +import im.vector.app.core.error.DefaultErrorFormatter +import im.vector.app.core.error.ErrorFormatter +import im.vector.app.features.navigation.DefaultNavigator +import im.vector.app.features.navigation.Navigator +import im.vector.app.features.pin.PinCodeStore +import im.vector.app.features.pin.SharedPrefPinCodeStore +import im.vector.app.features.ui.SharedPreferencesUiStateRepository +import im.vector.app.features.ui.UiStateRepository import im.vector.matrix.android.api.Matrix import im.vector.matrix.android.api.auth.AuthenticationService import im.vector.matrix.android.api.legacy.LegacySessionImporter import im.vector.matrix.android.api.session.Session -import im.vector.riotx.core.error.DefaultErrorFormatter -import im.vector.riotx.core.error.ErrorFormatter -import im.vector.riotx.features.navigation.DefaultNavigator -import im.vector.riotx.features.navigation.Navigator -import im.vector.riotx.features.pin.PinCodeStore -import im.vector.riotx.features.pin.SharedPrefPinCodeStore -import im.vector.riotx.features.ui.SharedPreferencesUiStateRepository -import im.vector.riotx.features.ui.UiStateRepository @Module abstract class VectorModule { diff --git a/vector/src/main/java/im/vector/riotx/core/di/VectorViewModelFactory.kt b/vector/src/main/java/im/vector/app/core/di/VectorViewModelFactory.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/core/di/VectorViewModelFactory.kt rename to vector/src/main/java/im/vector/app/core/di/VectorViewModelFactory.kt index 999b004beb..ded2a562c5 100644 --- a/vector/src/main/java/im/vector/riotx/core/di/VectorViewModelFactory.kt +++ b/vector/src/main/java/im/vector/app/core/di/VectorViewModelFactory.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.di +package im.vector.app.core.di import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider diff --git a/vector/src/main/java/im/vector/riotx/core/di/ViewModelKey.kt b/vector/src/main/java/im/vector/app/core/di/ViewModelKey.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/di/ViewModelKey.kt rename to vector/src/main/java/im/vector/app/core/di/ViewModelKey.kt index 09c8aadb51..5f0ee30821 100644 --- a/vector/src/main/java/im/vector/riotx/core/di/ViewModelKey.kt +++ b/vector/src/main/java/im/vector/app/core/di/ViewModelKey.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.di +package im.vector.app.core.di import androidx.lifecycle.ViewModel import dagger.MapKey diff --git a/vector/src/main/java/im/vector/riotx/core/di/ViewModelModule.kt b/vector/src/main/java/im/vector/app/core/di/ViewModelModule.kt similarity index 75% rename from vector/src/main/java/im/vector/riotx/core/di/ViewModelModule.kt rename to vector/src/main/java/im/vector/app/core/di/ViewModelModule.kt index 6ac6fa03da..836dab00c5 100644 --- a/vector/src/main/java/im/vector/riotx/core/di/ViewModelModule.kt +++ b/vector/src/main/java/im/vector/app/core/di/ViewModelModule.kt @@ -14,28 +14,28 @@ * limitations under the License. */ -package im.vector.riotx.core.di +package im.vector.app.core.di import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import dagger.Binds import dagger.Module import dagger.multibindings.IntoMap -import im.vector.riotx.core.platform.ConfigurationViewModel -import im.vector.riotx.features.call.SharedActiveCallViewModel -import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreFromKeyViewModel -import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreFromPassphraseViewModel -import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreSharedViewModel -import im.vector.riotx.features.crypto.keysbackup.setup.KeysBackupSetupSharedViewModel -import im.vector.riotx.features.discovery.DiscoverySharedViewModel -import im.vector.riotx.features.home.HomeSharedActionViewModel -import im.vector.riotx.features.home.room.detail.RoomDetailSharedActionViewModel -import im.vector.riotx.features.home.room.detail.timeline.action.MessageSharedActionViewModel -import im.vector.riotx.features.home.room.list.actions.RoomListQuickActionsSharedActionViewModel -import im.vector.riotx.features.reactions.EmojiChooserViewModel -import im.vector.riotx.features.roomdirectory.RoomDirectorySharedActionViewModel -import im.vector.riotx.features.roomprofile.RoomProfileSharedActionViewModel -import im.vector.riotx.features.userdirectory.UserDirectorySharedActionViewModel +import im.vector.app.core.platform.ConfigurationViewModel +import im.vector.app.features.call.SharedActiveCallViewModel +import im.vector.app.features.crypto.keysbackup.restore.KeysBackupRestoreFromKeyViewModel +import im.vector.app.features.crypto.keysbackup.restore.KeysBackupRestoreFromPassphraseViewModel +import im.vector.app.features.crypto.keysbackup.restore.KeysBackupRestoreSharedViewModel +import im.vector.app.features.crypto.keysbackup.setup.KeysBackupSetupSharedViewModel +import im.vector.app.features.discovery.DiscoverySharedViewModel +import im.vector.app.features.home.HomeSharedActionViewModel +import im.vector.app.features.home.room.detail.RoomDetailSharedActionViewModel +import im.vector.app.features.home.room.detail.timeline.action.MessageSharedActionViewModel +import im.vector.app.features.home.room.list.actions.RoomListQuickActionsSharedActionViewModel +import im.vector.app.features.reactions.EmojiChooserViewModel +import im.vector.app.features.roomdirectory.RoomDirectorySharedActionViewModel +import im.vector.app.features.roomprofile.RoomProfileSharedActionViewModel +import im.vector.app.features.userdirectory.UserDirectorySharedActionViewModel @Module interface ViewModelModule { diff --git a/vector/src/main/java/im/vector/riotx/core/dialogs/ConfirmationDialogBuilder.kt b/vector/src/main/java/im/vector/app/core/dialogs/ConfirmationDialogBuilder.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/dialogs/ConfirmationDialogBuilder.kt rename to vector/src/main/java/im/vector/app/core/dialogs/ConfirmationDialogBuilder.kt index aa95b29c4d..0d9fb9d93d 100644 --- a/vector/src/main/java/im/vector/riotx/core/dialogs/ConfirmationDialogBuilder.kt +++ b/vector/src/main/java/im/vector/app/core/dialogs/ConfirmationDialogBuilder.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package im.vector.riotx.core.dialogs +package im.vector.app.core.dialogs import android.app.Activity import androidx.annotation.StringRes import androidx.appcompat.app.AlertDialog import androidx.core.view.isVisible -import im.vector.riotx.R +import im.vector.app.R import kotlinx.android.synthetic.main.dialog_confirmation_with_reason.view.* object ConfirmationDialogBuilder { diff --git a/vector/src/main/java/im/vector/riotx/core/dialogs/DialogLocker.kt b/vector/src/main/java/im/vector/app/core/dialogs/DialogLocker.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/core/dialogs/DialogLocker.kt rename to vector/src/main/java/im/vector/app/core/dialogs/DialogLocker.kt index a6c1558948..caad06c959 100644 --- a/vector/src/main/java/im/vector/riotx/core/dialogs/DialogLocker.kt +++ b/vector/src/main/java/im/vector/app/core/dialogs/DialogLocker.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package im.vector.riotx.core.dialogs +package im.vector.app.core.dialogs import android.os.Bundle import androidx.appcompat.app.AlertDialog -import im.vector.riotx.core.platform.Restorable +import im.vector.app.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/riotx/core/dialogs/ExportKeysDialog.kt b/vector/src/main/java/im/vector/app/core/dialogs/ExportKeysDialog.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/core/dialogs/ExportKeysDialog.kt rename to vector/src/main/java/im/vector/app/core/dialogs/ExportKeysDialog.kt index 7275136382..b4087d5ce1 100644 --- a/vector/src/main/java/im/vector/riotx/core/dialogs/ExportKeysDialog.kt +++ b/vector/src/main/java/im/vector/app/core/dialogs/ExportKeysDialog.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.dialogs +package im.vector.app.core.dialogs import android.app.Activity import android.text.Editable @@ -23,9 +23,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.riotx.R -import im.vector.riotx.core.extensions.showPassword -import im.vector.riotx.core.platform.SimpleTextWatcher +import im.vector.app.R +import im.vector.app.core.extensions.showPassword +import im.vector.app.core.platform.SimpleTextWatcher class ExportKeysDialog { diff --git a/vector/src/main/java/im/vector/riotx/core/dialogs/Extensions.kt b/vector/src/main/java/im/vector/app/core/dialogs/Extensions.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/core/dialogs/Extensions.kt rename to vector/src/main/java/im/vector/app/core/dialogs/Extensions.kt index 1b90e88864..f444fca221 100644 --- a/vector/src/main/java/im/vector/riotx/core/dialogs/Extensions.kt +++ b/vector/src/main/java/im/vector/app/core/dialogs/Extensions.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotx.core.dialogs +package im.vector.app.core.dialogs import androidx.annotation.ColorRes import androidx.appcompat.app.AlertDialog import androidx.core.content.ContextCompat -import im.vector.riotx.R +import im.vector.app.R fun AlertDialog.withColoredButton(whichButton: Int, @ColorRes color: Int = R.color.vector_error_color): AlertDialog { getButton(whichButton)?.setTextColor(ContextCompat.getColor(context, color)) diff --git a/vector/src/main/java/im/vector/riotx/core/dialogs/ManuallyVerifyDialog.kt b/vector/src/main/java/im/vector/app/core/dialogs/ManuallyVerifyDialog.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/dialogs/ManuallyVerifyDialog.kt rename to vector/src/main/java/im/vector/app/core/dialogs/ManuallyVerifyDialog.kt index 9863f7030f..7eb0bf84e7 100644 --- a/vector/src/main/java/im/vector/riotx/core/dialogs/ManuallyVerifyDialog.kt +++ b/vector/src/main/java/im/vector/app/core/dialogs/ManuallyVerifyDialog.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.core.dialogs +package im.vector.app.core.dialogs import android.app.Activity import android.widget.TextView import androidx.appcompat.app.AlertDialog +import im.vector.app.R import im.vector.matrix.android.api.extensions.getFingerprintHumanReadable import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo -import im.vector.riotx.R object ManuallyVerifyDialog { diff --git a/vector/src/main/java/im/vector/riotx/core/dialogs/PromptPasswordDialog.kt b/vector/src/main/java/im/vector/app/core/dialogs/PromptPasswordDialog.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/core/dialogs/PromptPasswordDialog.kt rename to vector/src/main/java/im/vector/app/core/dialogs/PromptPasswordDialog.kt index 3f1582563c..76cdf1d329 100644 --- a/vector/src/main/java/im/vector/riotx/core/dialogs/PromptPasswordDialog.kt +++ b/vector/src/main/java/im/vector/app/core/dialogs/PromptPasswordDialog.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.dialogs +package im.vector.app.core.dialogs import android.app.Activity import android.content.DialogInterface @@ -24,10 +24,10 @@ 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.riotx.R -import im.vector.riotx.core.extensions.hideKeyboard -import im.vector.riotx.core.extensions.showPassword -import im.vector.riotx.core.platform.SimpleTextWatcher +import im.vector.app.R +import im.vector.app.core.extensions.hideKeyboard +import im.vector.app.core.extensions.showPassword +import im.vector.app.core.platform.SimpleTextWatcher class PromptPasswordDialog { diff --git a/vector/src/main/java/im/vector/riotx/core/dialogs/UnrecognizedCertificateDialog.kt b/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/dialogs/UnrecognizedCertificateDialog.kt rename to vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt index af2c23848f..20abf4b742 100644 --- a/vector/src/main/java/im/vector/riotx/core/dialogs/UnrecognizedCertificateDialog.kt +++ b/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.core.dialogs +package im.vector.app.core.dialogs import android.app.Activity import android.view.View import android.widget.TextView import androidx.appcompat.app.AlertDialog +import im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.resources.StringProvider import im.vector.matrix.android.internal.network.ssl.Fingerprint -import im.vector.riotx.R -import im.vector.riotx.core.di.ActiveSessionHolder -import im.vector.riotx.core.resources.StringProvider import timber.log.Timber import java.util.HashMap import java.util.HashSet diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/DividerItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/DividerItem.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/core/epoxy/DividerItem.kt rename to vector/src/main/java/im/vector/app/core/epoxy/DividerItem.kt index 8051804145..a08b7d7e0c 100644 --- a/vector/src/main/java/im/vector/riotx/core/epoxy/DividerItem.kt +++ b/vector/src/main/java/im/vector/app/core/epoxy/DividerItem.kt @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.core.epoxy +package im.vector.app.core.epoxy import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R +import im.vector.app.R /** * Default background color is for the bottom sheets (R.attr.vctr_list_bottom_sheet_divider_color). diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/EmptyItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/EmptyItem.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/core/epoxy/EmptyItem.kt rename to vector/src/main/java/im/vector/app/core/epoxy/EmptyItem.kt index c0eb007952..aaf870667b 100644 --- a/vector/src/main/java/im/vector/riotx/core/epoxy/EmptyItem.kt +++ b/vector/src/main/java/im/vector/app/core/epoxy/EmptyItem.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.core.epoxy +package im.vector.app.core.epoxy import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R +import im.vector.app.R @EpoxyModelClass(layout = R.layout.item_empty) abstract class EmptyItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/ErrorWithRetryItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/ErrorWithRetryItem.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/core/epoxy/ErrorWithRetryItem.kt rename to vector/src/main/java/im/vector/app/core/epoxy/ErrorWithRetryItem.kt index 8bc266da31..f555a70d3f 100644 --- a/vector/src/main/java/im/vector/riotx/core/epoxy/ErrorWithRetryItem.kt +++ b/vector/src/main/java/im/vector/app/core/epoxy/ErrorWithRetryItem.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.core.epoxy +package im.vector.app.core.epoxy import android.widget.Button import android.widget.TextView import androidx.core.view.isVisible import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R +import im.vector.app.R @EpoxyModelClass(layout = R.layout.item_error_retry) abstract class ErrorWithRetryItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/HelpFooterItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/HelpFooterItem.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/core/epoxy/HelpFooterItem.kt rename to vector/src/main/java/im/vector/app/core/epoxy/HelpFooterItem.kt index b9c06ecda8..bb39bd41d6 100644 --- a/vector/src/main/java/im/vector/riotx/core/epoxy/HelpFooterItem.kt +++ b/vector/src/main/java/im/vector/app/core/epoxy/HelpFooterItem.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotx.core.epoxy +package im.vector.app.core.epoxy import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R +import im.vector.app.R @EpoxyModelClass(layout = R.layout.item_help_footer) abstract class HelpFooterItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/LayoutManagerStateRestorer.kt b/vector/src/main/java/im/vector/app/core/epoxy/LayoutManagerStateRestorer.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/core/epoxy/LayoutManagerStateRestorer.kt rename to vector/src/main/java/im/vector/app/core/epoxy/LayoutManagerStateRestorer.kt index 1ee3d5e2b6..dfbdfff2b8 100644 --- a/vector/src/main/java/im/vector/riotx/core/epoxy/LayoutManagerStateRestorer.kt +++ b/vector/src/main/java/im/vector/app/core/epoxy/LayoutManagerStateRestorer.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package im.vector.riotx.core.epoxy +package im.vector.app.core.epoxy import android.os.Bundle import android.os.Parcelable import androidx.recyclerview.widget.RecyclerView -import im.vector.riotx.core.platform.DefaultListUpdateCallback -import im.vector.riotx.core.platform.Restorable +import im.vector.app.core.platform.DefaultListUpdateCallback +import im.vector.app.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/riotx/core/epoxy/Listener.kt b/vector/src/main/java/im/vector/app/core/epoxy/Listener.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/epoxy/Listener.kt rename to vector/src/main/java/im/vector/app/core/epoxy/Listener.kt index c85f186abb..e271b5abb5 100644 --- a/vector/src/main/java/im/vector/riotx/core/epoxy/Listener.kt +++ b/vector/src/main/java/im/vector/app/core/epoxy/Listener.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.epoxy +package im.vector.app.core.epoxy import android.view.View diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/LoadingItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/LoadingItem.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/core/epoxy/LoadingItem.kt rename to vector/src/main/java/im/vector/app/core/epoxy/LoadingItem.kt index e48b680126..5cf87bbf78 100644 --- a/vector/src/main/java/im/vector/riotx/core/epoxy/LoadingItem.kt +++ b/vector/src/main/java/im/vector/app/core/epoxy/LoadingItem.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotx.core.epoxy +package im.vector.app.core.epoxy import android.widget.ProgressBar import android.widget.TextView import androidx.core.view.isVisible import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.core.extensions.setTextOrHide +import im.vector.app.R +import im.vector.app.core.extensions.setTextOrHide @EpoxyModelClass(layout = R.layout.item_loading) abstract class LoadingItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/NoResultItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/NoResultItem.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/core/epoxy/NoResultItem.kt rename to vector/src/main/java/im/vector/app/core/epoxy/NoResultItem.kt index beb3e91702..d38ed93225 100644 --- a/vector/src/main/java/im/vector/riotx/core/epoxy/NoResultItem.kt +++ b/vector/src/main/java/im/vector/app/core/epoxy/NoResultItem.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotx.core.epoxy +package im.vector.app.core.epoxy import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R +import im.vector.app.R @EpoxyModelClass(layout = R.layout.item_no_result) abstract class NoResultItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/SquareLoadingItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/SquareLoadingItem.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/core/epoxy/SquareLoadingItem.kt rename to vector/src/main/java/im/vector/app/core/epoxy/SquareLoadingItem.kt index c0f6eb198f..7844a75dae 100644 --- a/vector/src/main/java/im/vector/riotx/core/epoxy/SquareLoadingItem.kt +++ b/vector/src/main/java/im/vector/app/core/epoxy/SquareLoadingItem.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.core.epoxy +package im.vector.app.core.epoxy import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R +import im.vector.app.R @EpoxyModelClass(layout = R.layout.item_loading_square) abstract class SquareLoadingItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyHolder.kt b/vector/src/main/java/im/vector/app/core/epoxy/VectorEpoxyHolder.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyHolder.kt rename to vector/src/main/java/im/vector/app/core/epoxy/VectorEpoxyHolder.kt index d7874d46e5..8a75a6bddf 100644 --- a/vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyHolder.kt +++ b/vector/src/main/java/im/vector/app/core/epoxy/VectorEpoxyHolder.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.epoxy +package im.vector.app.core.epoxy import android.view.View import com.airbnb.epoxy.EpoxyHolder diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyModel.kt b/vector/src/main/java/im/vector/app/core/epoxy/VectorEpoxyModel.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyModel.kt rename to vector/src/main/java/im/vector/app/core/epoxy/VectorEpoxyModel.kt index a1ea79cae6..fcb5a473a4 100644 --- a/vector/src/main/java/im/vector/riotx/core/epoxy/VectorEpoxyModel.kt +++ b/vector/src/main/java/im/vector/app/core/epoxy/VectorEpoxyModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.epoxy +package im.vector.app.core.epoxy import androidx.annotation.CallSuper import androidx.lifecycle.Lifecycle diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/ZeroItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/ZeroItem.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/core/epoxy/ZeroItem.kt rename to vector/src/main/java/im/vector/app/core/epoxy/ZeroItem.kt index b64abdcc6c..a65e37f96b 100644 --- a/vector/src/main/java/im/vector/riotx/core/epoxy/ZeroItem.kt +++ b/vector/src/main/java/im/vector/app/core/epoxy/ZeroItem.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.core.epoxy +package im.vector.app.core.epoxy import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R +import im.vector.app.R /** * Item of size (0, 0). diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/attributes/ButtonStyle.kt b/vector/src/main/java/im/vector/app/core/epoxy/attributes/ButtonStyle.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/core/epoxy/attributes/ButtonStyle.kt rename to vector/src/main/java/im/vector/app/core/epoxy/attributes/ButtonStyle.kt index d6cc90c0e9..ad9638cf10 100644 --- a/vector/src/main/java/im/vector/riotx/core/epoxy/attributes/ButtonStyle.kt +++ b/vector/src/main/java/im/vector/app/core/epoxy/attributes/ButtonStyle.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.epoxy.attributes +package im.vector.app.core.epoxy.attributes enum class ButtonStyle { POSITIVE, diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/attributes/ButtonType.kt b/vector/src/main/java/im/vector/app/core/epoxy/attributes/ButtonType.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/core/epoxy/attributes/ButtonType.kt rename to vector/src/main/java/im/vector/app/core/epoxy/attributes/ButtonType.kt index b3cbe9cd84..d9c171cc29 100644 --- a/vector/src/main/java/im/vector/riotx/core/epoxy/attributes/ButtonType.kt +++ b/vector/src/main/java/im/vector/app/core/epoxy/attributes/ButtonType.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.epoxy.attributes +package im.vector.app.core.epoxy.attributes enum class ButtonType { NO_BUTTON, diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/attributes/IconMode.kt b/vector/src/main/java/im/vector/app/core/epoxy/attributes/IconMode.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/core/epoxy/attributes/IconMode.kt rename to vector/src/main/java/im/vector/app/core/epoxy/attributes/IconMode.kt index c6b1ebf505..48e8d7ed92 100644 --- a/vector/src/main/java/im/vector/riotx/core/epoxy/attributes/IconMode.kt +++ b/vector/src/main/java/im/vector/app/core/epoxy/attributes/IconMode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.epoxy.attributes +package im.vector.app.core.epoxy.attributes enum class IconMode { NONE, diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetActionItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetActionItem.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetActionItem.kt rename to vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetActionItem.kt index f6acbb17c0..4beefeb737 100644 --- a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetActionItem.kt +++ b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetActionItem.kt @@ -14,7 +14,7 @@ * limitations under the License. * */ -package im.vector.riotx.core.epoxy.bottomsheet +package im.vector.app.core.epoxy.bottomsheet import android.content.res.ColorStateList import android.view.View @@ -28,10 +28,10 @@ import androidx.core.view.isVisible import androidx.core.widget.ImageViewCompat import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -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 +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.features.themes.ThemeUtils /** * A action for bottom sheet. diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt rename to vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt index 26e6fddad0..c1b5f83228 100644 --- a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt +++ b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt @@ -14,20 +14,20 @@ * limitations under the License. * */ -package im.vector.riotx.core.epoxy.bottomsheet +package im.vector.app.core.epoxy.bottomsheet import android.text.method.MovementMethod import android.widget.ImageView import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.extensions.setTextOrHide +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.home.room.detail.timeline.tools.findPillsAndProcess import im.vector.matrix.android.api.util.MatrixItem -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.features.home.AvatarRenderer -import im.vector.riotx.features.home.room.detail.timeline.tools.findPillsAndProcess /** * A message preview for bottom sheet. diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetQuickReactionsItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetQuickReactionsItem.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetQuickReactionsItem.kt rename to vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetQuickReactionsItem.kt index 5e1229bf2f..0c5919e5f3 100644 --- a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetQuickReactionsItem.kt +++ b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetQuickReactionsItem.kt @@ -14,16 +14,16 @@ * limitations under the License. * */ -package im.vector.riotx.core.epoxy.bottomsheet +package im.vector.app.core.epoxy.bottomsheet import android.graphics.Typeface import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.EmojiCompatFontProvider -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.app.EmojiCompatFontProvider +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel /** * A quick reaction list for bottom sheet. diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt similarity index 87% rename from vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt rename to vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt index 0ded037f29..f9b43a4913 100644 --- a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt +++ b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt @@ -14,7 +14,7 @@ * limitations under the License. * */ -package im.vector.riotx.core.epoxy.bottomsheet +package im.vector.app.core.epoxy.bottomsheet import android.content.res.ColorStateList import android.view.View @@ -24,16 +24,16 @@ import androidx.core.content.ContextCompat import androidx.core.widget.ImageViewCompat import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass +import im.vector.app.R +import im.vector.app.core.epoxy.ClickListener +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.epoxy.onClick +import im.vector.app.core.extensions.setTextOrHide +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.themes.ThemeUtils import im.vector.matrix.android.api.util.MatrixItem -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.ClickListener -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel -import im.vector.riotx.core.epoxy.onClick -import im.vector.riotx.core.extensions.setTextOrHide -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.home.AvatarRenderer -import im.vector.riotx.features.themes.ThemeUtils /** * A room preview for bottom sheet. diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetSendStateItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetSendStateItem.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetSendStateItem.kt rename to vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetSendStateItem.kt index df5ce4f073..119950f1b8 100644 --- a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetSendStateItem.kt +++ b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetSendStateItem.kt @@ -14,7 +14,7 @@ * limitations under the License. * */ -package im.vector.riotx.core.epoxy.bottomsheet +package im.vector.app.core.epoxy.bottomsheet import android.view.View import android.widget.TextView @@ -22,9 +22,9 @@ import androidx.annotation.DrawableRes import androidx.core.view.isVisible import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel /** * A send state for bottom sheet. diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/BaseProfileMatrixItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/core/epoxy/profiles/BaseProfileMatrixItem.kt rename to vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt index 58005ac788..1606bad811 100644 --- a/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/BaseProfileMatrixItem.kt +++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotx.core.epoxy.profiles +package im.vector.app.core.epoxy.profiles import android.view.View import androidx.core.view.isVisible import com.airbnb.epoxy.EpoxyAttribute +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.extensions.setTextOrHide +import im.vector.app.features.crypto.util.toImageRes +import im.vector.app.features.home.AvatarRenderer import im.vector.matrix.android.api.crypto.RoomEncryptionTrustLevel import im.vector.matrix.android.api.util.MatrixItem -import im.vector.riotx.core.epoxy.VectorEpoxyModel -import im.vector.riotx.core.extensions.setTextOrHide -import im.vector.riotx.features.crypto.util.toImageRes -import im.vector.riotx.features.home.AvatarRenderer abstract class BaseProfileMatrixItem : VectorEpoxyModel() { @EpoxyAttribute lateinit var avatarRenderer: AvatarRenderer diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileActionItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileActionItem.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileActionItem.kt rename to vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileActionItem.kt index c06307387d..8330b49f48 100644 --- a/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileActionItem.kt +++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileActionItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.epoxy.profiles +package im.vector.app.core.epoxy.profiles import android.content.res.ColorStateList import android.view.View @@ -25,13 +25,13 @@ import androidx.core.view.isVisible import androidx.core.widget.ImageViewCompat import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.extensions.setTextOrHide +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.themes.ThemeUtils import im.vector.matrix.android.api.util.MatrixItem -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.features.home.AvatarRenderer -import im.vector.riotx.features.themes.ThemeUtils @EpoxyModelClass(layout = R.layout.item_profile_action) abstract class ProfileActionItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileItemExtensions.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileItemExtensions.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileItemExtensions.kt rename to vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileItemExtensions.kt index 1f3aff0de6..1f1bc93185 100644 --- a/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileItemExtensions.kt +++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileItemExtensions.kt @@ -15,14 +15,14 @@ * */ -package im.vector.riotx.core.epoxy.profiles +package im.vector.app.core.epoxy.profiles import androidx.annotation.DrawableRes import com.airbnb.epoxy.EpoxyController +import im.vector.app.core.epoxy.ClickListener +import im.vector.app.core.epoxy.dividerItem +import im.vector.app.features.home.AvatarRenderer import im.vector.matrix.android.api.util.MatrixItem -import im.vector.riotx.core.epoxy.ClickListener -import im.vector.riotx.core.epoxy.dividerItem -import im.vector.riotx.features.home.AvatarRenderer fun EpoxyController.buildProfileSection(title: String) { profileSectionItem { diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileMatrixItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItem.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileMatrixItem.kt rename to vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItem.kt index f704c7dd7d..e8fc671d33 100644 --- a/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileMatrixItem.kt +++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItem.kt @@ -15,14 +15,14 @@ * */ -package im.vector.riotx.core.epoxy.profiles +package im.vector.app.core.epoxy.profiles import android.view.View import android.widget.ImageView import android.widget.TextView import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder @EpoxyModelClass(layout = R.layout.item_profile_matrix_item) abstract class ProfileMatrixItem : BaseProfileMatrixItem() { diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileMatrixItemWithProgress.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItemWithProgress.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileMatrixItemWithProgress.kt rename to vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItemWithProgress.kt index 1ad538ec6d..4966032dde 100644 --- a/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileMatrixItemWithProgress.kt +++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileMatrixItemWithProgress.kt @@ -15,13 +15,13 @@ * */ -package im.vector.riotx.core.epoxy.profiles +package im.vector.app.core.epoxy.profiles import android.widget.ProgressBar import androidx.core.view.isVisible import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R +import im.vector.app.R @EpoxyModelClass(layout = R.layout.item_profile_matrix_item_progress) abstract class ProfileMatrixItemWithProgress : BaseProfileMatrixItem() { diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileSectionItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileSectionItem.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileSectionItem.kt rename to vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileSectionItem.kt index ea3e66ad03..6fa1ed23be 100644 --- a/vector/src/main/java/im/vector/riotx/core/epoxy/profiles/ProfileSectionItem.kt +++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileSectionItem.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.core.epoxy.profiles +package im.vector.app.core.epoxy.profiles import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel @EpoxyModelClass(layout = R.layout.item_profile_section) abstract class ProfileSectionItem: VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/core/error/ErrorFormatter.kt b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/core/error/ErrorFormatter.kt rename to vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt index e33f19a59c..2326db6749 100644 --- a/vector/src/main/java/im/vector/riotx/core/error/ErrorFormatter.kt +++ b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.core.error +package im.vector.app.core.error +import im.vector.app.R +import im.vector.app.core.resources.StringProvider import im.vector.matrix.android.api.failure.Failure import im.vector.matrix.android.api.failure.MatrixError import im.vector.matrix.android.api.failure.isInvalidPassword import im.vector.matrix.android.api.session.identity.IdentityServiceError -import im.vector.riotx.R -import im.vector.riotx.core.resources.StringProvider import java.net.HttpURLConnection import java.net.SocketTimeoutException import java.net.UnknownHostException diff --git a/vector/src/main/java/im/vector/riotx/core/error/ResourceLimitErrorFormatter.kt b/vector/src/main/java/im/vector/app/core/error/ResourceLimitErrorFormatter.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/error/ResourceLimitErrorFormatter.kt rename to vector/src/main/java/im/vector/app/core/error/ResourceLimitErrorFormatter.kt index 9725120738..9ff005032f 100644 --- a/vector/src/main/java/im/vector/riotx/core/error/ResourceLimitErrorFormatter.kt +++ b/vector/src/main/java/im/vector/app/core/error/ResourceLimitErrorFormatter.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package im.vector.riotx.core.error +package im.vector.app.core.error import android.content.Context import androidx.annotation.StringRes import androidx.core.text.HtmlCompat +import im.vector.app.R import im.vector.matrix.android.api.failure.MatrixError -import im.vector.riotx.R import me.gujun.android.span.span class ResourceLimitErrorFormatter(private val context: Context) { diff --git a/vector/src/main/java/im/vector/riotx/core/error/fatal.kt b/vector/src/main/java/im/vector/app/core/error/fatal.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/error/fatal.kt rename to vector/src/main/java/im/vector/app/core/error/fatal.kt index ad6a99928a..8105e7fff9 100644 --- a/vector/src/main/java/im/vector/riotx/core/error/fatal.kt +++ b/vector/src/main/java/im/vector/app/core/error/fatal.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.error +package im.vector.app.core.error import timber.log.Timber diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/Activity.kt b/vector/src/main/java/im/vector/app/core/extensions/Activity.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/extensions/Activity.kt rename to vector/src/main/java/im/vector/app/core/extensions/Activity.kt index cc6eb54154..ee94013d1b 100644 --- a/vector/src/main/java/im/vector/riotx/core/extensions/Activity.kt +++ b/vector/src/main/java/im/vector/app/core/extensions/Activity.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package im.vector.riotx.core.extensions +package im.vector.app.core.extensions import android.app.Activity import android.os.Parcelable import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentTransaction -import im.vector.riotx.core.platform.VectorBaseActivity +import im.vector.app.core.platform.VectorBaseActivity fun VectorBaseActivity.addFragment(frameId: Int, fragment: Fragment) { supportFragmentManager.commitTransaction { add(frameId, fragment) } diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/BasicExtensions.kt b/vector/src/main/java/im/vector/app/core/extensions/BasicExtensions.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/extensions/BasicExtensions.kt rename to vector/src/main/java/im/vector/app/core/extensions/BasicExtensions.kt index 99a5cb5a1a..8e1f293a4c 100644 --- a/vector/src/main/java/im/vector/riotx/core/extensions/BasicExtensions.kt +++ b/vector/src/main/java/im/vector/app/core/extensions/BasicExtensions.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.extensions +package im.vector.app.core.extensions import android.os.Bundle import android.util.Patterns diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/Collections.kt b/vector/src/main/java/im/vector/app/core/extensions/Collections.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/core/extensions/Collections.kt rename to vector/src/main/java/im/vector/app/core/extensions/Collections.kt index af5d5babb6..5168915c9c 100644 --- a/vector/src/main/java/im/vector/riotx/core/extensions/Collections.kt +++ b/vector/src/main/java/im/vector/app/core/extensions/Collections.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.extensions +package im.vector.app.core.extensions inline fun List.nextOrNull(index: Int) = getOrNull(index + 1) inline fun List.prevOrNull(index: Int) = getOrNull(index - 1) diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/Context.kt b/vector/src/main/java/im/vector/app/core/extensions/Context.kt similarity index 87% rename from vector/src/main/java/im/vector/riotx/core/extensions/Context.kt rename to vector/src/main/java/im/vector/app/core/extensions/Context.kt index 3fdc4dbd8e..c1c435edf2 100644 --- a/vector/src/main/java/im/vector/riotx/core/extensions/Context.kt +++ b/vector/src/main/java/im/vector/app/core/extensions/Context.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package im.vector.riotx.core.extensions +package im.vector.app.core.extensions import android.content.Context -import im.vector.riotx.core.di.HasVectorInjector -import im.vector.riotx.core.di.VectorComponent +import im.vector.app.core.di.HasVectorInjector +import im.vector.app.core.di.VectorComponent fun Context.vectorComponent(): VectorComponent { val appContext = applicationContext diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/EditText.kt b/vector/src/main/java/im/vector/app/core/extensions/EditText.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/core/extensions/EditText.kt rename to vector/src/main/java/im/vector/app/core/extensions/EditText.kt index e0e2a78de5..355dd8442f 100644 --- a/vector/src/main/java/im/vector/riotx/core/extensions/EditText.kt +++ b/vector/src/main/java/im/vector/app/core/extensions/EditText.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.extensions +package im.vector.app.core.extensions import android.text.Editable import android.text.InputType @@ -23,8 +23,8 @@ import android.view.View import android.view.inputmethod.EditorInfo import android.widget.EditText import androidx.annotation.DrawableRes -import im.vector.riotx.R -import im.vector.riotx.core.platform.SimpleTextWatcher +import im.vector.app.R +import im.vector.app.core.platform.SimpleTextWatcher fun EditText.setupAsSearch(@DrawableRes searchIconRes: Int = R.drawable.ic_filter, @DrawableRes clearIconRes: Int = R.drawable.ic_x_gray) { diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/Event.kt b/vector/src/main/java/im/vector/app/core/extensions/Event.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/core/extensions/Event.kt rename to vector/src/main/java/im/vector/app/core/extensions/Event.kt index 7d387c40ec..e892de1e6a 100644 --- a/vector/src/main/java/im/vector/riotx/core/extensions/Event.kt +++ b/vector/src/main/java/im/vector/app/core/extensions/Event.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.core.extensions +package im.vector.app.core.extensions +import im.vector.app.core.resources.DateProvider import im.vector.matrix.android.api.session.events.model.Event -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/riotx/core/extensions/Exhaustive.kt b/vector/src/main/java/im/vector/app/core/extensions/Exhaustive.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/core/extensions/Exhaustive.kt rename to vector/src/main/java/im/vector/app/core/extensions/Exhaustive.kt index ac6e14392e..158ea84f0c 100644 --- a/vector/src/main/java/im/vector/riotx/core/extensions/Exhaustive.kt +++ b/vector/src/main/java/im/vector/app/core/extensions/Exhaustive.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.extensions +package im.vector.app.core.extensions // Trick to ensure that when block is exhaustive val T.exhaustive: T get() = this diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/Fragment.kt b/vector/src/main/java/im/vector/app/core/extensions/Fragment.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/extensions/Fragment.kt rename to vector/src/main/java/im/vector/app/core/extensions/Fragment.kt index 4c007e60d6..6ba250ee1b 100644 --- a/vector/src/main/java/im/vector/riotx/core/extensions/Fragment.kt +++ b/vector/src/main/java/im/vector/app/core/extensions/Fragment.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.core.extensions +package im.vector.app.core.extensions import android.app.Activity import android.os.Parcelable import androidx.fragment.app.Fragment -import im.vector.riotx.R -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.utils.selectTxtFileToWrite +import im.vector.app.R +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.utils.selectTxtFileToWrite import java.text.SimpleDateFormat import java.util.Date import java.util.Locale diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/FragmentManager.kt b/vector/src/main/java/im/vector/app/core/extensions/FragmentManager.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/extensions/FragmentManager.kt rename to vector/src/main/java/im/vector/app/core/extensions/FragmentManager.kt index 83ac540830..5bb9fd0e65 100644 --- a/vector/src/main/java/im/vector/riotx/core/extensions/FragmentManager.kt +++ b/vector/src/main/java/im/vector/app/core/extensions/FragmentManager.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.extensions +package im.vector.app.core.extensions import androidx.fragment.app.FragmentTransaction import im.vector.matrix.android.api.extensions.tryThis diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/Iterable.kt b/vector/src/main/java/im/vector/app/core/extensions/Iterable.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/extensions/Iterable.kt rename to vector/src/main/java/im/vector/app/core/extensions/Iterable.kt index b9907f8789..56a9bbe39f 100644 --- a/vector/src/main/java/im/vector/riotx/core/extensions/Iterable.kt +++ b/vector/src/main/java/im/vector/app/core/extensions/Iterable.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.extensions +package im.vector.app.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/riotx/core/extensions/LiveData.kt b/vector/src/main/java/im/vector/app/core/extensions/LiveData.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/core/extensions/LiveData.kt rename to vector/src/main/java/im/vector/app/core/extensions/LiveData.kt index 23af9e320f..192953f609 100644 --- a/vector/src/main/java/im/vector/riotx/core/extensions/LiveData.kt +++ b/vector/src/main/java/im/vector/app/core/extensions/LiveData.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotx.core.extensions +package im.vector.app.core.extensions import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Observer -import im.vector.riotx.core.utils.EventObserver -import im.vector.riotx.core.utils.FirstThrottler -import im.vector.riotx.core.utils.LiveEvent +import im.vector.app.core.utils.EventObserver +import im.vector.app.core.utils.FirstThrottler +import im.vector.app.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/riotx/core/extensions/RecyclerView.kt b/vector/src/main/java/im/vector/app/core/extensions/RecyclerView.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/core/extensions/RecyclerView.kt rename to vector/src/main/java/im/vector/app/core/extensions/RecyclerView.kt index 3762c52d45..f7d51cd862 100644 --- a/vector/src/main/java/im/vector/riotx/core/extensions/RecyclerView.kt +++ b/vector/src/main/java/im/vector/app/core/extensions/RecyclerView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.extensions +package im.vector.app.core.extensions import androidx.core.content.ContextCompat import androidx.recyclerview.widget.DividerItemDecoration @@ -22,8 +22,8 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.airbnb.epoxy.EpoxyController import com.airbnb.epoxy.EpoxyVisibilityTracker -import im.vector.riotx.R -import im.vector.riotx.features.themes.ThemeUtils +import im.vector.app.R +import im.vector.app.features.themes.ThemeUtils /** * Apply a Vertical LinearLayout Manager to the recyclerView and set the adapter from the epoxy controller diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/Session.kt b/vector/src/main/java/im/vector/app/core/extensions/Session.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/extensions/Session.kt rename to vector/src/main/java/im/vector/app/core/extensions/Session.kt index 9d49319896..d040714715 100644 --- a/vector/src/main/java/im/vector/riotx/core/extensions/Session.kt +++ b/vector/src/main/java/im/vector/app/core/extensions/Session.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package im.vector.riotx.core.extensions +package im.vector.app.core.extensions import android.content.Context import androidx.core.content.ContextCompat import androidx.lifecycle.Lifecycle import androidx.lifecycle.ProcessLifecycleOwner +import im.vector.app.core.services.VectorSyncService 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.FilterService -import im.vector.riotx.core.services.VectorSyncService import timber.log.Timber fun Session.configureAndStart(context: Context) { diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/Set.kt b/vector/src/main/java/im/vector/app/core/extensions/Set.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/core/extensions/Set.kt rename to vector/src/main/java/im/vector/app/core/extensions/Set.kt index 43eb1b0d7c..a78fb85a1d 100644 --- a/vector/src/main/java/im/vector/riotx/core/extensions/Set.kt +++ b/vector/src/main/java/im/vector/app/core/extensions/Set.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.extensions +package im.vector.app.core.extensions // Create a new Set including the provided element if not already present, or removing the element if already present fun Set.toggle(element: T): Set { diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/TextView.kt b/vector/src/main/java/im/vector/app/core/extensions/TextView.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/core/extensions/TextView.kt rename to vector/src/main/java/im/vector/app/core/extensions/TextView.kt index 9fbeb5f2af..cafcf6d1d8 100644 --- a/vector/src/main/java/im/vector/riotx/core/extensions/TextView.kt +++ b/vector/src/main/java/im/vector/app/core/extensions/TextView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.extensions +package im.vector.app.core.extensions import android.text.Spannable import android.text.SpannableString @@ -24,8 +24,8 @@ import android.widget.TextView import androidx.annotation.AttrRes import androidx.annotation.StringRes import androidx.core.view.isVisible -import im.vector.riotx.R -import im.vector.riotx.features.themes.ThemeUtils +import im.vector.app.R +import im.vector.app.features.themes.ThemeUtils /** * Set a text in the TextView, or set visibility to GONE if the text is null diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/TimelineEvent.kt b/vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/extensions/TimelineEvent.kt rename to vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt index 388ec9bebe..44c3c4b980 100644 --- a/vector/src/main/java/im/vector/riotx/core/extensions/TimelineEvent.kt +++ b/vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.extensions +package im.vector.app.core.extensions import im.vector.matrix.android.api.session.events.model.EventType import im.vector.matrix.android.api.session.room.send.SendState diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/UrlExtensions.kt b/vector/src/main/java/im/vector/app/core/extensions/UrlExtensions.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/extensions/UrlExtensions.kt rename to vector/src/main/java/im/vector/app/core/extensions/UrlExtensions.kt index 7614fda619..38977d33ba 100644 --- a/vector/src/main/java/im/vector/riotx/core/extensions/UrlExtensions.kt +++ b/vector/src/main/java/im/vector/app/core/extensions/UrlExtensions.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.extensions +package im.vector.app.core.extensions import java.net.URLEncoder diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/View.kt b/vector/src/main/java/im/vector/app/core/extensions/View.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/extensions/View.kt rename to vector/src/main/java/im/vector/app/core/extensions/View.kt index 41f98ed264..d8156d5857 100644 --- a/vector/src/main/java/im/vector/riotx/core/extensions/View.kt +++ b/vector/src/main/java/im/vector/app/core/extensions/View.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.extensions +package im.vector.app.core.extensions import android.content.Context import android.view.View diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/ViewExtensions.kt b/vector/src/main/java/im/vector/app/core/extensions/ViewExtensions.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/extensions/ViewExtensions.kt rename to vector/src/main/java/im/vector/app/core/extensions/ViewExtensions.kt index e7bd2122b6..31aaac41f0 100644 --- a/vector/src/main/java/im/vector/riotx/core/extensions/ViewExtensions.kt +++ b/vector/src/main/java/im/vector/app/core/extensions/ViewExtensions.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.core.extensions +package im.vector.app.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.riotx.R +import im.vector.app.R /** * Remove left margin of a SearchView diff --git a/vector/src/main/java/im/vector/riotx/core/files/FileSaver.kt b/vector/src/main/java/im/vector/app/core/files/FileSaver.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/core/files/FileSaver.kt rename to vector/src/main/java/im/vector/app/core/files/FileSaver.kt index 21bc16b09f..eb68110995 100644 --- a/vector/src/main/java/im/vector/riotx/core/files/FileSaver.kt +++ b/vector/src/main/java/im/vector/app/core/files/FileSaver.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.files +package im.vector.app.core.files import android.app.DownloadManager import android.content.ContentValues diff --git a/vector/src/main/java/im/vector/riotx/core/glide/ElementToDecryptOption.kt b/vector/src/main/java/im/vector/app/core/glide/ElementToDecryptOption.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/glide/ElementToDecryptOption.kt rename to vector/src/main/java/im/vector/app/core/glide/ElementToDecryptOption.kt index 88e60d4f7e..c4b39f7f69 100644 --- a/vector/src/main/java/im/vector/riotx/core/glide/ElementToDecryptOption.kt +++ b/vector/src/main/java/im/vector/app/core/glide/ElementToDecryptOption.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.glide +package im.vector.app.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/riotx/core/glide/FactoryUrl.kt b/vector/src/main/java/im/vector/app/core/glide/FactoryUrl.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/core/glide/FactoryUrl.kt rename to vector/src/main/java/im/vector/app/core/glide/FactoryUrl.kt index fc037894db..d52d5814ad 100644 --- a/vector/src/main/java/im/vector/riotx/core/glide/FactoryUrl.kt +++ b/vector/src/main/java/im/vector/app/core/glide/FactoryUrl.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.core.glide +package im.vector.app.core.glide import com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader import com.bumptech.glide.load.model.GlideUrl import com.bumptech.glide.load.model.ModelLoader import com.bumptech.glide.load.model.ModelLoaderFactory import com.bumptech.glide.load.model.MultiModelLoaderFactory -import im.vector.riotx.ActiveSessionDataSource +import im.vector.app.ActiveSessionDataSource import okhttp3.OkHttpClient import java.io.InputStream diff --git a/vector/src/main/java/im/vector/riotx/core/glide/MyAppGlideModule.kt b/vector/src/main/java/im/vector/app/core/glide/MyAppGlideModule.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/core/glide/MyAppGlideModule.kt rename to vector/src/main/java/im/vector/app/core/glide/MyAppGlideModule.kt index a9bd910851..a51410165b 100644 --- a/vector/src/main/java/im/vector/riotx/core/glide/MyAppGlideModule.kt +++ b/vector/src/main/java/im/vector/app/core/glide/MyAppGlideModule.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.glide +package im.vector.app.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.riotx.core.extensions.vectorComponent -import im.vector.riotx.features.media.ImageContentRenderer +import im.vector.app.core.extensions.vectorComponent +import im.vector.app.features.media.ImageContentRenderer import java.io.InputStream @GlideModule diff --git a/vector/src/main/java/im/vector/riotx/core/glide/VectorGlideModelLoader.kt b/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/glide/VectorGlideModelLoader.kt rename to vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt index 510eef71e1..315bfd3019 100644 --- a/vector/src/main/java/im/vector/riotx/core/glide/VectorGlideModelLoader.kt +++ b/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.glide +package im.vector.app.core.glide import com.bumptech.glide.Priority import com.bumptech.glide.load.DataSource @@ -24,9 +24,9 @@ import com.bumptech.glide.load.model.ModelLoader import com.bumptech.glide.load.model.ModelLoaderFactory import com.bumptech.glide.load.model.MultiModelLoaderFactory import com.bumptech.glide.signature.ObjectKey +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.features.media.ImageContentRenderer import im.vector.matrix.android.api.Matrix -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/riotx/core/hardware/HardwareInfo.kt b/vector/src/main/java/im/vector/app/core/hardware/HardwareInfo.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/hardware/HardwareInfo.kt rename to vector/src/main/java/im/vector/app/core/hardware/HardwareInfo.kt index 1ce0dda025..0dae558f00 100644 --- a/vector/src/main/java/im/vector/riotx/core/hardware/HardwareInfo.kt +++ b/vector/src/main/java/im/vector/app/core/hardware/HardwareInfo.kt @@ -16,7 +16,7 @@ @file:Suppress("DEPRECATION") -package im.vector.riotx.core.hardware +package im.vector.app.core.hardware import android.content.Context import android.hardware.Camera diff --git a/vector/src/main/java/im/vector/riotx/core/hardware/vibrator.kt b/vector/src/main/java/im/vector/app/core/hardware/vibrator.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/hardware/vibrator.kt rename to vector/src/main/java/im/vector/app/core/hardware/vibrator.kt index 8fc24d7fff..64a7886c2c 100644 --- a/vector/src/main/java/im/vector/riotx/core/hardware/vibrator.kt +++ b/vector/src/main/java/im/vector/app/core/hardware/vibrator.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.hardware +package im.vector.app.core.hardware import android.content.Context import android.os.Build diff --git a/vector/src/main/java/im/vector/riotx/core/intent/ExternalIntentAnalyser.kt b/vector/src/main/java/im/vector/app/core/intent/ExternalIntentAnalyser.kt similarity index 99% rename from vector/src/main/java/im/vector/riotx/core/intent/ExternalIntentAnalyser.kt rename to vector/src/main/java/im/vector/app/core/intent/ExternalIntentAnalyser.kt index 11710d3e13..44bc842447 100644 --- a/vector/src/main/java/im/vector/riotx/core/intent/ExternalIntentAnalyser.kt +++ b/vector/src/main/java/im/vector/app/core/intent/ExternalIntentAnalyser.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.intent +package im.vector.app.core.intent import android.content.ClipData import android.content.ClipDescription diff --git a/vector/src/main/java/im/vector/riotx/core/intent/Filename.kt b/vector/src/main/java/im/vector/app/core/intent/Filename.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/intent/Filename.kt rename to vector/src/main/java/im/vector/app/core/intent/Filename.kt index 2b6740f62f..5d118c19a1 100644 --- a/vector/src/main/java/im/vector/riotx/core/intent/Filename.kt +++ b/vector/src/main/java/im/vector/app/core/intent/Filename.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.intent +package im.vector.app.core.intent import android.content.Context import android.net.Uri diff --git a/vector/src/main/java/im/vector/riotx/core/intent/VectorMimeType.kt b/vector/src/main/java/im/vector/app/core/intent/VectorMimeType.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/core/intent/VectorMimeType.kt rename to vector/src/main/java/im/vector/app/core/intent/VectorMimeType.kt index b6ca7fbe8b..c8a2bf65d5 100644 --- a/vector/src/main/java/im/vector/riotx/core/intent/VectorMimeType.kt +++ b/vector/src/main/java/im/vector/app/core/intent/VectorMimeType.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotx.core.intent +package im.vector.app.core.intent import android.content.Context import android.net.Uri import android.webkit.MimeTypeMap -import im.vector.riotx.core.utils.getFileExtension +import im.vector.app.core.utils.getFileExtension import timber.log.Timber /** diff --git a/vector/src/main/java/im/vector/riotx/core/linkify/VectorAutoLinkPatterns.kt b/vector/src/main/java/im/vector/app/core/linkify/VectorAutoLinkPatterns.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/linkify/VectorAutoLinkPatterns.kt rename to vector/src/main/java/im/vector/app/core/linkify/VectorAutoLinkPatterns.kt index ae4131b5e9..bc45ab5676 100644 --- a/vector/src/main/java/im/vector/riotx/core/linkify/VectorAutoLinkPatterns.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.core.linkify +package im.vector.app.core.linkify /** * Better support for geo URi diff --git a/vector/src/main/java/im/vector/riotx/core/linkify/VectorLinkify.kt b/vector/src/main/java/im/vector/app/core/linkify/VectorLinkify.kt similarity index 99% rename from vector/src/main/java/im/vector/riotx/core/linkify/VectorLinkify.kt rename to vector/src/main/java/im/vector/app/core/linkify/VectorLinkify.kt index 99b0316cbe..d7dea789d3 100644 --- a/vector/src/main/java/im/vector/riotx/core/linkify/VectorLinkify.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.core.linkify +package im.vector.app.core.linkify import android.text.Spannable import android.text.style.URLSpan diff --git a/vector/src/main/java/im/vector/riotx/core/platform/BadgeFloatingActionButton.kt b/vector/src/main/java/im/vector/app/core/platform/BadgeFloatingActionButton.kt similarity index 99% rename from vector/src/main/java/im/vector/riotx/core/platform/BadgeFloatingActionButton.kt rename to vector/src/main/java/im/vector/app/core/platform/BadgeFloatingActionButton.kt index 49931e2b54..088a535435 100644 --- a/vector/src/main/java/im/vector/riotx/core/platform/BadgeFloatingActionButton.kt +++ b/vector/src/main/java/im/vector/app/core/platform/BadgeFloatingActionButton.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.platform +package im.vector.app.core.platform import android.content.Context import android.graphics.Canvas @@ -28,7 +28,7 @@ import android.text.TextPaint import android.util.AttributeSet import androidx.core.content.res.use import com.google.android.material.floatingactionbutton.FloatingActionButton -import im.vector.riotx.R +import im.vector.app.R import kotlin.math.PI import kotlin.math.cos import kotlin.math.max diff --git a/vector/src/main/java/im/vector/riotx/core/platform/ButtonStateView.kt b/vector/src/main/java/im/vector/app/core/platform/ButtonStateView.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/core/platform/ButtonStateView.kt rename to vector/src/main/java/im/vector/app/core/platform/ButtonStateView.kt index 9753b26691..cb05a2ac7d 100755 --- a/vector/src/main/java/im/vector/riotx/core/platform/ButtonStateView.kt +++ b/vector/src/main/java/im/vector/app/core/platform/ButtonStateView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.platform +package im.vector.app.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.riotx.R +import im.vector.app.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/riotx/core/platform/CheckableConstraintLayout.kt b/vector/src/main/java/im/vector/app/core/platform/CheckableConstraintLayout.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/platform/CheckableConstraintLayout.kt rename to vector/src/main/java/im/vector/app/core/platform/CheckableConstraintLayout.kt index 4943e986c8..e81acac327 100644 --- a/vector/src/main/java/im/vector/riotx/core/platform/CheckableConstraintLayout.kt +++ b/vector/src/main/java/im/vector/app/core/platform/CheckableConstraintLayout.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.platform +package im.vector.app.core.platform import android.content.Context import android.util.AttributeSet diff --git a/vector/src/main/java/im/vector/riotx/core/platform/CheckableFrameLayout.kt b/vector/src/main/java/im/vector/app/core/platform/CheckableFrameLayout.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/platform/CheckableFrameLayout.kt rename to vector/src/main/java/im/vector/app/core/platform/CheckableFrameLayout.kt index 281adc0b05..a755903468 100644 --- a/vector/src/main/java/im/vector/riotx/core/platform/CheckableFrameLayout.kt +++ b/vector/src/main/java/im/vector/app/core/platform/CheckableFrameLayout.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.platform +package im.vector.app.core.platform import android.content.Context import android.util.AttributeSet diff --git a/vector/src/main/java/im/vector/riotx/core/platform/CheckableImageView.kt b/vector/src/main/java/im/vector/app/core/platform/CheckableImageView.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/platform/CheckableImageView.kt rename to vector/src/main/java/im/vector/app/core/platform/CheckableImageView.kt index 3f8c3f1b45..a6e82347b6 100644 --- a/vector/src/main/java/im/vector/riotx/core/platform/CheckableImageView.kt +++ b/vector/src/main/java/im/vector/app/core/platform/CheckableImageView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.platform +package im.vector.app.core.platform import android.content.Context import android.util.AttributeSet diff --git a/vector/src/main/java/im/vector/riotx/core/platform/CheckableView.kt b/vector/src/main/java/im/vector/app/core/platform/CheckableView.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/platform/CheckableView.kt rename to vector/src/main/java/im/vector/app/core/platform/CheckableView.kt index 2380c42ec0..bf24e01cb3 100644 --- a/vector/src/main/java/im/vector/riotx/core/platform/CheckableView.kt +++ b/vector/src/main/java/im/vector/app/core/platform/CheckableView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.platform +package im.vector.app.core.platform import android.content.Context import android.util.AttributeSet diff --git a/vector/src/main/java/im/vector/riotx/core/platform/ConfigurationViewModel.kt b/vector/src/main/java/im/vector/app/core/platform/ConfigurationViewModel.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/core/platform/ConfigurationViewModel.kt rename to vector/src/main/java/im/vector/app/core/platform/ConfigurationViewModel.kt index 779307526e..9186dba368 100644 --- a/vector/src/main/java/im/vector/riotx/core/platform/ConfigurationViewModel.kt +++ b/vector/src/main/java/im/vector/app/core/platform/ConfigurationViewModel.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.core.platform +package im.vector.app.core.platform import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import im.vector.riotx.core.extensions.postLiveEvent -import im.vector.riotx.core.utils.LiveEvent -import im.vector.riotx.features.configuration.VectorConfiguration +import im.vector.app.core.extensions.postLiveEvent +import im.vector.app.core.utils.LiveEvent +import im.vector.app.features.configuration.VectorConfiguration import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/core/platform/DefaultListUpdateCallback.kt b/vector/src/main/java/im/vector/app/core/platform/DefaultListUpdateCallback.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/platform/DefaultListUpdateCallback.kt rename to vector/src/main/java/im/vector/app/core/platform/DefaultListUpdateCallback.kt index 11b73dead9..b6cab4e29f 100644 --- a/vector/src/main/java/im/vector/riotx/core/platform/DefaultListUpdateCallback.kt +++ b/vector/src/main/java/im/vector/app/core/platform/DefaultListUpdateCallback.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.platform +package im.vector.app.core.platform import androidx.recyclerview.widget.ListUpdateCallback diff --git a/vector/src/main/java/im/vector/riotx/core/platform/MaxHeightScrollView.kt b/vector/src/main/java/im/vector/app/core/platform/MaxHeightScrollView.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/platform/MaxHeightScrollView.kt rename to vector/src/main/java/im/vector/app/core/platform/MaxHeightScrollView.kt index 99c158252f..139ccc8c05 100644 --- a/vector/src/main/java/im/vector/riotx/core/platform/MaxHeightScrollView.kt +++ b/vector/src/main/java/im/vector/app/core/platform/MaxHeightScrollView.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package im.vector.riotx.core.platform +package im.vector.app.core.platform import android.content.Context import android.util.AttributeSet import androidx.core.content.withStyledAttributes import androidx.core.widget.NestedScrollView -import im.vector.riotx.R +import im.vector.app.R private const val DEFAULT_MAX_HEIGHT = 200 diff --git a/vector/src/main/java/im/vector/riotx/core/platform/OnBackPressed.kt b/vector/src/main/java/im/vector/app/core/platform/OnBackPressed.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/core/platform/OnBackPressed.kt rename to vector/src/main/java/im/vector/app/core/platform/OnBackPressed.kt index c8a58997a1..195fab6482 100644 --- a/vector/src/main/java/im/vector/riotx/core/platform/OnBackPressed.kt +++ b/vector/src/main/java/im/vector/app/core/platform/OnBackPressed.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.platform +package im.vector.app.core.platform interface OnBackPressed { diff --git a/vector/src/main/java/im/vector/riotx/core/platform/Restorable.kt b/vector/src/main/java/im/vector/app/core/platform/Restorable.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/core/platform/Restorable.kt rename to vector/src/main/java/im/vector/app/core/platform/Restorable.kt index e80af54619..280ed97935 100644 --- a/vector/src/main/java/im/vector/riotx/core/platform/Restorable.kt +++ b/vector/src/main/java/im/vector/app/core/platform/Restorable.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.platform +package im.vector.app.core.platform import android.os.Bundle diff --git a/vector/src/main/java/im/vector/riotx/core/platform/SimpleFragmentActivity.kt b/vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/core/platform/SimpleFragmentActivity.kt rename to vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt index 58ec4b22c6..56035d778a 100644 --- a/vector/src/main/java/im/vector/riotx/core/platform/SimpleFragmentActivity.kt +++ b/vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.core.platform +package im.vector.app.core.platform import android.view.View import android.widget.ProgressBar @@ -22,10 +22,10 @@ import androidx.annotation.CallSuper import androidx.core.view.isGone import androidx.core.view.isVisible import butterknife.BindView +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.extensions.hideKeyboard import im.vector.matrix.android.api.session.Session -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/riotx/core/platform/SimpleTextWatcher.kt b/vector/src/main/java/im/vector/app/core/platform/SimpleTextWatcher.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/platform/SimpleTextWatcher.kt rename to vector/src/main/java/im/vector/app/core/platform/SimpleTextWatcher.kt index f968bfb5c1..75deebe1ba 100644 --- a/vector/src/main/java/im/vector/riotx/core/platform/SimpleTextWatcher.kt +++ b/vector/src/main/java/im/vector/app/core/platform/SimpleTextWatcher.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.platform +package im.vector.app.core.platform import android.text.Editable import android.text.TextWatcher diff --git a/vector/src/main/java/im/vector/riotx/core/platform/StateView.kt b/vector/src/main/java/im/vector/app/core/platform/StateView.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/platform/StateView.kt rename to vector/src/main/java/im/vector/app/core/platform/StateView.kt index bc24874f9f..2af3235cdf 100755 --- a/vector/src/main/java/im/vector/riotx/core/platform/StateView.kt +++ b/vector/src/main/java/im/vector/app/core/platform/StateView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.platform +package im.vector.app.core.platform import android.content.Context import android.graphics.drawable.Drawable @@ -22,7 +22,7 @@ import android.util.AttributeSet import android.view.View import android.widget.FrameLayout import androidx.core.view.isVisible -import im.vector.riotx.R +import im.vector.app.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/riotx/core/platform/ToolbarConfigurable.kt b/vector/src/main/java/im/vector/app/core/platform/ToolbarConfigurable.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/core/platform/ToolbarConfigurable.kt rename to vector/src/main/java/im/vector/app/core/platform/ToolbarConfigurable.kt index e20ed0bfa3..c42a47c40c 100644 --- a/vector/src/main/java/im/vector/riotx/core/platform/ToolbarConfigurable.kt +++ b/vector/src/main/java/im/vector/app/core/platform/ToolbarConfigurable.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.platform +package im.vector.app.core.platform import androidx.appcompat.widget.Toolbar diff --git a/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/core/platform/VectorBaseActivity.kt rename to vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt index f142b46640..a98a4b977d 100644 --- a/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseActivity.kt +++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.platform +package im.vector.app.core.platform import android.app.Activity import android.content.Context @@ -47,39 +47,39 @@ import butterknife.Unbinder import com.airbnb.mvrx.MvRx import com.bumptech.glide.util.Util import com.google.android.material.snackbar.Snackbar +import im.vector.app.BuildConfig +import im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.di.DaggerScreenComponent +import im.vector.app.core.di.HasScreenInjector +import im.vector.app.core.di.HasVectorInjector +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.di.VectorComponent +import im.vector.app.core.dialogs.DialogLocker +import im.vector.app.core.dialogs.UnrecognizedCertificateDialog +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.extensions.observeEvent +import im.vector.app.core.extensions.observeNotNull +import im.vector.app.core.extensions.vectorComponent +import im.vector.app.core.utils.toast +import im.vector.app.features.MainActivity +import im.vector.app.features.MainActivityArgs +import im.vector.app.features.configuration.VectorConfiguration +import im.vector.app.features.consent.ConsentNotGivenHelper +import im.vector.app.features.navigation.Navigator +import im.vector.app.features.pin.PinActivity +import im.vector.app.features.pin.PinLocker +import im.vector.app.features.pin.PinMode +import im.vector.app.features.pin.UnlockedActivity +import im.vector.app.features.rageshake.BugReportActivity +import im.vector.app.features.rageshake.BugReporter +import im.vector.app.features.rageshake.RageShake +import im.vector.app.features.session.SessionListener +import im.vector.app.features.settings.VectorPreferences +import im.vector.app.features.themes.ActivityOtherThemes +import im.vector.app.features.themes.ThemeUtils +import im.vector.app.receivers.DebugReceiver import im.vector.matrix.android.api.failure.GlobalError -import im.vector.riotx.BuildConfig -import im.vector.riotx.R -import im.vector.riotx.core.di.ActiveSessionHolder -import im.vector.riotx.core.di.DaggerScreenComponent -import im.vector.riotx.core.di.HasScreenInjector -import im.vector.riotx.core.di.HasVectorInjector -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.di.VectorComponent -import im.vector.riotx.core.dialogs.DialogLocker -import im.vector.riotx.core.dialogs.UnrecognizedCertificateDialog -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.extensions.observeEvent -import im.vector.riotx.core.extensions.observeNotNull -import im.vector.riotx.core.extensions.vectorComponent -import im.vector.riotx.core.utils.toast -import im.vector.riotx.features.MainActivity -import im.vector.riotx.features.MainActivityArgs -import im.vector.riotx.features.configuration.VectorConfiguration -import im.vector.riotx.features.consent.ConsentNotGivenHelper -import im.vector.riotx.features.navigation.Navigator -import im.vector.riotx.features.pin.PinActivity -import im.vector.riotx.features.pin.PinLocker -import im.vector.riotx.features.pin.PinMode -import im.vector.riotx.features.pin.UnlockedActivity -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.session.SessionListener -import im.vector.riotx.features.settings.VectorPreferences -import im.vector.riotx.features.themes.ActivityOtherThemes -import im.vector.riotx.features.themes.ThemeUtils -import im.vector.riotx.receivers.DebugReceiver import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable import io.reactivex.disposables.Disposable diff --git a/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseBottomSheetDialogFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/platform/VectorBaseBottomSheetDialogFragment.kt rename to vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt index 393642139e..9ed5c5c455 100644 --- a/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseBottomSheetDialogFragment.kt +++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.core.platform +package im.vector.app.core.platform import android.app.Dialog import android.content.Context @@ -35,9 +35,9 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.jakewharton.rxbinding3.view.clicks -import im.vector.riotx.core.di.DaggerScreenComponent -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.utils.DimensionConverter +import im.vector.app.core.di.DaggerScreenComponent +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.utils.DimensionConverter import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable import io.reactivex.disposables.Disposable diff --git a/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/platform/VectorBaseFragment.kt rename to vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt index f4343a3e58..4ce4d210b0 100644 --- a/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseFragment.kt +++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt @@ -16,7 +16,7 @@ @file:Suppress("DEPRECATION") -package im.vector.riotx.core.platform +package im.vector.app.core.platform import android.app.ProgressDialog import android.content.Context @@ -40,13 +40,13 @@ import com.airbnb.mvrx.MvRx import com.bumptech.glide.util.Util.assertMainThread import com.google.android.material.snackbar.Snackbar import com.jakewharton.rxbinding3.view.clicks -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.dialogs.UnrecognizedCertificateDialog -import im.vector.riotx.core.error.ErrorFormatter -import im.vector.riotx.features.navigation.Navigator +import im.vector.app.R +import im.vector.app.core.di.DaggerScreenComponent +import im.vector.app.core.di.HasScreenInjector +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.dialogs.UnrecognizedCertificateDialog +import im.vector.app.core.error.ErrorFormatter +import im.vector.app.features.navigation.Navigator import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable import io.reactivex.disposables.Disposable diff --git a/vector/src/main/java/im/vector/riotx/core/platform/VectorEventViewModel.kt b/vector/src/main/java/im/vector/app/core/platform/VectorEventViewModel.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/core/platform/VectorEventViewModel.kt rename to vector/src/main/java/im/vector/app/core/platform/VectorEventViewModel.kt index e928be3343..2d499db531 100644 --- a/vector/src/main/java/im/vector/riotx/core/platform/VectorEventViewModel.kt +++ b/vector/src/main/java/im/vector/app/core/platform/VectorEventViewModel.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package im.vector.riotx.core.platform +package im.vector.app.core.platform import androidx.lifecycle.ViewModel -import im.vector.riotx.core.utils.MutableDataSource -import im.vector.riotx.core.utils.PublishDataSource +import im.vector.app.core.utils.MutableDataSource +import im.vector.app.core.utils.PublishDataSource interface VectorSharedAction diff --git a/vector/src/main/java/im/vector/riotx/core/platform/VectorViewEvents.kt b/vector/src/main/java/im/vector/app/core/platform/VectorViewEvents.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/core/platform/VectorViewEvents.kt rename to vector/src/main/java/im/vector/app/core/platform/VectorViewEvents.kt index b5c191f81a..979394a988 100644 --- a/vector/src/main/java/im/vector/riotx/core/platform/VectorViewEvents.kt +++ b/vector/src/main/java/im/vector/app/core/platform/VectorViewEvents.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.platform +package im.vector.app.core.platform /** * Interface for View Events diff --git a/vector/src/main/java/im/vector/riotx/core/platform/VectorViewModel.kt b/vector/src/main/java/im/vector/app/core/platform/VectorViewModel.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/core/platform/VectorViewModel.kt rename to vector/src/main/java/im/vector/app/core/platform/VectorViewModel.kt index 11cd9c485e..6429c9dfe5 100644 --- a/vector/src/main/java/im/vector/riotx/core/platform/VectorViewModel.kt +++ b/vector/src/main/java/im/vector/app/core/platform/VectorViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.platform +package im.vector.app.core.platform import com.airbnb.mvrx.Async import com.airbnb.mvrx.BaseMvRxViewModel @@ -22,8 +22,8 @@ import com.airbnb.mvrx.Fail import com.airbnb.mvrx.Loading import com.airbnb.mvrx.MvRxState import com.airbnb.mvrx.Success -import im.vector.riotx.core.utils.DataSource -import im.vector.riotx.core.utils.PublishDataSource +import im.vector.app.core.utils.DataSource +import im.vector.app.core.utils.PublishDataSource import io.reactivex.Observable import io.reactivex.Single diff --git a/vector/src/main/java/im/vector/riotx/core/platform/VectorViewModelAction.kt b/vector/src/main/java/im/vector/app/core/platform/VectorViewModelAction.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/core/platform/VectorViewModelAction.kt rename to vector/src/main/java/im/vector/app/core/platform/VectorViewModelAction.kt index 81c1996497..a6ce118eb7 100644 --- a/vector/src/main/java/im/vector/riotx/core/platform/VectorViewModelAction.kt +++ b/vector/src/main/java/im/vector/app/core/platform/VectorViewModelAction.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.platform +package im.vector.app.core.platform interface VectorViewModelAction diff --git a/vector/src/main/java/im/vector/riotx/core/platform/ViewModelTask.kt b/vector/src/main/java/im/vector/app/core/platform/ViewModelTask.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/platform/ViewModelTask.kt rename to vector/src/main/java/im/vector/app/core/platform/ViewModelTask.kt index abe5cc9095..a673fd4406 100644 --- a/vector/src/main/java/im/vector/riotx/core/platform/ViewModelTask.kt +++ b/vector/src/main/java/im/vector/app/core/platform/ViewModelTask.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.platform +package im.vector.app.core.platform import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.async diff --git a/vector/src/main/java/im/vector/riotx/core/platform/WaitingViewData.kt b/vector/src/main/java/im/vector/app/core/platform/WaitingViewData.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/core/platform/WaitingViewData.kt rename to vector/src/main/java/im/vector/app/core/platform/WaitingViewData.kt index 9a079a6c38..e1e9c7e39f 100644 --- a/vector/src/main/java/im/vector/riotx/core/platform/WaitingViewData.kt +++ b/vector/src/main/java/im/vector/app/core/platform/WaitingViewData.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.platform +package im.vector.app.core.platform /** * Model to display a Waiting View diff --git a/vector/src/main/java/im/vector/riotx/core/preference/AddressPreference.kt b/vector/src/main/java/im/vector/app/core/preference/AddressPreference.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/preference/AddressPreference.kt rename to vector/src/main/java/im/vector/app/core/preference/AddressPreference.kt index 3226327e51..44bd158935 100755 --- a/vector/src/main/java/im/vector/riotx/core/preference/AddressPreference.kt +++ b/vector/src/main/java/im/vector/app/core/preference/AddressPreference.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.core.preference +package im.vector.app.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.riotx.R +import im.vector.app.R /** * Preference used in Room setting for Room aliases diff --git a/vector/src/main/java/im/vector/riotx/core/preference/ProgressBarPreference.kt b/vector/src/main/java/im/vector/app/core/preference/ProgressBarPreference.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/core/preference/ProgressBarPreference.kt rename to vector/src/main/java/im/vector/app/core/preference/ProgressBarPreference.kt index 73a65d6fb0..2bf1b32d7d 100755 --- a/vector/src/main/java/im/vector/riotx/core/preference/ProgressBarPreference.kt +++ b/vector/src/main/java/im/vector/app/core/preference/ProgressBarPreference.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotx.core.preference +package im.vector.app.core.preference import android.content.Context import android.util.AttributeSet import androidx.preference.Preference -import im.vector.riotx.R +import im.vector.app.R class ProgressBarPreference : Preference { diff --git a/vector/src/main/java/im/vector/riotx/core/preference/PushRulePreference.kt b/vector/src/main/java/im/vector/app/core/preference/PushRulePreference.kt similarity index 99% rename from vector/src/main/java/im/vector/riotx/core/preference/PushRulePreference.kt rename to vector/src/main/java/im/vector/app/core/preference/PushRulePreference.kt index 16dd1bb486..7c6c76fbcf 100755 --- a/vector/src/main/java/im/vector/riotx/core/preference/PushRulePreference.kt +++ b/vector/src/main/java/im/vector/app/core/preference/PushRulePreference.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.preference +package im.vector.app.core.preference import android.content.Context import android.util.AttributeSet @@ -22,10 +22,10 @@ import android.view.View import android.widget.RadioGroup import android.widget.TextView import androidx.preference.PreferenceViewHolder +import im.vector.app.R import im.vector.matrix.android.api.pushrules.RuleSetKey import im.vector.matrix.android.api.pushrules.rest.PushRule import im.vector.matrix.android.api.pushrules.rest.PushRuleAndKind -import im.vector.riotx.R class PushRulePreference : VectorPreference { diff --git a/vector/src/main/java/im/vector/riotx/core/preference/RoomAvatarPreference.kt b/vector/src/main/java/im/vector/app/core/preference/RoomAvatarPreference.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/preference/RoomAvatarPreference.kt rename to vector/src/main/java/im/vector/app/core/preference/RoomAvatarPreference.kt index ca418737b9..e58bc807a0 100644 --- a/vector/src/main/java/im/vector/riotx/core/preference/RoomAvatarPreference.kt +++ b/vector/src/main/java/im/vector/app/core/preference/RoomAvatarPreference.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.preference +package im.vector.app.core.preference import android.content.Context import android.util.AttributeSet diff --git a/vector/src/main/java/im/vector/riotx/core/preference/UserAvatarPreference.kt b/vector/src/main/java/im/vector/app/core/preference/UserAvatarPreference.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/core/preference/UserAvatarPreference.kt rename to vector/src/main/java/im/vector/app/core/preference/UserAvatarPreference.kt index c7fcf85a16..b71d63f240 100755 --- a/vector/src/main/java/im/vector/riotx/core/preference/UserAvatarPreference.kt +++ b/vector/src/main/java/im/vector/app/core/preference/UserAvatarPreference.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.preference +package im.vector.app.core.preference import android.content.Context import android.util.AttributeSet @@ -22,12 +22,12 @@ import android.widget.ImageView import android.widget.ProgressBar import androidx.preference.Preference import androidx.preference.PreferenceViewHolder +import im.vector.app.R +import im.vector.app.core.extensions.vectorComponent +import im.vector.app.features.home.AvatarRenderer import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.util.MatrixItem import im.vector.matrix.android.api.util.toMatrixItem -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/riotx/core/preference/VectorEditTextPreference.kt b/vector/src/main/java/im/vector/app/core/preference/VectorEditTextPreference.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/preference/VectorEditTextPreference.kt rename to vector/src/main/java/im/vector/app/core/preference/VectorEditTextPreference.kt index e2c61118a7..840e5fa510 100644 --- a/vector/src/main/java/im/vector/riotx/core/preference/VectorEditTextPreference.kt +++ b/vector/src/main/java/im/vector/app/core/preference/VectorEditTextPreference.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.core.preference +package im.vector.app.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.riotx.R +import im.vector.app.R import timber.log.Timber /** diff --git a/vector/src/main/java/im/vector/riotx/core/preference/VectorGroupPreference.kt b/vector/src/main/java/im/vector/app/core/preference/VectorGroupPreference.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/core/preference/VectorGroupPreference.kt rename to vector/src/main/java/im/vector/app/core/preference/VectorGroupPreference.kt index 4415aa5a4a..f94177eed0 100644 --- a/vector/src/main/java/im/vector/riotx/core/preference/VectorGroupPreference.kt +++ b/vector/src/main/java/im/vector/app/core/preference/VectorGroupPreference.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.preference +package im.vector.app.core.preference import android.content.Context import android.util.AttributeSet @@ -26,9 +26,9 @@ import android.widget.ImageView import android.widget.LinearLayout import androidx.preference.PreferenceViewHolder import androidx.preference.SwitchPreference +import im.vector.app.R import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.group.Group -import im.vector.riotx.R class VectorGroupPreference : SwitchPreference { diff --git a/vector/src/main/java/im/vector/riotx/core/preference/VectorListPreference.kt b/vector/src/main/java/im/vector/app/core/preference/VectorListPreference.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/core/preference/VectorListPreference.kt rename to vector/src/main/java/im/vector/app/core/preference/VectorListPreference.kt index 174c52d831..e7e8ab8d24 100644 --- a/vector/src/main/java/im/vector/riotx/core/preference/VectorListPreference.kt +++ b/vector/src/main/java/im/vector/app/core/preference/VectorListPreference.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.preference +package im.vector.app.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.riotx.R +import im.vector.app.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/riotx/core/preference/VectorPreference.kt b/vector/src/main/java/im/vector/app/core/preference/VectorPreference.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/preference/VectorPreference.kt rename to vector/src/main/java/im/vector/app/core/preference/VectorPreference.kt index 048625ded6..4a9bb6a6f5 100755 --- a/vector/src/main/java/im/vector/riotx/core/preference/VectorPreference.kt +++ b/vector/src/main/java/im/vector/app/core/preference/VectorPreference.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.preference +package im.vector.app.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.riotx.R -import im.vector.riotx.features.themes.ThemeUtils +import im.vector.app.R +import im.vector.app.features.themes.ThemeUtils import timber.log.Timber /** diff --git a/vector/src/main/java/im/vector/riotx/core/preference/VectorPreferenceCategory.kt b/vector/src/main/java/im/vector/app/core/preference/VectorPreferenceCategory.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/core/preference/VectorPreferenceCategory.kt rename to vector/src/main/java/im/vector/app/core/preference/VectorPreferenceCategory.kt index d71bcccd5b..e61cde8ebd 100644 --- a/vector/src/main/java/im/vector/riotx/core/preference/VectorPreferenceCategory.kt +++ b/vector/src/main/java/im/vector/app/core/preference/VectorPreferenceCategory.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.preference +package im.vector.app.core.preference import android.content.Context import android.graphics.Typeface @@ -23,8 +23,8 @@ import android.view.ViewGroup import android.widget.TextView import androidx.preference.PreferenceCategory import androidx.preference.PreferenceViewHolder -import im.vector.riotx.R -import im.vector.riotx.features.themes.ThemeUtils +import im.vector.app.R +import im.vector.app.features.themes.ThemeUtils /** * Customize PreferenceCategory class to redefine some attributes. diff --git a/vector/src/main/java/im/vector/riotx/core/preference/VectorSwitchPreference.kt b/vector/src/main/java/im/vector/app/core/preference/VectorSwitchPreference.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/preference/VectorSwitchPreference.kt rename to vector/src/main/java/im/vector/app/core/preference/VectorSwitchPreference.kt index 4728856e32..c97991bfcb 100644 --- a/vector/src/main/java/im/vector/riotx/core/preference/VectorSwitchPreference.kt +++ b/vector/src/main/java/im/vector/app/core/preference/VectorSwitchPreference.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.preference +package im.vector.app.core.preference import android.animation.Animator import android.animation.ArgbEvaluator @@ -26,8 +26,8 @@ import android.widget.TextView import androidx.core.animation.doOnEnd import androidx.preference.PreferenceViewHolder import androidx.preference.SwitchPreference -import im.vector.riotx.R -import im.vector.riotx.features.themes.ThemeUtils +import im.vector.app.R +import im.vector.app.features.themes.ThemeUtils /** * Switch preference with title on multiline (only used in XML) diff --git a/vector/src/main/java/im/vector/riotx/core/pushers/PushersManager.kt b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/core/pushers/PushersManager.kt rename to vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt index 69367e529c..cc40cf95b7 100644 --- a/vector/src/main/java/im/vector/riotx/core/pushers/PushersManager.kt +++ b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.core.pushers +package im.vector.app.core.pushers +import im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.resources.AppNameProvider +import im.vector.app.core.resources.LocaleProvider +import im.vector.app.core.resources.StringProvider import im.vector.matrix.android.api.MatrixCallback -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.UUID import javax.inject.Inject import kotlin.math.abs diff --git a/vector/src/main/java/im/vector/riotx/core/qrcode/QrCode.kt b/vector/src/main/java/im/vector/app/core/qrcode/QrCode.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/qrcode/QrCode.kt rename to vector/src/main/java/im/vector/app/core/qrcode/QrCode.kt index 110427a3ec..f79ae7afd9 100644 --- a/vector/src/main/java/im/vector/riotx/core/qrcode/QrCode.kt +++ b/vector/src/main/java/im/vector/app/core/qrcode/QrCode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.qrcode +package im.vector.app.core.qrcode import android.graphics.Bitmap import android.graphics.Color diff --git a/vector/src/main/java/im/vector/riotx/core/resources/AppNameProvider.kt b/vector/src/main/java/im/vector/app/core/resources/AppNameProvider.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/resources/AppNameProvider.kt rename to vector/src/main/java/im/vector/app/core/resources/AppNameProvider.kt index d77a55a914..9874c1744f 100644 --- a/vector/src/main/java/im/vector/riotx/core/resources/AppNameProvider.kt +++ b/vector/src/main/java/im/vector/app/core/resources/AppNameProvider.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.resources +package im.vector.app.core.resources import android.content.Context import timber.log.Timber diff --git a/vector/src/main/java/im/vector/riotx/core/resources/ColorProvider.kt b/vector/src/main/java/im/vector/app/core/resources/ColorProvider.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/core/resources/ColorProvider.kt rename to vector/src/main/java/im/vector/app/core/resources/ColorProvider.kt index 76c7088174..395b75d336 100644 --- a/vector/src/main/java/im/vector/riotx/core/resources/ColorProvider.kt +++ b/vector/src/main/java/im/vector/app/core/resources/ColorProvider.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.core.resources +package im.vector.app.core.resources import android.content.Context import androidx.annotation.AttrRes import androidx.annotation.ColorInt import androidx.annotation.ColorRes import androidx.core.content.ContextCompat -import im.vector.riotx.features.themes.ThemeUtils +import im.vector.app.features.themes.ThemeUtils import javax.inject.Inject class ColorProvider @Inject constructor(private val context: Context) { diff --git a/vector/src/main/java/im/vector/riotx/core/resources/DateProvider.kt b/vector/src/main/java/im/vector/app/core/resources/DateProvider.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/resources/DateProvider.kt rename to vector/src/main/java/im/vector/app/core/resources/DateProvider.kt index 7a13a9f099..5769b04d29 100644 --- a/vector/src/main/java/im/vector/riotx/core/resources/DateProvider.kt +++ b/vector/src/main/java/im/vector/app/core/resources/DateProvider.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.resources +package im.vector.app.core.resources import org.threeten.bp.Instant import org.threeten.bp.LocalDateTime diff --git a/vector/src/main/java/im/vector/riotx/core/resources/DrawableProvider.kt b/vector/src/main/java/im/vector/app/core/resources/DrawableProvider.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/core/resources/DrawableProvider.kt rename to vector/src/main/java/im/vector/app/core/resources/DrawableProvider.kt index c71def27f2..2f6b9aa6d2 100644 --- a/vector/src/main/java/im/vector/riotx/core/resources/DrawableProvider.kt +++ b/vector/src/main/java/im/vector/app/core/resources/DrawableProvider.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.core.resources +package im.vector.app.core.resources import android.content.Context import android.graphics.drawable.Drawable import androidx.annotation.ColorInt import androidx.annotation.DrawableRes import androidx.core.content.ContextCompat -import im.vector.riotx.features.themes.ThemeUtils +import im.vector.app.features.themes.ThemeUtils import javax.inject.Inject class DrawableProvider @Inject constructor(private val context: Context) { diff --git a/vector/src/main/java/im/vector/riotx/core/resources/LocaleProvider.kt b/vector/src/main/java/im/vector/app/core/resources/LocaleProvider.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/core/resources/LocaleProvider.kt rename to vector/src/main/java/im/vector/app/core/resources/LocaleProvider.kt index c78a5a99b8..4ddf24414f 100644 --- a/vector/src/main/java/im/vector/riotx/core/resources/LocaleProvider.kt +++ b/vector/src/main/java/im/vector/app/core/resources/LocaleProvider.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.resources +package im.vector.app.core.resources import android.content.res.Resources import androidx.core.os.ConfigurationCompat diff --git a/vector/src/main/java/im/vector/riotx/core/resources/ResourceUtils.kt b/vector/src/main/java/im/vector/app/core/resources/ResourceUtils.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/resources/ResourceUtils.kt rename to vector/src/main/java/im/vector/app/core/resources/ResourceUtils.kt index 236caec081..7ab2271c57 100644 --- a/vector/src/main/java/im/vector/riotx/core/resources/ResourceUtils.kt +++ b/vector/src/main/java/im/vector/app/core/resources/ResourceUtils.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotx.core.resources +package im.vector.app.core.resources import android.content.Context import android.net.Uri import android.webkit.MimeTypeMap -import im.vector.riotx.core.utils.getFileExtension +import im.vector.app.core.utils.getFileExtension import timber.log.Timber import java.io.InputStream diff --git a/vector/src/main/java/im/vector/riotx/core/resources/StringArrayProvider.kt b/vector/src/main/java/im/vector/app/core/resources/StringArrayProvider.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/resources/StringArrayProvider.kt rename to vector/src/main/java/im/vector/app/core/resources/StringArrayProvider.kt index 16742f5eea..9ed3c02ba4 100644 --- a/vector/src/main/java/im/vector/riotx/core/resources/StringArrayProvider.kt +++ b/vector/src/main/java/im/vector/app/core/resources/StringArrayProvider.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.resources +package im.vector.app.core.resources import android.content.res.Resources import androidx.annotation.ArrayRes diff --git a/vector/src/main/java/im/vector/riotx/core/resources/StringProvider.kt b/vector/src/main/java/im/vector/app/core/resources/StringProvider.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/core/resources/StringProvider.kt rename to vector/src/main/java/im/vector/app/core/resources/StringProvider.kt index cd1c2a7518..7e322daaae 100644 --- a/vector/src/main/java/im/vector/riotx/core/resources/StringProvider.kt +++ b/vector/src/main/java/im/vector/app/core/resources/StringProvider.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.resources +package im.vector.app.core.resources import android.content.res.Resources import androidx.annotation.NonNull diff --git a/vector/src/main/java/im/vector/riotx/core/resources/UserPreferencesProvider.kt b/vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/core/resources/UserPreferencesProvider.kt rename to vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt index fa4b09ed4c..302e55d1e7 100644 --- a/vector/src/main/java/im/vector/riotx/core/resources/UserPreferencesProvider.kt +++ b/vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.core.resources +package im.vector.app.core.resources -import im.vector.riotx.features.settings.VectorPreferences +import im.vector.app.features.settings.VectorPreferences import javax.inject.Inject class UserPreferencesProvider @Inject constructor(private val vectorPreferences: VectorPreferences) { diff --git a/vector/src/main/java/im/vector/riotx/core/resources/VersionCodeProvider.kt b/vector/src/main/java/im/vector/app/core/resources/VersionCodeProvider.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/resources/VersionCodeProvider.kt rename to vector/src/main/java/im/vector/app/core/resources/VersionCodeProvider.kt index 342fc4e48b..1e136bbcc2 100644 --- a/vector/src/main/java/im/vector/riotx/core/resources/VersionCodeProvider.kt +++ b/vector/src/main/java/im/vector/app/core/resources/VersionCodeProvider.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.resources +package im.vector.app.core.resources import android.content.Context import android.os.Build diff --git a/vector/src/main/java/im/vector/riotx/core/rx/RxConfig.kt b/vector/src/main/java/im/vector/app/core/rx/RxConfig.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/core/rx/RxConfig.kt rename to vector/src/main/java/im/vector/app/core/rx/RxConfig.kt index 73e68a6bf0..ab0ffb7802 100644 --- a/vector/src/main/java/im/vector/riotx/core/rx/RxConfig.kt +++ b/vector/src/main/java/im/vector/app/core/rx/RxConfig.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.core.rx +package im.vector.app.core.rx -import im.vector.riotx.features.settings.VectorPreferences +import im.vector.app.features.settings.VectorPreferences import io.reactivex.plugins.RxJavaPlugins import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/core/services/BluetoothHeadsetReceiver.kt b/vector/src/main/java/im/vector/app/core/services/BluetoothHeadsetReceiver.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/core/services/BluetoothHeadsetReceiver.kt rename to vector/src/main/java/im/vector/app/core/services/BluetoothHeadsetReceiver.kt index a56c4c73c6..3f2cd2566e 100644 --- a/vector/src/main/java/im/vector/riotx/core/services/BluetoothHeadsetReceiver.kt +++ b/vector/src/main/java/im/vector/app/core/services/BluetoothHeadsetReceiver.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.services +package im.vector.app.core.services import android.bluetooth.BluetoothAdapter import android.bluetooth.BluetoothClass diff --git a/vector/src/main/java/im/vector/riotx/core/services/CallRingPlayer.kt b/vector/src/main/java/im/vector/app/core/services/CallRingPlayer.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/services/CallRingPlayer.kt rename to vector/src/main/java/im/vector/app/core/services/CallRingPlayer.kt index f7f64d65f5..68d5a9a260 100644 --- a/vector/src/main/java/im/vector/riotx/core/services/CallRingPlayer.kt +++ b/vector/src/main/java/im/vector/app/core/services/CallRingPlayer.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.core.services +package im.vector.app.core.services import android.content.Context import android.media.AudioAttributes import android.media.AudioManager import android.media.MediaPlayer import android.os.Build -import im.vector.riotx.R +import im.vector.app.R import timber.log.Timber class CallRingPlayer( diff --git a/vector/src/main/java/im/vector/riotx/core/services/CallService.kt b/vector/src/main/java/im/vector/app/core/services/CallService.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/core/services/CallService.kt rename to vector/src/main/java/im/vector/app/core/services/CallService.kt index 723cfe3add..41e35e66df 100644 --- a/vector/src/main/java/im/vector/riotx/core/services/CallService.kt +++ b/vector/src/main/java/im/vector/app/core/services/CallService.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package im.vector.riotx.core.services +package im.vector.app.core.services import android.content.Context import android.content.Intent @@ -24,10 +24,10 @@ import android.support.v4.media.session.MediaSessionCompat import android.view.KeyEvent import androidx.core.content.ContextCompat import androidx.media.session.MediaButtonReceiver -import im.vector.riotx.core.extensions.vectorComponent -import im.vector.riotx.features.call.WebRtcPeerConnectionManager -import im.vector.riotx.features.call.telecom.CallConnection -import im.vector.riotx.features.notifications.NotificationUtils +import im.vector.app.core.extensions.vectorComponent +import im.vector.app.features.call.WebRtcPeerConnectionManager +import im.vector.app.features.call.telecom.CallConnection +import im.vector.app.features.notifications.NotificationUtils import timber.log.Timber /** diff --git a/vector/src/main/java/im/vector/riotx/core/services/VectorService.kt b/vector/src/main/java/im/vector/app/core/services/VectorService.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/services/VectorService.kt rename to vector/src/main/java/im/vector/app/core/services/VectorService.kt index 53777837af..888f7a8cac 100644 --- a/vector/src/main/java/im/vector/riotx/core/services/VectorService.kt +++ b/vector/src/main/java/im/vector/app/core/services/VectorService.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.services +package im.vector.app.core.services import android.app.Service import android.content.Intent diff --git a/vector/src/main/java/im/vector/riotx/core/services/VectorSyncService.kt b/vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/core/services/VectorSyncService.kt rename to vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt index 314e12db05..425ec9a23a 100644 --- a/vector/src/main/java/im/vector/riotx/core/services/VectorSyncService.kt +++ b/vector/src/main/java/im/vector/app/core/services/VectorSyncService.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.core.services +package im.vector.app.core.services import android.app.AlarmManager import android.app.NotificationManager @@ -21,10 +21,10 @@ import android.app.PendingIntent import android.content.Context import android.content.Intent import android.os.Build +import im.vector.app.R +import im.vector.app.core.extensions.vectorComponent +import im.vector.app.features.notifications.NotificationUtils import im.vector.matrix.android.internal.session.sync.job.SyncService -import im.vector.riotx.R -import im.vector.riotx.core.extensions.vectorComponent -import im.vector.riotx.features.notifications.NotificationUtils class VectorSyncService : SyncService() { diff --git a/vector/src/main/java/im/vector/riotx/core/services/WiredHeadsetStateReceiver.kt b/vector/src/main/java/im/vector/app/core/services/WiredHeadsetStateReceiver.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/core/services/WiredHeadsetStateReceiver.kt rename to vector/src/main/java/im/vector/app/core/services/WiredHeadsetStateReceiver.kt index e63c7f5049..e276e24851 100644 --- a/vector/src/main/java/im/vector/riotx/core/services/WiredHeadsetStateReceiver.kt +++ b/vector/src/main/java/im/vector/app/core/services/WiredHeadsetStateReceiver.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.services +package im.vector.app.core.services import android.content.BroadcastReceiver import android.content.Context diff --git a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericButtonItem.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/core/ui/list/GenericButtonItem.kt rename to vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt index 731de9a705..69f0a693cb 100644 --- a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericButtonItem.kt +++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.core.ui.list +package im.vector.app.core.ui.list import android.view.View import androidx.annotation.ColorInt @@ -21,10 +21,10 @@ import androidx.annotation.DrawableRes import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import com.google.android.material.button.MaterialButton -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 +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.features.themes.ThemeUtils /** * A generic button list item. diff --git a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericFooterItem.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericFooterItem.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/core/ui/list/GenericFooterItem.kt rename to vector/src/main/java/im/vector/app/core/ui/list/GenericFooterItem.kt index 7d73a1949f..2539e59ae4 100644 --- a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericFooterItem.kt +++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericFooterItem.kt @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.core.ui.list +package im.vector.app.core.ui.list import android.view.Gravity import android.widget.TextView import androidx.annotation.ColorInt import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -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.features.themes.ThemeUtils +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.extensions.setTextOrHide +import im.vector.app.features.themes.ThemeUtils /** * A generic list item. diff --git a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericItem.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/core/ui/list/GenericItem.kt rename to vector/src/main/java/im/vector/app/core/ui/list/GenericItem.kt index c4704d85c7..832250fab4 100644 --- a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericItem.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.core.ui.list +package im.vector.app.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.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.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.extensions.setTextOrHide /** * A generic list item. diff --git a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericItemHeader.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericItemHeader.kt similarity index 84% rename from vector/src/main/java/im/vector/riotx/core/ui/list/GenericItemHeader.kt rename to vector/src/main/java/im/vector/app/core/ui/list/GenericItemHeader.kt index 6ab5b59fa1..d0c65aff95 100644 --- a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericItemHeader.kt +++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericItemHeader.kt @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.core.ui.list +package im.vector.app.core.ui.list import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -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.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.extensions.setTextOrHide /** * A generic list item header left aligned with notice color. diff --git a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericItemWithValue.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericItemWithValue.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/core/ui/list/GenericItemWithValue.kt rename to vector/src/main/java/im/vector/app/core/ui/list/GenericItemWithValue.kt index 354ca8eb3f..f9d32a9f1e 100644 --- a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericItemWithValue.kt +++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericItemWithValue.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.core.ui.list +package im.vector.app.core.ui.list import android.view.View import android.widget.ImageView @@ -23,12 +23,12 @@ import androidx.annotation.DrawableRes import androidx.core.view.isVisible import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -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.utils.DebouncedClickListener -import im.vector.riotx.features.themes.ThemeUtils +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.extensions.setTextOrHide +import im.vector.app.core.utils.DebouncedClickListener +import im.vector.app.features.themes.ThemeUtils /** * A generic list item. diff --git a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericLoaderItem.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericLoaderItem.kt similarity index 68% rename from vector/src/main/java/im/vector/riotx/core/ui/list/GenericLoaderItem.kt rename to vector/src/main/java/im/vector/app/core/ui/list/GenericLoaderItem.kt index bba51d6a42..634e58e943 100644 --- a/vector/src/main/java/im/vector/riotx/core/ui/list/GenericLoaderItem.kt +++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericLoaderItem.kt @@ -1,9 +1,9 @@ -package im.vector.riotx.core.ui.list +package im.vector.app.core.ui.list import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel /** * A generic list item header left aligned with notice color. diff --git a/vector/src/main/java/im/vector/riotx/core/ui/model/Size.kt b/vector/src/main/java/im/vector/app/core/ui/model/Size.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/core/ui/model/Size.kt rename to vector/src/main/java/im/vector/app/core/ui/model/Size.kt index 4a07bb2cea..bdfb835b86 100644 --- a/vector/src/main/java/im/vector/riotx/core/ui/model/Size.kt +++ b/vector/src/main/java/im/vector/app/core/ui/model/Size.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.ui.model +package im.vector.app.core.ui.model import androidx.annotation.Px diff --git a/vector/src/main/java/im/vector/riotx/core/ui/views/ActiveCallView.kt b/vector/src/main/java/im/vector/app/core/ui/views/ActiveCallView.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/core/ui/views/ActiveCallView.kt rename to vector/src/main/java/im/vector/app/core/ui/views/ActiveCallView.kt index 9507a4daf8..19d1fbb6f6 100644 --- a/vector/src/main/java/im/vector/riotx/core/ui/views/ActiveCallView.kt +++ b/vector/src/main/java/im/vector/app/core/ui/views/ActiveCallView.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package im.vector.riotx.core.ui.views +package im.vector.app.core.ui.views import android.content.Context import android.util.AttributeSet import android.widget.RelativeLayout -import im.vector.riotx.R -import im.vector.riotx.features.themes.ThemeUtils +import im.vector.app.R +import im.vector.app.features.themes.ThemeUtils class ActiveCallView @JvmOverloads constructor( context: Context, diff --git a/vector/src/main/java/im/vector/riotx/core/ui/views/ActiveCallViewHolder.kt b/vector/src/main/java/im/vector/app/core/ui/views/ActiveCallViewHolder.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/core/ui/views/ActiveCallViewHolder.kt rename to vector/src/main/java/im/vector/app/core/ui/views/ActiveCallViewHolder.kt index 6a5519adbc..a0246ffad4 100644 --- a/vector/src/main/java/im/vector/riotx/core/ui/views/ActiveCallViewHolder.kt +++ b/vector/src/main/java/im/vector/app/core/ui/views/ActiveCallViewHolder.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package im.vector.riotx.core.ui.views +package im.vector.app.core.ui.views import android.view.View import androidx.cardview.widget.CardView import androidx.core.view.isVisible +import im.vector.app.core.utils.DebouncedClickListener +import im.vector.app.features.call.WebRtcPeerConnectionManager import im.vector.matrix.android.api.session.call.CallState import im.vector.matrix.android.api.session.call.EglUtils import im.vector.matrix.android.api.session.call.MxCall -import im.vector.riotx.core.utils.DebouncedClickListener -import im.vector.riotx.features.call.WebRtcPeerConnectionManager import org.webrtc.RendererCommon import org.webrtc.SurfaceViewRenderer diff --git a/vector/src/main/java/im/vector/riotx/core/ui/views/BottomSheetActionButton.kt b/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/ui/views/BottomSheetActionButton.kt rename to vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt index 455e856833..193f57f96b 100644 --- a/vector/src/main/java/im/vector/riotx/core/ui/views/BottomSheetActionButton.kt +++ b/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.ui.views +package im.vector.app.core.ui.views import android.content.Context import android.content.res.ColorStateList @@ -31,9 +31,9 @@ import androidx.core.view.isInvisible import androidx.core.view.isVisible import butterknife.BindView import butterknife.ButterKnife -import im.vector.riotx.R -import im.vector.riotx.core.extensions.setTextOrHide -import im.vector.riotx.features.themes.ThemeUtils +import im.vector.app.R +import im.vector.app.core.extensions.setTextOrHide +import im.vector.app.features.themes.ThemeUtils class BottomSheetActionButton @JvmOverloads constructor( context: Context, diff --git a/vector/src/main/java/im/vector/riotx/core/ui/views/JumpToReadMarkerView.kt b/vector/src/main/java/im/vector/app/core/ui/views/JumpToReadMarkerView.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/ui/views/JumpToReadMarkerView.kt rename to vector/src/main/java/im/vector/app/core/ui/views/JumpToReadMarkerView.kt index b2adde449a..169f24520b 100644 --- a/vector/src/main/java/im/vector/riotx/core/ui/views/JumpToReadMarkerView.kt +++ b/vector/src/main/java/im/vector/app/core/ui/views/JumpToReadMarkerView.kt @@ -16,14 +16,14 @@ */ -package im.vector.riotx.core.ui.views +package im.vector.app.core.ui.views import android.content.Context import android.util.AttributeSet import android.view.View import android.widget.RelativeLayout import androidx.core.content.ContextCompat -import im.vector.riotx.R +import im.vector.app.R import kotlinx.android.synthetic.main.view_jump_to_read_marker.view.* class JumpToReadMarkerView @JvmOverloads constructor( diff --git a/vector/src/main/java/im/vector/riotx/core/ui/views/KeysBackupBanner.kt b/vector/src/main/java/im/vector/app/core/ui/views/KeysBackupBanner.kt similarity index 99% rename from vector/src/main/java/im/vector/riotx/core/ui/views/KeysBackupBanner.kt rename to vector/src/main/java/im/vector/app/core/ui/views/KeysBackupBanner.kt index 0152f7c2a8..14d9261204 100755 --- a/vector/src/main/java/im/vector/riotx/core/ui/views/KeysBackupBanner.kt +++ b/vector/src/main/java/im/vector/app/core/ui/views/KeysBackupBanner.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.ui.views +package im.vector.app.core.ui.views import android.content.Context import android.util.AttributeSet @@ -27,7 +27,7 @@ import androidx.preference.PreferenceManager import butterknife.BindView import butterknife.ButterKnife import butterknife.OnClick -import im.vector.riotx.R +import im.vector.app.R import timber.log.Timber /** diff --git a/vector/src/main/java/im/vector/riotx/core/ui/views/NotificationAreaView.kt b/vector/src/main/java/im/vector/app/core/ui/views/NotificationAreaView.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/ui/views/NotificationAreaView.kt rename to vector/src/main/java/im/vector/app/core/ui/views/NotificationAreaView.kt index 653975aea3..26d6fb1d60 100644 --- a/vector/src/main/java/im/vector/riotx/core/ui/views/NotificationAreaView.kt +++ b/vector/src/main/java/im/vector/app/core/ui/views/NotificationAreaView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.ui.views +package im.vector.app.core.ui.views import android.content.Context import android.graphics.Color @@ -24,12 +24,12 @@ import android.view.View import android.widget.RelativeLayout import androidx.core.content.ContextCompat import androidx.core.text.italic +import im.vector.app.R +import im.vector.app.core.error.ResourceLimitErrorFormatter +import im.vector.app.core.utils.DimensionConverter +import im.vector.app.features.themes.ThemeUtils import im.vector.matrix.android.api.failure.MatrixError import im.vector.matrix.android.api.session.events.model.Event -import im.vector.riotx.R -import im.vector.riotx.core.error.ResourceLimitErrorFormatter -import im.vector.riotx.core.utils.DimensionConverter -import im.vector.riotx.features.themes.ThemeUtils import kotlinx.android.synthetic.main.view_notification_area.view.* import me.gujun.android.span.span import me.saket.bettermovementmethod.BetterLinkMovementMethod diff --git a/vector/src/main/java/im/vector/riotx/core/ui/views/PasswordStrengthBar.kt b/vector/src/main/java/im/vector/app/core/ui/views/PasswordStrengthBar.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/core/ui/views/PasswordStrengthBar.kt rename to vector/src/main/java/im/vector/app/core/ui/views/PasswordStrengthBar.kt index c0d8d6ad50..65577d18f3 100644 --- a/vector/src/main/java/im/vector/riotx/core/ui/views/PasswordStrengthBar.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.core.ui.views +package im.vector.app.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.riotx.R +import im.vector.app.R /** * A password strength bar custom widget diff --git a/vector/src/main/java/im/vector/riotx/core/ui/views/QrCodeImageView.kt b/vector/src/main/java/im/vector/app/core/ui/views/QrCodeImageView.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/ui/views/QrCodeImageView.kt rename to vector/src/main/java/im/vector/app/core/ui/views/QrCodeImageView.kt index 7cf54ae588..11e319ab78 100644 --- a/vector/src/main/java/im/vector/riotx/core/ui/views/QrCodeImageView.kt +++ b/vector/src/main/java/im/vector/app/core/ui/views/QrCodeImageView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.ui.views +package im.vector.app.core.ui.views import android.content.Context import android.graphics.Color @@ -22,8 +22,8 @@ import android.graphics.drawable.AnimationDrawable import android.graphics.drawable.BitmapDrawable import android.util.AttributeSet import androidx.appcompat.widget.AppCompatImageView -import im.vector.riotx.core.qrcode.toBitMatrix -import im.vector.riotx.core.qrcode.toBitmap +import im.vector.app.core.qrcode.toBitMatrix +import im.vector.app.core.qrcode.toBitmap import kotlin.random.Random class QrCodeImageView @JvmOverloads constructor( diff --git a/vector/src/main/java/im/vector/riotx/core/ui/views/ReadReceiptsView.kt b/vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/core/ui/views/ReadReceiptsView.kt rename to vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt index c5e2fdf375..2286662288 100644 --- a/vector/src/main/java/im/vector/riotx/core/ui/views/ReadReceiptsView.kt +++ b/vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.ui.views +package im.vector.app.core.ui.views import android.content.Context import android.util.AttributeSet @@ -22,11 +22,11 @@ import android.view.View import android.widget.ImageView import android.widget.LinearLayout import androidx.core.view.isVisible -import im.vector.riotx.R -import im.vector.riotx.core.glide.GlideApp -import im.vector.riotx.features.home.AvatarRenderer -import im.vector.riotx.features.home.room.detail.timeline.item.ReadReceiptData -import im.vector.riotx.features.home.room.detail.timeline.item.toMatrixItem +import im.vector.app.R +import im.vector.app.core.glide.GlideApp +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptData +import im.vector.app.features.home.room.detail.timeline.item.toMatrixItem import kotlinx.android.synthetic.main.view_read_receipts.view.* private const val MAX_RECEIPT_DISPLAYED = 5 diff --git a/vector/src/main/java/im/vector/riotx/core/utils/AssetReader.kt b/vector/src/main/java/im/vector/app/core/utils/AssetReader.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/core/utils/AssetReader.kt rename to vector/src/main/java/im/vector/app/core/utils/AssetReader.kt index 908f0e68b6..41fca42cb3 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/AssetReader.kt +++ b/vector/src/main/java/im/vector/app/core/utils/AssetReader.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.utils +package im.vector.app.core.utils import android.content.Context import timber.log.Timber diff --git a/vector/src/main/java/im/vector/riotx/core/utils/DataSource.kt b/vector/src/main/java/im/vector/app/core/utils/DataSource.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/core/utils/DataSource.kt rename to vector/src/main/java/im/vector/app/core/utils/DataSource.kt index 6f6057cb43..8a908ad1d4 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/DataSource.kt +++ b/vector/src/main/java/im/vector/app/core/utils/DataSource.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.utils +package im.vector.app.core.utils import com.jakewharton.rxrelay2.BehaviorRelay import com.jakewharton.rxrelay2.PublishRelay diff --git a/vector/src/main/java/im/vector/riotx/core/utils/DebouncedClickListener.kt b/vector/src/main/java/im/vector/app/core/utils/DebouncedClickListener.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/utils/DebouncedClickListener.kt rename to vector/src/main/java/im/vector/app/core/utils/DebouncedClickListener.kt index 230b11f14d..8f96a286d9 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/DebouncedClickListener.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.core.utils +package im.vector.app.core.utils import android.view.View import java.util.WeakHashMap diff --git a/vector/src/main/java/im/vector/riotx/core/utils/Debouncer.kt b/vector/src/main/java/im/vector/app/core/utils/Debouncer.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/utils/Debouncer.kt rename to vector/src/main/java/im/vector/app/core/utils/Debouncer.kt index 95035f6c96..a5e0005c2a 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/Debouncer.kt +++ b/vector/src/main/java/im/vector/app/core/utils/Debouncer.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package im.vector.riotx.core.utils +package im.vector.app.core.utils import android.os.Handler diff --git a/vector/src/main/java/im/vector/riotx/core/utils/DefaultSubscriber.kt b/vector/src/main/java/im/vector/app/core/utils/DefaultSubscriber.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/utils/DefaultSubscriber.kt rename to vector/src/main/java/im/vector/app/core/utils/DefaultSubscriber.kt index 42e04b70f5..99c28becbc 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/DefaultSubscriber.kt +++ b/vector/src/main/java/im/vector/app/core/utils/DefaultSubscriber.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.utils +package im.vector.app.core.utils import io.reactivex.Completable import io.reactivex.Single diff --git a/vector/src/main/java/im/vector/riotx/core/utils/Dialogs.kt b/vector/src/main/java/im/vector/app/core/utils/Dialogs.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/utils/Dialogs.kt rename to vector/src/main/java/im/vector/app/core/utils/Dialogs.kt index 9d73493e74..7b5417c18a 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/Dialogs.kt +++ b/vector/src/main/java/im/vector/app/core/utils/Dialogs.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.utils +package im.vector.app.core.utils import android.content.Context import android.webkit.WebView diff --git a/vector/src/main/java/im/vector/riotx/core/utils/DimensionConverter.kt b/vector/src/main/java/im/vector/app/core/utils/DimensionConverter.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/utils/DimensionConverter.kt rename to vector/src/main/java/im/vector/app/core/utils/DimensionConverter.kt index 01cd6a4f8f..d0ed9e5d48 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/DimensionConverter.kt +++ b/vector/src/main/java/im/vector/app/core/utils/DimensionConverter.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.core.utils +package im.vector.app.core.utils import android.content.res.Resources import android.util.TypedValue diff --git a/vector/src/main/java/im/vector/riotx/core/utils/Emoji.kt b/vector/src/main/java/im/vector/app/core/utils/Emoji.kt similarity index 99% rename from vector/src/main/java/im/vector/riotx/core/utils/Emoji.kt rename to vector/src/main/java/im/vector/app/core/utils/Emoji.kt index e91a2896bc..b3b9a39f30 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/Emoji.kt +++ b/vector/src/main/java/im/vector/app/core/utils/Emoji.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.utils +package im.vector.app.core.utils import java.util.regex.Pattern diff --git a/vector/src/main/java/im/vector/riotx/core/utils/EvenBetterLinkMovementMethod.kt b/vector/src/main/java/im/vector/app/core/utils/EvenBetterLinkMovementMethod.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/core/utils/EvenBetterLinkMovementMethod.kt rename to vector/src/main/java/im/vector/app/core/utils/EvenBetterLinkMovementMethod.kt index 1e565c0f4b..b9c1386933 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/EvenBetterLinkMovementMethod.kt +++ b/vector/src/main/java/im/vector/app/core/utils/EvenBetterLinkMovementMethod.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.utils +package im.vector.app.core.utils import android.text.Spanned import android.text.style.ClickableSpan diff --git a/vector/src/main/java/im/vector/riotx/core/utils/ExternalApplicationsUtil.kt b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt similarity index 99% rename from vector/src/main/java/im/vector/riotx/core/utils/ExternalApplicationsUtil.kt rename to vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt index 9c2d12514a..22bae5e296 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/ExternalApplicationsUtil.kt +++ b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.utils +package im.vector.app.core.utils import android.app.Activity import android.app.DownloadManager @@ -36,10 +36,10 @@ import androidx.browser.customtabs.CustomTabsSession import androidx.core.content.ContextCompat import androidx.core.content.FileProvider import androidx.fragment.app.Fragment +import im.vector.app.BuildConfig +import im.vector.app.R +import im.vector.app.features.notifications.NotificationUtils import im.vector.matrix.android.api.extensions.tryThis -import im.vector.riotx.BuildConfig -import im.vector.riotx.R -import im.vector.riotx.features.notifications.NotificationUtils import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch diff --git a/vector/src/main/java/im/vector/riotx/core/utils/FileUtils.kt b/vector/src/main/java/im/vector/app/core/utils/FileUtils.kt similarity index 99% rename from vector/src/main/java/im/vector/riotx/core/utils/FileUtils.kt rename to vector/src/main/java/im/vector/app/core/utils/FileUtils.kt index 839356a129..ab99ba61bd 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/FileUtils.kt +++ b/vector/src/main/java/im/vector/app/core/utils/FileUtils.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.utils +package im.vector.app.core.utils import android.content.Context import timber.log.Timber diff --git a/vector/src/main/java/im/vector/riotx/core/utils/FirstThrottler.kt b/vector/src/main/java/im/vector/app/core/utils/FirstThrottler.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/utils/FirstThrottler.kt rename to vector/src/main/java/im/vector/app/core/utils/FirstThrottler.kt index eb66d3aebf..915e955fa6 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/FirstThrottler.kt +++ b/vector/src/main/java/im/vector/app/core/utils/FirstThrottler.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.core.utils +package im.vector.app.core.utils /** * Simple ThrottleFirst diff --git a/vector/src/main/java/im/vector/riotx/core/utils/Handler.kt b/vector/src/main/java/im/vector/app/core/utils/Handler.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/utils/Handler.kt rename to vector/src/main/java/im/vector/app/core/utils/Handler.kt index 91a035d24b..c7ec97f53e 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/Handler.kt +++ b/vector/src/main/java/im/vector/app/core/utils/Handler.kt @@ -16,7 +16,7 @@ */ -package im.vector.riotx.core.utils +package im.vector.app.core.utils import android.os.Handler import android.os.HandlerThread diff --git a/vector/src/main/java/im/vector/riotx/core/utils/JsonViewerStyler.kt b/vector/src/main/java/im/vector/app/core/utils/JsonViewerStyler.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/core/utils/JsonViewerStyler.kt rename to vector/src/main/java/im/vector/app/core/utils/JsonViewerStyler.kt index 94b08b22d6..ab203e2fa0 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/JsonViewerStyler.kt +++ b/vector/src/main/java/im/vector/app/core/utils/JsonViewerStyler.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.core.utils +package im.vector.app.core.utils -import im.vector.riotx.R -import im.vector.riotx.core.resources.ColorProvider +import im.vector.app.R +import im.vector.app.core.resources.ColorProvider import org.billcarsonfr.jsonviewer.JSonViewerStyleProvider fun createJSonViewerStyleProvider(colorProvider: ColorProvider): JSonViewerStyleProvider { diff --git a/vector/src/main/java/im/vector/riotx/core/utils/KeyboardStateUtils.kt b/vector/src/main/java/im/vector/app/core/utils/KeyboardStateUtils.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/utils/KeyboardStateUtils.kt rename to vector/src/main/java/im/vector/app/core/utils/KeyboardStateUtils.kt index c525d588ae..5c6c95c957 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/KeyboardStateUtils.kt +++ b/vector/src/main/java/im/vector/app/core/utils/KeyboardStateUtils.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.utils +package im.vector.app.core.utils import android.app.Activity import android.graphics.Rect diff --git a/vector/src/main/java/im/vector/riotx/core/utils/LiveEvent.kt b/vector/src/main/java/im/vector/app/core/utils/LiveEvent.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/utils/LiveEvent.kt rename to vector/src/main/java/im/vector/app/core/utils/LiveEvent.kt index 78ea4fb8b4..061790cb7a 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/LiveEvent.kt +++ b/vector/src/main/java/im/vector/app/core/utils/LiveEvent.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.utils +package im.vector.app.core.utils import androidx.lifecycle.Observer diff --git a/vector/src/main/java/im/vector/riotx/core/utils/PermissionsTools.kt b/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt similarity index 99% rename from vector/src/main/java/im/vector/riotx/core/utils/PermissionsTools.kt rename to vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt index 6f081d52de..38c97830ca 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/PermissionsTools.kt +++ b/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.utils +package im.vector.app.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.riotx.R +import im.vector.app.R import timber.log.Timber private const val LOG_TAG = "PermissionUtils" diff --git a/vector/src/main/java/im/vector/riotx/core/utils/RingtoneUtils.kt b/vector/src/main/java/im/vector/app/core/utils/RingtoneUtils.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/utils/RingtoneUtils.kt rename to vector/src/main/java/im/vector/app/core/utils/RingtoneUtils.kt index 5345658207..82b8c3a51a 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/RingtoneUtils.kt +++ b/vector/src/main/java/im/vector/app/core/utils/RingtoneUtils.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotx.core.utils +package im.vector.app.core.utils import android.content.Context import android.media.Ringtone import android.media.RingtoneManager import android.net.Uri -import androidx.preference.PreferenceManager import androidx.core.content.edit -import im.vector.riotx.features.settings.VectorPreferences +import androidx.preference.PreferenceManager +import im.vector.app.features.settings.VectorPreferences /** * This file manages the sound ringtone for calls. diff --git a/vector/src/main/java/im/vector/riotx/core/utils/SnapHelperUtils.kt b/vector/src/main/java/im/vector/app/core/utils/SnapHelperUtils.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/core/utils/SnapHelperUtils.kt rename to vector/src/main/java/im/vector/app/core/utils/SnapHelperUtils.kt index 70831730b4..e039e0bde5 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/SnapHelperUtils.kt +++ b/vector/src/main/java/im/vector/app/core/utils/SnapHelperUtils.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.utils +package im.vector.app.core.utils import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.SnapHelper diff --git a/vector/src/main/java/im/vector/riotx/core/utils/SpannableUtils.kt b/vector/src/main/java/im/vector/app/core/utils/SpannableUtils.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/core/utils/SpannableUtils.kt rename to vector/src/main/java/im/vector/app/core/utils/SpannableUtils.kt index 6536da73f5..69702fc793 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/SpannableUtils.kt +++ b/vector/src/main/java/im/vector/app/core/utils/SpannableUtils.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.core.utils +package im.vector.app.core.utils import android.text.Spannable import android.text.style.BulletSpan diff --git a/vector/src/main/java/im/vector/riotx/core/utils/SystemUtils.kt b/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/core/utils/SystemUtils.kt rename to vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt index 900d5565dc..88bbe24f88 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/SystemUtils.kt +++ b/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.utils +package im.vector.app.core.utils import android.annotation.TargetApi import android.app.Activity @@ -31,8 +31,8 @@ import android.widget.Toast import androidx.annotation.StringRes import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment -import im.vector.riotx.R -import im.vector.riotx.features.notifications.NotificationUtils +import im.vector.app.R +import im.vector.app.features.notifications.NotificationUtils /** * Tells if the application ignores battery optimizations. diff --git a/vector/src/main/java/im/vector/riotx/core/utils/TemporaryStore.kt b/vector/src/main/java/im/vector/app/core/utils/TemporaryStore.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/utils/TemporaryStore.kt rename to vector/src/main/java/im/vector/app/core/utils/TemporaryStore.kt index 8484162bc8..32b995c004 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/TemporaryStore.kt +++ b/vector/src/main/java/im/vector/app/core/utils/TemporaryStore.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.utils +package im.vector.app.core.utils import java.util.Timer import java.util.TimerTask diff --git a/vector/src/main/java/im/vector/riotx/core/utils/TextUtils.kt b/vector/src/main/java/im/vector/app/core/utils/TextUtils.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/core/utils/TextUtils.kt rename to vector/src/main/java/im/vector/app/core/utils/TextUtils.kt index 9519eb1f9d..84dd793172 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/TextUtils.kt +++ b/vector/src/main/java/im/vector/app/core/utils/TextUtils.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.utils +package im.vector.app.core.utils import android.content.Context import android.os.Build diff --git a/vector/src/main/java/im/vector/riotx/core/utils/UrlUtils.kt b/vector/src/main/java/im/vector/app/core/utils/UrlUtils.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/core/utils/UrlUtils.kt rename to vector/src/main/java/im/vector/app/core/utils/UrlUtils.kt index c26cd85dc7..095e01fa56 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/UrlUtils.kt +++ b/vector/src/main/java/im/vector/app/core/utils/UrlUtils.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.utils +package im.vector.app.core.utils import java.net.URL diff --git a/vector/src/main/java/im/vector/riotx/core/utils/UserColor.kt b/vector/src/main/java/im/vector/app/core/utils/UserColor.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/core/utils/UserColor.kt rename to vector/src/main/java/im/vector/app/core/utils/UserColor.kt index 1f8308cd5c..af006a35bb 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/UserColor.kt +++ b/vector/src/main/java/im/vector/app/core/utils/UserColor.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.core.utils +package im.vector.app.core.utils import androidx.annotation.ColorRes -import im.vector.riotx.R +import im.vector.app.R import kotlin.math.abs @ColorRes diff --git a/vector/src/main/java/im/vector/riotx/core/utils/ViewUtils.kt b/vector/src/main/java/im/vector/app/core/utils/ViewUtils.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/core/utils/ViewUtils.kt rename to vector/src/main/java/im/vector/app/core/utils/ViewUtils.kt index 335b9112ef..0e10a35981 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/ViewUtils.kt +++ b/vector/src/main/java/im/vector/app/core/utils/ViewUtils.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package im.vector.riotx.core.utils +package im.vector.app.core.utils import android.text.Editable import android.view.ViewGroup import androidx.core.view.children import com.google.android.material.textfield.TextInputLayout -import im.vector.riotx.core.platform.SimpleTextWatcher +import im.vector.app.core.platform.SimpleTextWatcher /** * Find all TextInputLayout in a ViewGroup and in all its descendants diff --git a/vector/src/main/java/im/vector/riotx/core/utils/WeakReferenceDelegate.kt b/vector/src/main/java/im/vector/app/core/utils/WeakReferenceDelegate.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/core/utils/WeakReferenceDelegate.kt rename to vector/src/main/java/im/vector/app/core/utils/WeakReferenceDelegate.kt index 7e4715590f..849431eb6e 100644 --- a/vector/src/main/java/im/vector/riotx/core/utils/WeakReferenceDelegate.kt +++ b/vector/src/main/java/im/vector/app/core/utils/WeakReferenceDelegate.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.core.utils +package im.vector.app.core.utils import java.lang.ref.WeakReference import kotlin.reflect.KProperty diff --git a/vector/src/main/java/im/vector/riotx/features/MainActivity.kt b/vector/src/main/java/im/vector/app/features/MainActivity.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/MainActivity.kt rename to vector/src/main/java/im/vector/app/features/MainActivity.kt index 051ae72c94..192dc57d7b 100644 --- a/vector/src/main/java/im/vector/riotx/features/MainActivity.kt +++ b/vector/src/main/java/im/vector/app/features/MainActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features +package im.vector.app.features import android.app.Activity import android.content.Intent @@ -24,24 +24,24 @@ import androidx.appcompat.app.AlertDialog import com.bumptech.glide.Glide import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.failure.GlobalError -import im.vector.riotx.R -import im.vector.riotx.core.di.ActiveSessionHolder -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.error.ErrorFormatter -import im.vector.riotx.core.extensions.startSyncing -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.core.utils.deleteAllFiles -import im.vector.riotx.features.home.HomeActivity -import im.vector.riotx.features.home.ShortcutsHandler -import im.vector.riotx.features.login.LoginActivity -import im.vector.riotx.features.notifications.NotificationDrawerManager -import im.vector.riotx.features.pin.PinCodeStore -import im.vector.riotx.features.pin.PinLocker -import im.vector.riotx.features.pin.UnlockedActivity -import im.vector.riotx.features.settings.VectorPreferences -import im.vector.riotx.features.signout.hard.SignedOutActivity -import im.vector.riotx.features.signout.soft.SoftLogoutActivity -import im.vector.riotx.features.ui.UiStateRepository +import im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.error.ErrorFormatter +import im.vector.app.core.extensions.startSyncing +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.core.utils.deleteAllFiles +import im.vector.app.features.home.HomeActivity +import im.vector.app.features.home.ShortcutsHandler +import im.vector.app.features.login.LoginActivity +import im.vector.app.features.notifications.NotificationDrawerManager +import im.vector.app.features.pin.PinCodeStore +import im.vector.app.features.pin.PinLocker +import im.vector.app.features.pin.UnlockedActivity +import im.vector.app.features.settings.VectorPreferences +import im.vector.app.features.signout.hard.SignedOutActivity +import im.vector.app.features.signout.soft.SoftLogoutActivity +import im.vector.app.features.ui.UiStateRepository import kotlinx.android.parcel.Parcelize import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/AttachmentTypeSelectorView.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/attachments/AttachmentTypeSelectorView.kt rename to vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt index 0c2d958564..fa35ac3fd8 100644 --- a/vector/src/main/java/im/vector/riotx/features/attachments/AttachmentTypeSelectorView.kt +++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.attachments +package im.vector.app.features.attachments import android.animation.Animator import android.animation.AnimatorListenerAdapter @@ -39,13 +39,13 @@ import android.widget.PopupWindow import androidx.core.view.doOnNextLayout import com.amulyakhare.textdrawable.TextDrawable import com.amulyakhare.textdrawable.util.ColorGenerator -import im.vector.riotx.R -import im.vector.riotx.core.extensions.getMeasurements -import im.vector.riotx.core.utils.PERMISSIONS_EMPTY -import im.vector.riotx.core.utils.PERMISSIONS_FOR_PICKING_CONTACT -import im.vector.riotx.core.utils.PERMISSIONS_FOR_TAKING_PHOTO -import im.vector.riotx.core.utils.PERMISSIONS_FOR_WRITING_FILES -import im.vector.riotx.features.attachments.AttachmentTypeSelectorView.Callback +import im.vector.app.R +import im.vector.app.core.extensions.getMeasurements +import im.vector.app.core.utils.PERMISSIONS_EMPTY +import im.vector.app.core.utils.PERMISSIONS_FOR_PICKING_CONTACT +import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO +import im.vector.app.core.utils.PERMISSIONS_FOR_WRITING_FILES +import im.vector.app.features.attachments.AttachmentTypeSelectorView.Callback import kotlin.math.max private const val ANIMATION_DURATION = 250 diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/AttachmentsHelper.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/attachments/AttachmentsHelper.kt rename to vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt index 149d5e2411..fd417d90b2 100644 --- a/vector/src/main/java/im/vector/riotx/features/attachments/AttachmentsHelper.kt +++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.attachments +package im.vector.app.features.attachments import android.app.Activity import android.content.Context @@ -21,10 +21,10 @@ import android.content.Intent import android.net.Uri import android.os.Bundle import androidx.fragment.app.Fragment +import im.vector.app.core.platform.Restorable import im.vector.lib.multipicker.MultiPicker import im.vector.matrix.android.BuildConfig import im.vector.matrix.android.api.session.content.ContentAttachmentData -import im.vector.riotx.core.platform.Restorable import timber.log.Timber private const val CAPTURE_PATH_KEY = "CAPTURE_PATH_KEY" diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/AttachmentsMapper.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsMapper.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/attachments/AttachmentsMapper.kt rename to vector/src/main/java/im/vector/app/features/attachments/AttachmentsMapper.kt index 9027931854..95cea0c910 100644 --- a/vector/src/main/java/im/vector/riotx/features/attachments/AttachmentsMapper.kt +++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsMapper.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.attachments +package im.vector.app.features.attachments import im.vector.lib.multipicker.entity.MultiPickerAudioType import im.vector.lib.multipicker.entity.MultiPickerBaseType diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/ContactAttachment.kt b/vector/src/main/java/im/vector/app/features/attachments/ContactAttachment.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/attachments/ContactAttachment.kt rename to vector/src/main/java/im/vector/app/features/attachments/ContactAttachment.kt index 80acefdcf2..0459bd5c37 100644 --- a/vector/src/main/java/im/vector/riotx/features/attachments/ContactAttachment.kt +++ b/vector/src/main/java/im/vector/app/features/attachments/ContactAttachment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.attachments +package im.vector.app.features.attachments /** * Data class holding values of a picked contact diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/ContentAttachmentData.kt b/vector/src/main/java/im/vector/app/features/attachments/ContentAttachmentData.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/attachments/ContentAttachmentData.kt rename to vector/src/main/java/im/vector/app/features/attachments/ContentAttachmentData.kt index 8fb717f96e..3a8324547a 100644 --- a/vector/src/main/java/im/vector/riotx/features/attachments/ContentAttachmentData.kt +++ b/vector/src/main/java/im/vector/app/features/attachments/ContentAttachmentData.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.attachments +package im.vector.app.features.attachments import im.vector.matrix.android.api.session.content.ContentAttachmentData diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentPreviewControllers.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewControllers.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentPreviewControllers.kt rename to vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewControllers.kt index 60ee722116..fbaaae7171 100644 --- a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentPreviewControllers.kt +++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewControllers.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.attachments.preview +package im.vector.app.features.attachments.preview import com.airbnb.epoxy.TypedEpoxyController import im.vector.matrix.android.api.session.content.ContentAttachmentData diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentPreviewItems.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewItems.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentPreviewItems.kt rename to vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewItems.kt index 7a3d022cf3..fa702ecb16 100644 --- a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentPreviewItems.kt +++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewItems.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.attachments.preview +package im.vector.app.features.attachments.preview import android.view.View import android.widget.ImageView @@ -22,11 +22,11 @@ import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import com.bumptech.glide.Glide import com.bumptech.glide.request.RequestOptions +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.platform.CheckableImageView import im.vector.matrix.android.api.session.content.ContentAttachmentData -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.CheckableImageView abstract class AttachmentPreviewItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewAction.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewAction.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewAction.kt rename to vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewAction.kt index aef724331f..16f6fe2b97 100644 --- a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewAction.kt +++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewAction.kt @@ -15,10 +15,10 @@ * */ -package im.vector.riotx.features.attachments.preview +package im.vector.app.features.attachments.preview import android.net.Uri -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction sealed class AttachmentsPreviewAction : VectorViewModelAction { object RemoveCurrentAttachment : AttachmentsPreviewAction() diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewActivity.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewActivity.kt rename to vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt index 21febd81a9..1d8a3c123a 100644 --- a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewActivity.kt +++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt @@ -15,17 +15,17 @@ * */ -package im.vector.riotx.features.attachments.preview +package im.vector.app.features.attachments.preview import android.content.Context import android.content.Intent import androidx.appcompat.widget.Toolbar +import im.vector.app.R +import im.vector.app.core.extensions.addFragment +import im.vector.app.core.platform.ToolbarConfigurable +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.features.themes.ActivityOtherThemes import im.vector.matrix.android.api.session.content.ContentAttachmentData -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 im.vector.riotx.features.themes.ActivityOtherThemes class AttachmentsPreviewActivity : VectorBaseActivity(), ToolbarConfigurable { diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewFragment.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewFragment.kt rename to vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt index 59629743b5..2f9bd1cab5 100644 --- a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewFragment.kt +++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt @@ -15,7 +15,7 @@ * */ -package im.vector.riotx.features.attachments.preview +package im.vector.app.features.attachments.preview import android.app.Activity.RESULT_CANCELED import android.app.Activity.RESULT_OK @@ -37,20 +37,20 @@ import com.airbnb.mvrx.args import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState import com.yalantis.ucrop.UCrop +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.utils.OnSnapPositionChangeListener +import im.vector.app.core.utils.PERMISSIONS_FOR_WRITING_FILES +import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_PREVIEW_FRAGMENT +import im.vector.app.core.utils.SnapOnScrollListener +import im.vector.app.core.utils.allGranted +import im.vector.app.core.utils.attachSnapHelperWithListener +import im.vector.app.core.utils.checkPermissions +import im.vector.app.features.media.createUCropWithDefaultSettings import im.vector.matrix.android.api.extensions.orFalse import im.vector.matrix.android.api.session.content.ContentAttachmentData -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.utils.OnSnapPositionChangeListener -import im.vector.riotx.core.utils.PERMISSIONS_FOR_WRITING_FILES -import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_PREVIEW_FRAGMENT -import im.vector.riotx.core.utils.SnapOnScrollListener -import im.vector.riotx.core.utils.allGranted -import im.vector.riotx.core.utils.attachSnapHelperWithListener -import im.vector.riotx.core.utils.checkPermissions -import im.vector.riotx.features.media.createUCropWithDefaultSettings import kotlinx.android.parcel.Parcelize import kotlinx.android.synthetic.main.fragment_attachments_preview.* import timber.log.Timber diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewViewEvents.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewEvents.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewViewEvents.kt rename to vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewEvents.kt index 12a9d9aa24..0f2a82bdf6 100644 --- a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewEvents.kt @@ -15,8 +15,8 @@ * */ -package im.vector.riotx.features.attachments.preview +package im.vector.app.features.attachments.preview -import im.vector.riotx.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewEvents sealed class AttachmentsPreviewViewEvents : VectorViewEvents diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewViewModel.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewModel.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewViewModel.kt rename to vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewModel.kt index d1e44fa963..59a0937d89 100644 --- a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewModel.kt @@ -15,15 +15,15 @@ * */ -package im.vector.riotx.features.attachments.preview +package im.vector.app.features.attachments.preview import com.airbnb.mvrx.FragmentViewModelContext import com.airbnb.mvrx.MvRxViewModelFactory import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorViewModel +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorViewModel class AttachmentsPreviewViewModel @AssistedInject constructor(@Assisted initialState: AttachmentsPreviewViewState) : VectorViewModel(initialState) { diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewViewState.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewState.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewViewState.kt rename to vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewState.kt index 50214fd9d7..4dc5b30df6 100644 --- a/vector/src/main/java/im/vector/riotx/features/attachments/preview/AttachmentsPreviewViewState.kt +++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewViewState.kt @@ -15,7 +15,7 @@ * */ -package im.vector.riotx.features.attachments.preview +package im.vector.app.features.attachments.preview import com.airbnb.mvrx.MvRxState import im.vector.matrix.android.api.session.content.ContentAttachmentData diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/preview/Extensions.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/Extensions.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/attachments/preview/Extensions.kt rename to vector/src/main/java/im/vector/app/features/attachments/preview/Extensions.kt index 40fcc0aa92..82fc621646 100644 --- a/vector/src/main/java/im/vector/riotx/features/attachments/preview/Extensions.kt +++ b/vector/src/main/java/im/vector/app/features/attachments/preview/Extensions.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.attachments.preview +package im.vector.app.features.attachments.preview import im.vector.matrix.android.api.session.content.ContentAttachmentData diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/AutocompleteClickListener.kt b/vector/src/main/java/im/vector/app/features/autocomplete/AutocompleteClickListener.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/autocomplete/AutocompleteClickListener.kt rename to vector/src/main/java/im/vector/app/features/autocomplete/AutocompleteClickListener.kt index 96216d5e5e..50896c5f34 100644 --- a/vector/src/main/java/im/vector/riotx/features/autocomplete/AutocompleteClickListener.kt +++ b/vector/src/main/java/im/vector/app/features/autocomplete/AutocompleteClickListener.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.autocomplete +package im.vector.app.features.autocomplete /** * Simple generic listener interface diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/AutocompleteMatrixItem.kt b/vector/src/main/java/im/vector/app/features/autocomplete/AutocompleteMatrixItem.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/autocomplete/AutocompleteMatrixItem.kt rename to vector/src/main/java/im/vector/app/features/autocomplete/AutocompleteMatrixItem.kt index fbfffc7652..7ed992a167 100644 --- a/vector/src/main/java/im/vector/riotx/features/autocomplete/AutocompleteMatrixItem.kt +++ b/vector/src/main/java/im/vector/app/features/autocomplete/AutocompleteMatrixItem.kt @@ -14,19 +14,19 @@ * limitations under the License. */ -package im.vector.riotx.features.autocomplete +package im.vector.app.features.autocomplete 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.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.extensions.setTextOrHide +import im.vector.app.features.home.AvatarRenderer import im.vector.matrix.android.api.util.MatrixItem -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.features.home.AvatarRenderer @EpoxyModelClass(layout = R.layout.item_autocomplete_matrix_item) abstract class AutocompleteMatrixItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/RecyclerViewPresenter.kt b/vector/src/main/java/im/vector/app/features/autocomplete/RecyclerViewPresenter.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/autocomplete/RecyclerViewPresenter.kt rename to vector/src/main/java/im/vector/app/features/autocomplete/RecyclerViewPresenter.kt index 1e24a904d9..e7ece3bb9e 100644 --- a/vector/src/main/java/im/vector/riotx/features/autocomplete/RecyclerViewPresenter.kt +++ b/vector/src/main/java/im/vector/app/features/autocomplete/RecyclerViewPresenter.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.autocomplete +package im.vector.app.features.autocomplete import android.content.Context import android.database.DataSetObserver diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandController.kt b/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandController.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandController.kt rename to vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandController.kt index a6e861d9f6..a5eecf24ba 100644 --- a/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandController.kt +++ b/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandController.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotx.features.autocomplete.command +package im.vector.app.features.autocomplete.command import com.airbnb.epoxy.TypedEpoxyController -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.autocomplete.AutocompleteClickListener -import im.vector.riotx.features.command.Command +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.autocomplete.AutocompleteClickListener +import im.vector.app.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/riotx/features/autocomplete/command/AutocompleteCommandItem.kt b/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandItem.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandItem.kt rename to vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandItem.kt index eaac9c6c5c..257a2abd6c 100644 --- a/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandItem.kt +++ b/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandItem.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotx.features.autocomplete.command +package im.vector.app.features.autocomplete.command import android.view.View import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel @EpoxyModelClass(layout = R.layout.item_autocomplete_command) abstract class AutocompleteCommandItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandPresenter.kt b/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandPresenter.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandPresenter.kt rename to vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandPresenter.kt index caadb3cc91..d121c68557 100644 --- a/vector/src/main/java/im/vector/riotx/features/autocomplete/command/AutocompleteCommandPresenter.kt +++ b/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandPresenter.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package im.vector.riotx.features.autocomplete.command +package im.vector.app.features.autocomplete.command import android.content.Context import androidx.recyclerview.widget.RecyclerView -import im.vector.riotx.features.autocomplete.AutocompleteClickListener -import im.vector.riotx.features.autocomplete.RecyclerViewPresenter -import im.vector.riotx.features.command.Command +import im.vector.app.features.autocomplete.AutocompleteClickListener +import im.vector.app.features.autocomplete.RecyclerViewPresenter +import im.vector.app.features.command.Command import javax.inject.Inject class AutocompleteCommandPresenter @Inject constructor(context: Context, diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/command/CommandAutocompletePolicy.kt b/vector/src/main/java/im/vector/app/features/autocomplete/command/CommandAutocompletePolicy.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/autocomplete/command/CommandAutocompletePolicy.kt rename to vector/src/main/java/im/vector/app/features/autocomplete/command/CommandAutocompletePolicy.kt index 656bcd4beb..8112fa7866 100644 --- a/vector/src/main/java/im/vector/riotx/features/autocomplete/command/CommandAutocompletePolicy.kt +++ b/vector/src/main/java/im/vector/app/features/autocomplete/command/CommandAutocompletePolicy.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.autocomplete.command +package im.vector.app.features.autocomplete.command import android.text.Spannable import com.otaliastudios.autocomplete.AutocompletePolicy diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteEmojiController.kt b/vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiController.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteEmojiController.kt rename to vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiController.kt index 6d498de2d2..2f99a64221 100644 --- a/vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteEmojiController.kt +++ b/vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiController.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotx.features.autocomplete.emoji +package im.vector.app.features.autocomplete.emoji import android.graphics.Typeface import androidx.recyclerview.widget.RecyclerView import com.airbnb.epoxy.TypedEpoxyController -import im.vector.riotx.EmojiCompatFontProvider -import im.vector.riotx.features.autocomplete.AutocompleteClickListener -import im.vector.riotx.features.reactions.ReactionClickListener -import im.vector.riotx.features.reactions.data.EmojiItem +import im.vector.app.EmojiCompatFontProvider +import im.vector.app.features.autocomplete.AutocompleteClickListener +import im.vector.app.features.reactions.ReactionClickListener +import im.vector.app.features.reactions.data.EmojiItem import javax.inject.Inject class AutocompleteEmojiController @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteEmojiItem.kt b/vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiItem.kt similarity index 83% rename from vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteEmojiItem.kt rename to vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiItem.kt index 76573929cc..5a6e73da6a 100644 --- a/vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteEmojiItem.kt +++ b/vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiItem.kt @@ -14,18 +14,18 @@ * limitations under the License. */ -package im.vector.riotx.features.autocomplete.emoji +package im.vector.app.features.autocomplete.emoji import android.graphics.Typeface import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -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.features.reactions.ReactionClickListener -import im.vector.riotx.features.reactions.data.EmojiItem +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.extensions.setTextOrHide +import im.vector.app.features.reactions.ReactionClickListener +import im.vector.app.features.reactions.data.EmojiItem @EpoxyModelClass(layout = R.layout.item_autocomplete_emoji) abstract class AutocompleteEmojiItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteEmojiPresenter.kt b/vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiPresenter.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteEmojiPresenter.kt rename to vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiPresenter.kt index 5f7622a4f3..bf180746de 100644 --- a/vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteEmojiPresenter.kt +++ b/vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteEmojiPresenter.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package im.vector.riotx.features.autocomplete.emoji +package im.vector.app.features.autocomplete.emoji import android.content.Context import androidx.recyclerview.widget.RecyclerView -import im.vector.riotx.features.autocomplete.AutocompleteClickListener -import im.vector.riotx.features.autocomplete.RecyclerViewPresenter -import im.vector.riotx.features.reactions.data.EmojiDataSource +import im.vector.app.features.autocomplete.AutocompleteClickListener +import im.vector.app.features.autocomplete.RecyclerViewPresenter +import im.vector.app.features.reactions.data.EmojiDataSource import javax.inject.Inject class AutocompleteEmojiPresenter @Inject constructor(context: Context, diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteMoreResultItem.kt b/vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteMoreResultItem.kt similarity index 82% rename from vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteMoreResultItem.kt rename to vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteMoreResultItem.kt index 844cc96035..6925b15c9a 100644 --- a/vector/src/main/java/im/vector/riotx/features/autocomplete/emoji/AutocompleteMoreResultItem.kt +++ b/vector/src/main/java/im/vector/app/features/autocomplete/emoji/AutocompleteMoreResultItem.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotx.features.autocomplete.emoji +package im.vector.app.features.autocomplete.emoji import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel @EpoxyModelClass(layout = R.layout.item_autocomplete_more_result) abstract class AutocompleteMoreResultItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/group/AutocompleteGroupController.kt b/vector/src/main/java/im/vector/app/features/autocomplete/group/AutocompleteGroupController.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/autocomplete/group/AutocompleteGroupController.kt rename to vector/src/main/java/im/vector/app/features/autocomplete/group/AutocompleteGroupController.kt index 5d0d43d9ea..95f9436f05 100644 --- a/vector/src/main/java/im/vector/riotx/features/autocomplete/group/AutocompleteGroupController.kt +++ b/vector/src/main/java/im/vector/app/features/autocomplete/group/AutocompleteGroupController.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.features.autocomplete.group +package im.vector.app.features.autocomplete.group import com.airbnb.epoxy.TypedEpoxyController +import im.vector.app.features.autocomplete.AutocompleteClickListener +import im.vector.app.features.autocomplete.autocompleteMatrixItem +import im.vector.app.features.home.AvatarRenderer import im.vector.matrix.android.api.session.group.model.GroupSummary import im.vector.matrix.android.api.util.toMatrixItem -import im.vector.riotx.features.autocomplete.AutocompleteClickListener -import im.vector.riotx.features.autocomplete.autocompleteMatrixItem -import im.vector.riotx.features.home.AvatarRenderer import javax.inject.Inject class AutocompleteGroupController @Inject constructor() : TypedEpoxyController>() { diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/group/AutocompleteGroupPresenter.kt b/vector/src/main/java/im/vector/app/features/autocomplete/group/AutocompleteGroupPresenter.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/autocomplete/group/AutocompleteGroupPresenter.kt rename to vector/src/main/java/im/vector/app/features/autocomplete/group/AutocompleteGroupPresenter.kt index 3c63dc65d4..de9e85f272 100644 --- a/vector/src/main/java/im/vector/riotx/features/autocomplete/group/AutocompleteGroupPresenter.kt +++ b/vector/src/main/java/im/vector/app/features/autocomplete/group/AutocompleteGroupPresenter.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package im.vector.riotx.features.autocomplete.group +package im.vector.app.features.autocomplete.group import android.content.Context import androidx.recyclerview.widget.RecyclerView +import im.vector.app.features.autocomplete.AutocompleteClickListener +import im.vector.app.features.autocomplete.RecyclerViewPresenter import im.vector.matrix.android.api.query.QueryStringValue import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.group.groupSummaryQueryParams import im.vector.matrix.android.api.session.group.model.GroupSummary -import im.vector.riotx.features.autocomplete.AutocompleteClickListener -import im.vector.riotx.features.autocomplete.RecyclerViewPresenter import javax.inject.Inject class AutocompleteGroupPresenter @Inject constructor(context: Context, diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/member/AutocompleteMemberController.kt b/vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberController.kt similarity index 85% rename from vector/src/main/java/im/vector/riotx/features/autocomplete/member/AutocompleteMemberController.kt rename to vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberController.kt index 8102a5a45f..e9aa77bb57 100644 --- a/vector/src/main/java/im/vector/riotx/features/autocomplete/member/AutocompleteMemberController.kt +++ b/vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberController.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.features.autocomplete.member +package im.vector.app.features.autocomplete.member import com.airbnb.epoxy.TypedEpoxyController +import im.vector.app.features.autocomplete.AutocompleteClickListener +import im.vector.app.features.autocomplete.autocompleteMatrixItem +import im.vector.app.features.home.AvatarRenderer import im.vector.matrix.android.api.session.room.model.RoomMemberSummary import im.vector.matrix.android.api.util.toMatrixItem -import im.vector.riotx.features.autocomplete.AutocompleteClickListener -import im.vector.riotx.features.autocomplete.autocompleteMatrixItem -import im.vector.riotx.features.home.AvatarRenderer import javax.inject.Inject class AutocompleteMemberController @Inject constructor() : TypedEpoxyController>() { diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/member/AutocompleteMemberPresenter.kt b/vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberPresenter.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/autocomplete/member/AutocompleteMemberPresenter.kt rename to vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberPresenter.kt index 77333b3d48..25a96ffdb4 100644 --- a/vector/src/main/java/im/vector/riotx/features/autocomplete/member/AutocompleteMemberPresenter.kt +++ b/vector/src/main/java/im/vector/app/features/autocomplete/member/AutocompleteMemberPresenter.kt @@ -14,19 +14,19 @@ * limitations under the License. */ -package im.vector.riotx.features.autocomplete.member +package im.vector.app.features.autocomplete.member import android.content.Context import androidx.recyclerview.widget.RecyclerView import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.features.autocomplete.AutocompleteClickListener +import im.vector.app.features.autocomplete.RecyclerViewPresenter import im.vector.matrix.android.api.query.QueryStringValue import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.room.members.roomMemberQueryParams import im.vector.matrix.android.api.session.room.model.Membership import im.vector.matrix.android.api.session.room.model.RoomMemberSummary -import im.vector.riotx.features.autocomplete.AutocompleteClickListener -import im.vector.riotx.features.autocomplete.RecyclerViewPresenter class AutocompleteMemberPresenter @AssistedInject constructor(context: Context, @Assisted val roomId: String, diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/room/AutocompleteRoomController.kt b/vector/src/main/java/im/vector/app/features/autocomplete/room/AutocompleteRoomController.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/autocomplete/room/AutocompleteRoomController.kt rename to vector/src/main/java/im/vector/app/features/autocomplete/room/AutocompleteRoomController.kt index aae95502d9..6aac279cab 100644 --- a/vector/src/main/java/im/vector/riotx/features/autocomplete/room/AutocompleteRoomController.kt +++ b/vector/src/main/java/im/vector/app/features/autocomplete/room/AutocompleteRoomController.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.features.autocomplete.room +package im.vector.app.features.autocomplete.room import com.airbnb.epoxy.TypedEpoxyController +import im.vector.app.features.autocomplete.AutocompleteClickListener +import im.vector.app.features.autocomplete.autocompleteMatrixItem +import im.vector.app.features.home.AvatarRenderer import im.vector.matrix.android.api.session.room.model.RoomSummary import im.vector.matrix.android.api.util.toMatrixItem -import im.vector.riotx.features.autocomplete.AutocompleteClickListener -import im.vector.riotx.features.autocomplete.autocompleteMatrixItem -import im.vector.riotx.features.home.AvatarRenderer import javax.inject.Inject class AutocompleteRoomController @Inject constructor(private val avatarRenderer: AvatarRenderer) : TypedEpoxyController>() { diff --git a/vector/src/main/java/im/vector/riotx/features/autocomplete/room/AutocompleteRoomPresenter.kt b/vector/src/main/java/im/vector/app/features/autocomplete/room/AutocompleteRoomPresenter.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/autocomplete/room/AutocompleteRoomPresenter.kt rename to vector/src/main/java/im/vector/app/features/autocomplete/room/AutocompleteRoomPresenter.kt index c845decdf9..0475d34d65 100644 --- a/vector/src/main/java/im/vector/riotx/features/autocomplete/room/AutocompleteRoomPresenter.kt +++ b/vector/src/main/java/im/vector/app/features/autocomplete/room/AutocompleteRoomPresenter.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package im.vector.riotx.features.autocomplete.room +package im.vector.app.features.autocomplete.room import android.content.Context import androidx.recyclerview.widget.RecyclerView +import im.vector.app.features.autocomplete.AutocompleteClickListener +import im.vector.app.features.autocomplete.RecyclerViewPresenter import im.vector.matrix.android.api.query.QueryStringValue import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.room.model.RoomSummary import im.vector.matrix.android.api.session.room.roomSummaryQueryParams -import im.vector.riotx.features.autocomplete.AutocompleteClickListener -import im.vector.riotx.features.autocomplete.RecyclerViewPresenter import javax.inject.Inject class AutocompleteRoomPresenter @Inject constructor(context: Context, diff --git a/vector/src/main/java/im/vector/riotx/features/badge/BadgeProxy.kt b/vector/src/main/java/im/vector/app/features/badge/BadgeProxy.kt similarity index 99% rename from vector/src/main/java/im/vector/riotx/features/badge/BadgeProxy.kt rename to vector/src/main/java/im/vector/app/features/badge/BadgeProxy.kt index 2da90b9c6d..6400c63e9c 100644 --- a/vector/src/main/java/im/vector/riotx/features/badge/BadgeProxy.kt +++ b/vector/src/main/java/im/vector/app/features/badge/BadgeProxy.kt @@ -16,7 +16,7 @@ @file:Suppress("UNUSED_PARAMETER") -package im.vector.riotx.features.badge +package im.vector.app.features.badge import android.content.Context import android.os.Build diff --git a/vector/src/main/java/im/vector/riotx/features/call/CallAudioManager.kt b/vector/src/main/java/im/vector/app/features/call/CallAudioManager.kt similarity index 99% rename from vector/src/main/java/im/vector/riotx/features/call/CallAudioManager.kt rename to vector/src/main/java/im/vector/app/features/call/CallAudioManager.kt index b25a11b5b3..2bde718a9c 100644 --- a/vector/src/main/java/im/vector/riotx/features/call/CallAudioManager.kt +++ b/vector/src/main/java/im/vector/app/features/call/CallAudioManager.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.call +package im.vector.app.features.call import android.bluetooth.BluetoothAdapter import android.bluetooth.BluetoothManager @@ -22,8 +22,8 @@ import android.bluetooth.BluetoothProfile import android.content.Context import android.content.pm.PackageManager import android.media.AudioManager +import im.vector.app.core.services.WiredHeadsetStateReceiver import im.vector.matrix.android.api.session.call.MxCall -import im.vector.riotx.core.services.WiredHeadsetStateReceiver import timber.log.Timber import java.util.concurrent.Executors diff --git a/vector/src/main/java/im/vector/riotx/features/call/CallControlsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/call/CallControlsBottomSheet.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/call/CallControlsBottomSheet.kt rename to vector/src/main/java/im/vector/app/features/call/CallControlsBottomSheet.kt index cf506a031f..b1a2c65ecf 100644 --- a/vector/src/main/java/im/vector/riotx/features/call/CallControlsBottomSheet.kt +++ b/vector/src/main/java/im/vector/app/features/call/CallControlsBottomSheet.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.call +package im.vector.app.features.call import android.os.Bundle import android.view.View @@ -22,8 +22,8 @@ import androidx.appcompat.app.AlertDialog import androidx.core.content.ContextCompat import androidx.core.view.isVisible import com.airbnb.mvrx.activityViewModel -import im.vector.riotx.R -import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment +import im.vector.app.R +import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment import kotlinx.android.synthetic.main.bottom_sheet_call_controls.* import me.gujun.android.span.span diff --git a/vector/src/main/java/im/vector/riotx/features/call/CallControlsView.kt b/vector/src/main/java/im/vector/app/features/call/CallControlsView.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/call/CallControlsView.kt rename to vector/src/main/java/im/vector/app/features/call/CallControlsView.kt index e3b9f12f67..014b4ee4d9 100644 --- a/vector/src/main/java/im/vector/riotx/features/call/CallControlsView.kt +++ b/vector/src/main/java/im/vector/app/features/call/CallControlsView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.call +package im.vector.app.features.call import android.content.Context import android.util.AttributeSet @@ -26,8 +26,8 @@ import androidx.core.view.isVisible import butterknife.BindView import butterknife.ButterKnife import butterknife.OnClick +import im.vector.app.R import im.vector.matrix.android.api.session.call.CallState -import im.vector.riotx.R import kotlinx.android.synthetic.main.view_call_controls.view.* import org.webrtc.PeerConnection diff --git a/vector/src/main/java/im/vector/riotx/features/call/CameraEventsHandlerAdapter.kt b/vector/src/main/java/im/vector/app/features/call/CameraEventsHandlerAdapter.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/call/CameraEventsHandlerAdapter.kt rename to vector/src/main/java/im/vector/app/features/call/CameraEventsHandlerAdapter.kt index 48f4b9b27b..5307ca6a1d 100644 --- a/vector/src/main/java/im/vector/riotx/features/call/CameraEventsHandlerAdapter.kt +++ b/vector/src/main/java/im/vector/app/features/call/CameraEventsHandlerAdapter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.call +package im.vector.app.features.call import org.webrtc.CameraVideoCapturer import timber.log.Timber diff --git a/vector/src/main/java/im/vector/riotx/features/call/Cameras.kt b/vector/src/main/java/im/vector/app/features/call/Cameras.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/call/Cameras.kt rename to vector/src/main/java/im/vector/app/features/call/Cameras.kt index 07d563ca9c..a778ba4dfe 100644 --- a/vector/src/main/java/im/vector/riotx/features/call/Cameras.kt +++ b/vector/src/main/java/im/vector/app/features/call/Cameras.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.call +package im.vector.app.features.call enum class CameraType { FRONT, diff --git a/vector/src/main/java/im/vector/riotx/features/call/PeerConnectionObserverAdapter.kt b/vector/src/main/java/im/vector/app/features/call/PeerConnectionObserverAdapter.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/call/PeerConnectionObserverAdapter.kt rename to vector/src/main/java/im/vector/app/features/call/PeerConnectionObserverAdapter.kt index ffc90d47fa..32e30c5345 100644 --- a/vector/src/main/java/im/vector/riotx/features/call/PeerConnectionObserverAdapter.kt +++ b/vector/src/main/java/im/vector/app/features/call/PeerConnectionObserverAdapter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.call +package im.vector.app.features.call import org.webrtc.DataChannel import org.webrtc.IceCandidate diff --git a/vector/src/main/java/im/vector/riotx/features/call/SdpObserverAdapter.kt b/vector/src/main/java/im/vector/app/features/call/SdpObserverAdapter.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/call/SdpObserverAdapter.kt rename to vector/src/main/java/im/vector/app/features/call/SdpObserverAdapter.kt index 4c9964a4c4..f6ce430366 100644 --- a/vector/src/main/java/im/vector/riotx/features/call/SdpObserverAdapter.kt +++ b/vector/src/main/java/im/vector/app/features/call/SdpObserverAdapter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.call +package im.vector.app.features.call import org.webrtc.SdpObserver import org.webrtc.SessionDescription diff --git a/vector/src/main/java/im/vector/riotx/features/call/SharedActiveCallViewModel.kt b/vector/src/main/java/im/vector/app/features/call/SharedActiveCallViewModel.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/call/SharedActiveCallViewModel.kt rename to vector/src/main/java/im/vector/app/features/call/SharedActiveCallViewModel.kt index 71f5ad3877..2e43d6ec39 100644 --- a/vector/src/main/java/im/vector/riotx/features/call/SharedActiveCallViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/call/SharedActiveCallViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.call +package im.vector.app.features.call import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel diff --git a/vector/src/main/java/im/vector/riotx/features/call/VectorCallActivity.kt b/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/call/VectorCallActivity.kt rename to vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt index bbfd8b20fc..aa1005e32d 100644 --- a/vector/src/main/java/im/vector/riotx/features/call/VectorCallActivity.kt +++ b/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.call +package im.vector.app.features.call import android.app.KeyguardManager import android.content.Context @@ -37,21 +37,21 @@ import com.airbnb.mvrx.Fail import com.airbnb.mvrx.MvRx import com.airbnb.mvrx.viewModel import com.jakewharton.rxbinding3.view.clicks +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.core.services.CallService +import im.vector.app.core.utils.PERMISSIONS_FOR_AUDIO_IP_CALL +import im.vector.app.core.utils.PERMISSIONS_FOR_VIDEO_IP_CALL +import im.vector.app.core.utils.allGranted +import im.vector.app.core.utils.checkPermissions +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.home.room.detail.RoomDetailActivity +import im.vector.app.features.home.room.detail.RoomDetailArgs import im.vector.matrix.android.api.session.call.CallState import im.vector.matrix.android.api.session.call.EglUtils import im.vector.matrix.android.api.session.call.MxCallDetail import im.vector.matrix.android.api.session.call.TurnServerResponse -import im.vector.riotx.R -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.core.services.CallService -import im.vector.riotx.core.utils.PERMISSIONS_FOR_AUDIO_IP_CALL -import im.vector.riotx.core.utils.PERMISSIONS_FOR_VIDEO_IP_CALL -import im.vector.riotx.core.utils.allGranted -import im.vector.riotx.core.utils.checkPermissions -import im.vector.riotx.features.home.AvatarRenderer -import im.vector.riotx.features.home.room.detail.RoomDetailActivity -import im.vector.riotx.features.home.room.detail.RoomDetailArgs import io.reactivex.android.schedulers.AndroidSchedulers import kotlinx.android.parcel.Parcelize import kotlinx.android.synthetic.main.activity_call.* diff --git a/vector/src/main/java/im/vector/riotx/features/call/VectorCallViewModel.kt b/vector/src/main/java/im/vector/app/features/call/VectorCallViewModel.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/call/VectorCallViewModel.kt rename to vector/src/main/java/im/vector/app/features/call/VectorCallViewModel.kt index 595aa41292..9c565b8260 100644 --- a/vector/src/main/java/im/vector/riotx/features/call/VectorCallViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/call/VectorCallViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.call +package im.vector.app.features.call import com.airbnb.mvrx.Async import com.airbnb.mvrx.Fail @@ -26,6 +26,10 @@ import com.airbnb.mvrx.Uninitialized import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.core.platform.VectorViewModelAction import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.call.CallState @@ -33,10 +37,6 @@ import im.vector.matrix.android.api.session.call.MxCall import im.vector.matrix.android.api.session.call.TurnServerResponse import im.vector.matrix.android.api.util.MatrixItem import im.vector.matrix.android.api.util.toMatrixItem -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorViewEvents -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.core.platform.VectorViewModelAction import org.webrtc.PeerConnection import java.util.Timer import java.util.TimerTask diff --git a/vector/src/main/java/im/vector/riotx/features/call/WebRtcPeerConnectionManager.kt b/vector/src/main/java/im/vector/app/features/call/WebRtcPeerConnectionManager.kt similarity index 99% rename from vector/src/main/java/im/vector/riotx/features/call/WebRtcPeerConnectionManager.kt rename to vector/src/main/java/im/vector/app/features/call/WebRtcPeerConnectionManager.kt index 070375d201..edc74fffc6 100644 --- a/vector/src/main/java/im/vector/riotx/features/call/WebRtcPeerConnectionManager.kt +++ b/vector/src/main/java/im/vector/app/features/call/WebRtcPeerConnectionManager.kt @@ -14,12 +14,16 @@ * limitations under the License. */ -package im.vector.riotx.features.call +package im.vector.app.features.call import android.content.Context import android.hardware.camera2.CameraManager import android.os.Build import androidx.annotation.RequiresApi +import im.vector.app.ActiveSessionDataSource +import im.vector.app.core.services.BluetoothHeadsetReceiver +import im.vector.app.core.services.CallService +import im.vector.app.core.services.WiredHeadsetStateReceiver import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.extensions.tryThis import im.vector.matrix.android.api.session.Session @@ -32,10 +36,6 @@ import im.vector.matrix.android.api.session.room.model.call.CallAnswerContent import im.vector.matrix.android.api.session.room.model.call.CallCandidatesContent import im.vector.matrix.android.api.session.room.model.call.CallHangupContent import im.vector.matrix.android.api.session.room.model.call.CallInviteContent -import im.vector.riotx.ActiveSessionDataSource -import im.vector.riotx.core.services.BluetoothHeadsetReceiver -import im.vector.riotx.core.services.CallService -import im.vector.riotx.core.services.WiredHeadsetStateReceiver import io.reactivex.disposables.Disposable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.ReplaySubject diff --git a/vector/src/main/java/im/vector/riotx/features/call/service/CallHeadsUpActionReceiver.kt b/vector/src/main/java/im/vector/app/features/call/service/CallHeadsUpActionReceiver.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/call/service/CallHeadsUpActionReceiver.kt rename to vector/src/main/java/im/vector/app/features/call/service/CallHeadsUpActionReceiver.kt index 199dcd3b14..179ba288eb 100644 --- a/vector/src/main/java/im/vector/riotx/features/call/service/CallHeadsUpActionReceiver.kt +++ b/vector/src/main/java/im/vector/app/features/call/service/CallHeadsUpActionReceiver.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotx.features.call.service +package im.vector.app.features.call.service import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import im.vector.riotx.core.di.HasVectorInjector -import im.vector.riotx.features.call.WebRtcPeerConnectionManager -import im.vector.riotx.features.notifications.NotificationUtils -import im.vector.riotx.features.settings.VectorLocale.context +import im.vector.app.core.di.HasVectorInjector +import im.vector.app.features.call.WebRtcPeerConnectionManager +import im.vector.app.features.notifications.NotificationUtils +import im.vector.app.features.settings.VectorLocale.context import timber.log.Timber class CallHeadsUpActionReceiver : BroadcastReceiver() { diff --git a/vector/src/main/java/im/vector/riotx/features/call/telecom/CallConnection.kt b/vector/src/main/java/im/vector/app/features/call/telecom/CallConnection.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/call/telecom/CallConnection.kt rename to vector/src/main/java/im/vector/app/features/call/telecom/CallConnection.kt index 6273abddfd..6f69b4b0d0 100644 --- a/vector/src/main/java/im/vector/riotx/features/call/telecom/CallConnection.kt +++ b/vector/src/main/java/im/vector/app/features/call/telecom/CallConnection.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotx.features.call.telecom +package im.vector.app.features.call.telecom import android.content.Context import android.os.Build import android.telecom.Connection import android.telecom.DisconnectCause import androidx.annotation.RequiresApi -import im.vector.riotx.features.call.VectorCallViewModel -import im.vector.riotx.features.call.WebRtcPeerConnectionManager +import im.vector.app.features.call.VectorCallViewModel +import im.vector.app.features.call.WebRtcPeerConnectionManager import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/call/telecom/TelecomUtils.kt b/vector/src/main/java/im/vector/app/features/call/telecom/TelecomUtils.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/call/telecom/TelecomUtils.kt rename to vector/src/main/java/im/vector/app/features/call/telecom/TelecomUtils.kt index 61bb8980bf..5601f769d1 100644 --- a/vector/src/main/java/im/vector/riotx/features/call/telecom/TelecomUtils.kt +++ b/vector/src/main/java/im/vector/app/features/call/telecom/TelecomUtils.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.call.telecom +package im.vector.app.features.call.telecom import android.content.Context import android.telephony.TelephonyManager diff --git a/vector/src/main/java/im/vector/riotx/features/call/telecom/VectorConnectionService.kt b/vector/src/main/java/im/vector/app/features/call/telecom/VectorConnectionService.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/call/telecom/VectorConnectionService.kt rename to vector/src/main/java/im/vector/app/features/call/telecom/VectorConnectionService.kt index 85f215d24c..410a4621e8 100644 --- a/vector/src/main/java/im/vector/riotx/features/call/telecom/VectorConnectionService.kt +++ b/vector/src/main/java/im/vector/app/features/call/telecom/VectorConnectionService.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.call.telecom +package im.vector.app.features.call.telecom import android.content.ComponentName import android.content.Intent @@ -29,7 +29,7 @@ import android.telecom.PhoneAccountHandle import android.telecom.StatusHints import android.telecom.TelecomManager import androidx.annotation.RequiresApi -import im.vector.riotx.core.services.CallService +import im.vector.app.core.services.CallService /** * No active calls in other apps diff --git a/vector/src/main/java/im/vector/riotx/features/command/Command.kt b/vector/src/main/java/im/vector/app/features/command/Command.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/command/Command.kt rename to vector/src/main/java/im/vector/app/features/command/Command.kt index d98ebcfa73..f0758480d9 100644 --- a/vector/src/main/java/im/vector/riotx/features/command/Command.kt +++ b/vector/src/main/java/im/vector/app/features/command/Command.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.command +package im.vector.app.features.command import androidx.annotation.StringRes -import im.vector.riotx.R +import im.vector.app.R /** * Defines the command line operations diff --git a/vector/src/main/java/im/vector/riotx/features/command/CommandParser.kt b/vector/src/main/java/im/vector/app/features/command/CommandParser.kt similarity index 99% rename from vector/src/main/java/im/vector/riotx/features/command/CommandParser.kt rename to vector/src/main/java/im/vector/app/features/command/CommandParser.kt index 2b38a1ac25..9a2c601ec5 100644 --- a/vector/src/main/java/im/vector/riotx/features/command/CommandParser.kt +++ b/vector/src/main/java/im/vector/app/features/command/CommandParser.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotx.features.command +package im.vector.app.features.command +import im.vector.app.core.extensions.isEmail +import im.vector.app.core.extensions.isMsisdn import im.vector.matrix.android.api.MatrixPatterns import im.vector.matrix.android.api.session.identity.ThreePid -import im.vector.riotx.core.extensions.isEmail -import im.vector.riotx.core.extensions.isMsisdn import timber.log.Timber object CommandParser { diff --git a/vector/src/main/java/im/vector/riotx/features/command/ParsedCommand.kt b/vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/command/ParsedCommand.kt rename to vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt index 041da3dcac..e8abd445b7 100644 --- a/vector/src/main/java/im/vector/riotx/features/command/ParsedCommand.kt +++ b/vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.command +package im.vector.app.features.command import im.vector.matrix.android.api.session.identity.ThreePid diff --git a/vector/src/main/java/im/vector/riotx/features/configuration/VectorConfiguration.kt b/vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/configuration/VectorConfiguration.kt rename to vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt index 2ef69890ed..312e0a01ea 100644 --- a/vector/src/main/java/im/vector/riotx/features/configuration/VectorConfiguration.kt +++ b/vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotx.features.configuration +package im.vector.app.features.configuration import android.annotation.SuppressLint import android.content.Context import android.content.res.Configuration import android.os.Build -import im.vector.riotx.features.settings.FontScale -import im.vector.riotx.features.settings.VectorLocale -import im.vector.riotx.features.themes.ThemeUtils +import im.vector.app.features.settings.FontScale +import im.vector.app.features.settings.VectorLocale +import im.vector.app.features.themes.ThemeUtils import timber.log.Timber import java.util.Locale import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/consent/ConsentNotGivenHelper.kt b/vector/src/main/java/im/vector/app/features/consent/ConsentNotGivenHelper.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/consent/ConsentNotGivenHelper.kt rename to vector/src/main/java/im/vector/app/features/consent/ConsentNotGivenHelper.kt index 14abce7bfa..dbcc2c1820 100644 --- a/vector/src/main/java/im/vector/riotx/features/consent/ConsentNotGivenHelper.kt +++ b/vector/src/main/java/im/vector/app/features/consent/ConsentNotGivenHelper.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotx.features.consent +package im.vector.app.features.consent import android.app.Activity import androidx.appcompat.app.AlertDialog -import im.vector.riotx.R -import im.vector.riotx.core.dialogs.DialogLocker -import im.vector.riotx.core.platform.Restorable -import im.vector.riotx.features.webview.VectorWebViewActivity -import im.vector.riotx.features.webview.WebViewMode +import im.vector.app.R +import im.vector.app.core.dialogs.DialogLocker +import im.vector.app.core.platform.Restorable +import im.vector.app.features.webview.VectorWebViewActivity +import im.vector.app.features.webview.WebViewMode class ConsentNotGivenHelper(private val activity: Activity, private val dialogLocker: DialogLocker) : diff --git a/vector/src/main/java/im/vector/riotx/features/contactsbook/ContactDetailItem.kt b/vector/src/main/java/im/vector/app/features/contactsbook/ContactDetailItem.kt similarity index 81% rename from vector/src/main/java/im/vector/riotx/features/contactsbook/ContactDetailItem.kt rename to vector/src/main/java/im/vector/app/features/contactsbook/ContactDetailItem.kt index 8615838571..aba530b2fb 100644 --- a/vector/src/main/java/im/vector/riotx/features/contactsbook/ContactDetailItem.kt +++ b/vector/src/main/java/im/vector/app/features/contactsbook/ContactDetailItem.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotx.features.contactsbook +package im.vector.app.features.contactsbook import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.ClickListener -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel -import im.vector.riotx.core.epoxy.onClick -import im.vector.riotx.core.extensions.setTextOrHide +import im.vector.app.R +import im.vector.app.core.epoxy.ClickListener +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.epoxy.onClick +import im.vector.app.core.extensions.setTextOrHide @EpoxyModelClass(layout = R.layout.item_contact_detail) abstract class ContactDetailItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/contactsbook/ContactItem.kt b/vector/src/main/java/im/vector/app/features/contactsbook/ContactItem.kt similarity index 84% rename from vector/src/main/java/im/vector/riotx/features/contactsbook/ContactItem.kt rename to vector/src/main/java/im/vector/app/features/contactsbook/ContactItem.kt index 9a6bf8f144..fd112f0948 100644 --- a/vector/src/main/java/im/vector/riotx/features/contactsbook/ContactItem.kt +++ b/vector/src/main/java/im/vector/app/features/contactsbook/ContactItem.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotx.features.contactsbook +package im.vector.app.features.contactsbook import android.widget.ImageView import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.core.contacts.MappedContact -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel -import im.vector.riotx.features.home.AvatarRenderer +import im.vector.app.R +import im.vector.app.core.contacts.MappedContact +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.features.home.AvatarRenderer @EpoxyModelClass(layout = R.layout.item_contact_main) abstract class ContactItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookAction.kt b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookAction.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookAction.kt rename to vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookAction.kt index 001630d398..8eb5bc733b 100644 --- a/vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookAction.kt +++ b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookAction.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.contactsbook +package im.vector.app.features.contactsbook -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction sealed class ContactsBookAction : VectorViewModelAction { data class FilterWith(val filter: String) : ContactsBookAction() diff --git a/vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookController.kt b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookController.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookController.kt rename to vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookController.kt index 796ed0d80c..3821133353 100644 --- a/vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookController.kt +++ b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookController.kt @@ -14,22 +14,22 @@ * limitations under the License. */ -package im.vector.riotx.features.contactsbook +package im.vector.app.features.contactsbook import com.airbnb.epoxy.EpoxyController import com.airbnb.mvrx.Fail import com.airbnb.mvrx.Loading import com.airbnb.mvrx.Success import com.airbnb.mvrx.Uninitialized +import im.vector.app.R +import im.vector.app.core.contacts.MappedContact +import im.vector.app.core.epoxy.errorWithRetryItem +import im.vector.app.core.epoxy.loadingItem +import im.vector.app.core.epoxy.noResultItem +import im.vector.app.core.error.ErrorFormatter +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.home.AvatarRenderer import im.vector.matrix.android.api.session.identity.ThreePid -import im.vector.riotx.R -import im.vector.riotx.core.contacts.MappedContact -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 ContactsBookController @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookFragment.kt b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookFragment.kt rename to vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt index 2a2fd9fb5d..5c070d5897 100644 --- a/vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookFragment.kt +++ b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.contactsbook +package im.vector.app.features.contactsbook import android.os.Bundle import android.view.View @@ -23,18 +23,18 @@ import com.airbnb.mvrx.activityViewModel import com.airbnb.mvrx.withState import com.jakewharton.rxbinding3.widget.checkedChanges import com.jakewharton.rxbinding3.widget.textChanges +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.extensions.hideKeyboard +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.features.userdirectory.PendingInvitee +import im.vector.app.features.userdirectory.UserDirectoryAction +import im.vector.app.features.userdirectory.UserDirectorySharedAction +import im.vector.app.features.userdirectory.UserDirectorySharedActionViewModel +import im.vector.app.features.userdirectory.UserDirectoryViewModel import im.vector.matrix.android.api.session.identity.ThreePid import im.vector.matrix.android.api.session.user.model.User -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.extensions.hideKeyboard -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.features.userdirectory.PendingInvitee -import im.vector.riotx.features.userdirectory.UserDirectoryAction -import im.vector.riotx.features.userdirectory.UserDirectorySharedAction -import im.vector.riotx.features.userdirectory.UserDirectorySharedActionViewModel -import im.vector.riotx.features.userdirectory.UserDirectoryViewModel import kotlinx.android.synthetic.main.fragment_contacts_book.* import java.util.concurrent.TimeUnit import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookViewModel.kt b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookViewModel.kt rename to vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt index 3eb6b165b8..cff5859c0c 100644 --- a/vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.contactsbook +package im.vector.app.features.contactsbook import androidx.fragment.app.FragmentActivity import androidx.lifecycle.viewModelScope @@ -26,17 +26,17 @@ import com.airbnb.mvrx.Success import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.core.contacts.ContactsDataSource +import im.vector.app.core.contacts.MappedContact +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.EmptyViewEvents +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.features.createdirect.CreateDirectRoomActivity +import im.vector.app.features.invite.InviteUsersToRoomActivity import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.identity.FoundThreePid import im.vector.matrix.android.api.session.identity.ThreePid -import im.vector.riotx.core.contacts.ContactsDataSource -import im.vector.riotx.core.contacts.MappedContact -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.EmptyViewEvents -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.features.createdirect.CreateDirectRoomActivity -import im.vector.riotx.features.invite.InviteUsersToRoomActivity import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import timber.log.Timber diff --git a/vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookViewState.kt b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewState.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookViewState.kt rename to vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewState.kt index 8f59403d6a..3e4f4ddcb6 100644 --- a/vector/src/main/java/im/vector/riotx/features/contactsbook/ContactsBookViewState.kt +++ b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewState.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotx.features.contactsbook +package im.vector.app.features.contactsbook import com.airbnb.mvrx.Async import com.airbnb.mvrx.Loading import com.airbnb.mvrx.MvRxState -import im.vector.riotx.core.contacts.MappedContact +import im.vector.app.core.contacts.MappedContact data class ContactsBookViewState( // All the contacts on the phone diff --git a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomAction.kt b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomAction.kt similarity index 82% rename from vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomAction.kt rename to vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomAction.kt index fad36cc281..f6fc3fed5b 100644 --- a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomAction.kt +++ b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomAction.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.createdirect +package im.vector.app.features.createdirect -import im.vector.riotx.core.platform.VectorViewModelAction -import im.vector.riotx.features.userdirectory.PendingInvitee +import im.vector.app.core.platform.VectorViewModelAction +import im.vector.app.features.userdirectory.PendingInvitee sealed class CreateDirectRoomAction : VectorViewModelAction { data class CreateRoomAndInviteSelectedUsers(val invitees: Set) : CreateDirectRoomAction() diff --git a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomActivity.kt b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt similarity index 82% rename from vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomActivity.kt rename to vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt index 72244d1c94..aa262bd4b8 100644 --- a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomActivity.kt +++ b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt @@ -16,7 +16,7 @@ * */ -package im.vector.riotx.features.createdirect +package im.vector.app.features.createdirect import android.content.Context import android.content.Intent @@ -28,28 +28,28 @@ import com.airbnb.mvrx.Fail import com.airbnb.mvrx.Loading import com.airbnb.mvrx.Success import com.airbnb.mvrx.viewModel +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.error.ErrorFormatter +import im.vector.app.core.extensions.addFragment +import im.vector.app.core.extensions.addFragmentToBackstack +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.SimpleFragmentActivity +import im.vector.app.core.platform.WaitingViewData +import im.vector.app.core.utils.PERMISSIONS_FOR_MEMBERS_SEARCH +import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_READ_CONTACTS +import im.vector.app.core.utils.allGranted +import im.vector.app.core.utils.checkPermissions +import im.vector.app.features.contactsbook.ContactsBookFragment +import im.vector.app.features.contactsbook.ContactsBookViewModel +import im.vector.app.features.userdirectory.KnownUsersFragment +import im.vector.app.features.userdirectory.KnownUsersFragmentArgs +import im.vector.app.features.userdirectory.UserDirectoryFragment +import im.vector.app.features.userdirectory.UserDirectorySharedAction +import im.vector.app.features.userdirectory.UserDirectorySharedActionViewModel +import im.vector.app.features.userdirectory.UserDirectoryViewModel import im.vector.matrix.android.api.failure.Failure import im.vector.matrix.android.api.session.room.failure.CreateRoomFailure -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.addFragment -import im.vector.riotx.core.extensions.addFragmentToBackstack -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.SimpleFragmentActivity -import im.vector.riotx.core.platform.WaitingViewData -import im.vector.riotx.core.utils.PERMISSIONS_FOR_MEMBERS_SEARCH -import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_READ_CONTACTS -import im.vector.riotx.core.utils.allGranted -import im.vector.riotx.core.utils.checkPermissions -import im.vector.riotx.features.contactsbook.ContactsBookFragment -import im.vector.riotx.features.contactsbook.ContactsBookViewModel -import im.vector.riotx.features.userdirectory.KnownUsersFragment -import im.vector.riotx.features.userdirectory.KnownUsersFragmentArgs -import im.vector.riotx.features.userdirectory.UserDirectoryFragment -import im.vector.riotx.features.userdirectory.UserDirectorySharedAction -import im.vector.riotx.features.userdirectory.UserDirectorySharedActionViewModel -import im.vector.riotx.features.userdirectory.UserDirectoryViewModel import kotlinx.android.synthetic.main.activity.* import java.net.HttpURLConnection import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewEvents.kt b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewEvents.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewEvents.kt rename to vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewEvents.kt index 5ea344115a..0c9804e9a4 100644 --- a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewEvents.kt @@ -14,8 +14,8 @@ * limitations under the License. */ -package im.vector.riotx.features.createdirect +package im.vector.app.features.createdirect -import im.vector.riotx.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewEvents sealed class CreateDirectRoomViewEvents : VectorViewEvents diff --git a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewModel.kt rename to vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt index b72a7db001..ea41eb5b45 100644 --- a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt @@ -14,19 +14,19 @@ * limitations under the License. */ -package im.vector.riotx.features.createdirect +package im.vector.app.features.createdirect import com.airbnb.mvrx.ActivityViewModelContext import com.airbnb.mvrx.MvRxViewModelFactory import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.features.userdirectory.PendingInvitee import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams import im.vector.matrix.rx.rx -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.features.userdirectory.PendingInvitee class CreateDirectRoomViewModel @AssistedInject constructor(@Assisted initialState: CreateDirectRoomViewState, diff --git a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewState.kt b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewState.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewState.kt rename to vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewState.kt index 8bb8c3ce58..953d415140 100644 --- a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewState.kt +++ b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.createdirect +package im.vector.app.features.createdirect import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysExporter.kt b/vector/src/main/java/im/vector/app/features/crypto/keys/KeysExporter.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysExporter.kt rename to vector/src/main/java/im/vector/app/features/crypto/keys/KeysExporter.kt index 2467334f69..cbcc13931d 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysExporter.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/keys/KeysExporter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.keys +package im.vector.app.features.crypto.keys import android.content.Context import android.net.Uri diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysImporter.kt b/vector/src/main/java/im/vector/app/features/crypto/keys/KeysImporter.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysImporter.kt rename to vector/src/main/java/im/vector/app/features/crypto/keys/KeysImporter.kt index 5f550c032a..6617e3eff2 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keys/KeysImporter.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/keys/KeysImporter.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.keys +package im.vector.app.features.crypto.keys import android.content.Context import android.net.Uri +import im.vector.app.core.intent.getMimeTypeFromUri +import im.vector.app.core.resources.openResource 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.matrix.android.internal.extensions.foldToCallback import im.vector.matrix.android.internal.util.awaitCallback -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/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt index 2b4e372166..406fdb8798 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.crypto.keysbackup.restore +package im.vector.app.features.crypto.keysbackup.restore import android.app.Activity import android.content.Context import android.content.Intent import androidx.appcompat.app.AlertDialog import androidx.lifecycle.Observer +import im.vector.app.R +import im.vector.app.core.extensions.addFragmentToBackstack +import im.vector.app.core.extensions.observeEvent +import im.vector.app.core.extensions.replaceFragment +import im.vector.app.core.platform.SimpleFragmentActivity +import im.vector.app.core.ui.views.KeysBackupBanner +import im.vector.app.features.crypto.quads.SharedSecureStorageActivity import im.vector.matrix.android.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME -import im.vector.riotx.R -import im.vector.riotx.core.extensions.addFragmentToBackstack -import im.vector.riotx.core.extensions.observeEvent -import im.vector.riotx.core.extensions.replaceFragment -import im.vector.riotx.core.platform.SimpleFragmentActivity -import im.vector.riotx.core.ui.views.KeysBackupBanner -import im.vector.riotx.features.crypto.quads.SharedSecureStorageActivity class KeysBackupRestoreActivity : SimpleFragmentActivity() { diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt index 9a6e65a885..cc10256fc4 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.crypto.keysbackup.restore +package im.vector.app.features.crypto.keysbackup.restore import android.app.Activity import android.content.Intent @@ -26,9 +26,9 @@ import butterknife.BindView import butterknife.OnClick import butterknife.OnTextChanged import com.google.android.material.textfield.TextInputLayout -import im.vector.riotx.R -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.utils.startImportTextFromFileIntent +import im.vector.app.R +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.utils.startImportTextFromFileIntent import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt index 2faff3d112..ddbe86305c 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyViewModel.kt @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.crypto.keysbackup.restore +package im.vector.app.features.crypto.keysbackup.restore import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import im.vector.riotx.R -import im.vector.riotx.core.platform.WaitingViewData -import im.vector.riotx.core.resources.StringProvider +import im.vector.app.R +import im.vector.app.core.platform.WaitingViewData +import im.vector.app.core.resources.StringProvider import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt index b302b57433..7941d95add 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.crypto.keysbackup.restore +package im.vector.app.features.crypto.keysbackup.restore import android.os.Bundle import android.text.Editable @@ -30,9 +30,9 @@ import butterknife.BindView import butterknife.OnClick import butterknife.OnTextChanged import com.google.android.material.textfield.TextInputLayout -import im.vector.riotx.R -import im.vector.riotx.core.extensions.showPassword -import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.app.R +import im.vector.app.core.extensions.showPassword +import im.vector.app.core.platform.VectorBaseFragment import javax.inject.Inject class KeysBackupRestoreFromPassphraseFragment @Inject constructor() : VectorBaseFragment() { diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt index 9c9c12b824..d45a961dd7 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.crypto.keysbackup.restore +package im.vector.app.features.crypto.keysbackup.restore import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import im.vector.riotx.R -import im.vector.riotx.core.resources.StringProvider +import im.vector.app.R +import im.vector.app.core.resources.StringProvider import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt index 24aa37b95c..3f714c331b 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt @@ -13,12 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.crypto.keysbackup.restore +package im.vector.app.features.crypto.keysbackup.restore import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope +import im.vector.app.R +import im.vector.app.core.platform.WaitingViewData +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.utils.LiveEvent import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.listeners.StepProgressListener import im.vector.matrix.android.api.session.Session @@ -30,10 +34,6 @@ import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersio import im.vector.matrix.android.internal.crypto.keysbackup.util.computeRecoveryKey import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult import im.vector.matrix.android.internal.util.awaitCallback -import im.vector.riotx.R -import im.vector.riotx.core.platform.WaitingViewData -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.core.utils.LiveEvent import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import timber.log.Timber diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt index def8e4bf65..fa571b86c1 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.crypto.keysbackup.restore +package im.vector.app.features.crypto.keysbackup.restore import android.os.Bundle import android.widget.TextView import androidx.core.view.isVisible import butterknife.BindView import butterknife.OnClick -import im.vector.riotx.R -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.utils.LiveEvent +import im.vector.app.R +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.utils.LiveEvent import javax.inject.Inject class KeysBackupRestoreSuccessFragment @Inject constructor() : VectorBaseFragment() { diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeyBackupSettingsAction.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeyBackupSettingsAction.kt similarity index 87% rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeyBackupSettingsAction.kt rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeyBackupSettingsAction.kt index 723be80dfd..776c7bb521 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeyBackupSettingsAction.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeyBackupSettingsAction.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.keysbackup.settings +package im.vector.app.features.crypto.keysbackup.settings -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction sealed class KeyBackupSettingsAction : VectorViewModelAction { object Init : KeyBackupSettingsAction() diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt index 98e954c5b5..c4a4e06fcf 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupManageActivity.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.crypto.keysbackup.settings +package im.vector.app.features.crypto.keysbackup.settings import android.content.Context import android.content.Intent @@ -21,11 +21,11 @@ import androidx.appcompat.app.AlertDialog import com.airbnb.mvrx.Fail import com.airbnb.mvrx.Loading import com.airbnb.mvrx.viewModel -import im.vector.riotx.R -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.extensions.replaceFragment -import im.vector.riotx.core.platform.SimpleFragmentActivity -import im.vector.riotx.core.platform.WaitingViewData +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.extensions.replaceFragment +import im.vector.app.core.platform.SimpleFragmentActivity +import im.vector.app.core.platform.WaitingViewData import javax.inject.Inject class KeysBackupManageActivity : SimpleFragmentActivity() { diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt similarity index 87% rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt index ca509a11f2..0489f18abe 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingFooterItem.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.keysbackup.settings +package im.vector.app.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.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.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.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/riotx/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt index 4800701ede..4f35b40ec0 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingViewState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.keysbackup.settings +package im.vector.app.features.crypto.keysbackup.settings import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt index f0997de372..36ee4d954f 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsFragment.kt @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.crypto.keysbackup.settings +package im.vector.app.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.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -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 im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.features.crypto.keysbackup.restore.KeysBackupRestoreActivity +import im.vector.app.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/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt index 20046fa115..f46b7b4cfe 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsRecyclerViewController.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.crypto.keysbackup.settings +package im.vector.app.features.crypto.keysbackup.settings import android.view.View import com.airbnb.epoxy.TypedEpoxyController @@ -22,16 +22,16 @@ import com.airbnb.mvrx.Fail import com.airbnb.mvrx.Loading import com.airbnb.mvrx.Success import com.airbnb.mvrx.Uninitialized +import im.vector.app.R +import im.vector.app.core.epoxy.errorWithRetryItem +import im.vector.app.core.epoxy.loadingItem +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.ui.list.GenericItem +import im.vector.app.core.ui.list.genericItem +import im.vector.app.features.settings.VectorPreferences 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.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 im.vector.riotx.features.settings.VectorPreferences import java.util.UUID import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt index d2e977c209..54689aec8b 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/settings/KeysBackupSettingsViewModel.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.crypto.keysbackup.settings +package im.vector.app.features.crypto.keysbackup.settings import com.airbnb.mvrx.ActivityViewModelContext import com.airbnb.mvrx.Fail @@ -24,6 +24,8 @@ import com.airbnb.mvrx.Uninitialized import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.core.platform.EmptyViewEvents +import im.vector.app.core.platform.VectorViewModel import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.NoOpMatrixCallback import im.vector.matrix.android.api.session.Session @@ -31,8 +33,6 @@ 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.riotx.core.platform.EmptyViewEvents -import im.vector.riotx.core.platform.VectorViewModel class KeysBackupSettingsViewModel @AssistedInject constructor(@Assisted initialState: KeysBackupSettingViewState, session: Session diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt index f42fee0030..afa112859b 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.crypto.keysbackup.setup +package im.vector.app.features.crypto.keysbackup.setup import android.app.Activity import android.content.Context @@ -22,15 +22,15 @@ import androidx.appcompat.app.AlertDialog import androidx.core.view.isVisible import androidx.fragment.app.FragmentManager import androidx.lifecycle.Observer +import im.vector.app.R +import im.vector.app.core.dialogs.ExportKeysDialog +import im.vector.app.core.extensions.observeEvent +import im.vector.app.core.extensions.queryExportKeys +import im.vector.app.core.extensions.replaceFragment +import im.vector.app.core.platform.SimpleFragmentActivity +import im.vector.app.core.utils.toast +import im.vector.app.features.crypto.keys.KeysExporter import im.vector.matrix.android.api.MatrixCallback -import im.vector.riotx.R -import im.vector.riotx.core.dialogs.ExportKeysDialog -import im.vector.riotx.core.extensions.observeEvent -import im.vector.riotx.core.extensions.queryExportKeys -import im.vector.riotx.core.extensions.replaceFragment -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/riotx/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt index 6381786e57..efb3e557ea 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupSharedViewModel.kt @@ -14,12 +14,15 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.keysbackup.setup +package im.vector.app.features.crypto.keysbackup.setup import android.content.Context import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import com.nulabinc.zxcvbn.Strength +import im.vector.app.R +import im.vector.app.core.platform.WaitingViewData +import im.vector.app.core.utils.LiveEvent import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.listeners.ProgressListener import im.vector.matrix.android.api.session.Session @@ -27,9 +30,6 @@ 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.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/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt index a9bfbd83b0..0a82edd150 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.keysbackup.setup +package im.vector.app.features.crypto.keysbackup.setup import android.os.Bundle import android.view.View @@ -23,9 +23,9 @@ import android.widget.TextView import androidx.lifecycle.Observer import butterknife.BindView import butterknife.OnClick -import im.vector.riotx.R -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.utils.LiveEvent +import im.vector.app.R +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.utils.LiveEvent import javax.inject.Inject class KeysBackupSetupStep1Fragment @Inject constructor() : VectorBaseFragment() { diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt index 95fe9b0ffa..0520098866 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.crypto.keysbackup.setup +package im.vector.app.features.crypto.keysbackup.setup import android.os.Bundle import android.view.ViewGroup @@ -28,11 +28,11 @@ import butterknife.OnClick import butterknife.OnTextChanged import com.google.android.material.textfield.TextInputLayout import com.nulabinc.zxcvbn.Zxcvbn -import im.vector.riotx.R -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 +import im.vector.app.R +import im.vector.app.core.extensions.showPassword +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.ui.views.PasswordStrengthBar +import im.vector.app.features.settings.VectorLocale import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt rename to vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt index 28711115c3..41b7cbddfe 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.crypto.keysbackup.setup +package im.vector.app.features.crypto.keysbackup.setup import android.app.Activity import android.content.Intent @@ -30,12 +30,12 @@ import arrow.core.Try import butterknife.BindView import butterknife.OnClick import com.google.android.material.bottomsheet.BottomSheetDialog -import im.vector.riotx.R -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.utils.LiveEvent -import im.vector.riotx.core.utils.copyToClipboard -import im.vector.riotx.core.utils.selectTxtFileToWrite -import im.vector.riotx.core.utils.startSharePlainTextIntent +import im.vector.app.R +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.utils.LiveEvent +import im.vector.app.core.utils.copyToClipboard +import im.vector.app.core.utils.selectTxtFileToWrite +import im.vector.app.core.utils.startSharePlainTextIntent import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/keysrequest/KeyRequestHandler.kt b/vector/src/main/java/im/vector/app/features/crypto/keysrequest/KeyRequestHandler.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/crypto/keysrequest/KeyRequestHandler.kt rename to vector/src/main/java/im/vector/app/features/crypto/keysrequest/KeyRequestHandler.kt index 0159dc7c3a..8374b61076 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/keysrequest/KeyRequestHandler.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/keysrequest/KeyRequestHandler.kt @@ -17,9 +17,12 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.keysrequest +package im.vector.app.features.crypto.keysrequest import android.content.Context +import im.vector.app.R +import im.vector.app.features.popup.DefaultVectorAlert +import im.vector.app.features.popup.PopupAlertManager import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.crypto.keyshare.GossipingRequestListener @@ -34,9 +37,6 @@ import im.vector.matrix.android.internal.crypto.crosssigning.DeviceTrustLevel import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo -import im.vector.riotx.R -import im.vector.riotx.features.popup.DefaultVectorAlert -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/riotx/features/crypto/quads/SharedSecureStorageAction.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageAction.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageAction.kt rename to vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageAction.kt index 876c758864..b47b7dc3a9 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageAction.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageAction.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.quads +package im.vector.app.features.crypto.quads -import im.vector.riotx.core.platform.VectorViewEvents -import im.vector.riotx.core.platform.VectorViewModelAction -import im.vector.riotx.core.platform.WaitingViewData +import im.vector.app.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewModelAction +import im.vector.app.core.platform.WaitingViewData sealed class SharedSecureStorageAction : VectorViewModelAction { diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageActivity.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageActivity.kt rename to vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt index 27ab860994..bca7a63470 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageActivity.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.quads +package im.vector.app.features.crypto.quads import android.app.Activity import android.content.Context @@ -26,11 +26,11 @@ import androidx.appcompat.app.AlertDialog import androidx.fragment.app.Fragment import com.airbnb.mvrx.MvRx import com.airbnb.mvrx.viewModel -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.commitTransaction -import im.vector.riotx.core.platform.SimpleFragmentActivity +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.error.ErrorFormatter +import im.vector.app.core.extensions.commitTransaction +import im.vector.app.core.platform.SimpleFragmentActivity import kotlinx.android.parcel.Parcelize import kotlinx.android.synthetic.main.activity.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageViewModel.kt rename to vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt index 9f1dfe1869..0d3166fff8 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.quads +package im.vector.app.features.crypto.quads import androidx.lifecycle.viewModelScope import com.airbnb.mvrx.Async @@ -28,6 +28,11 @@ import com.airbnb.mvrx.Uninitialized import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.R +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.core.platform.WaitingViewData +import im.vector.app.core.resources.StringProvider import im.vector.matrix.android.api.listeners.ProgressListener import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.securestorage.IntegrityResult @@ -35,11 +40,6 @@ import im.vector.matrix.android.api.session.securestorage.KeyInfoResult import im.vector.matrix.android.api.session.securestorage.RawBytesKeySpec import im.vector.matrix.android.internal.crypto.crosssigning.toBase64NoPadding import im.vector.matrix.android.internal.util.awaitCallback -import im.vector.riotx.R -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.core.platform.WaitingViewData -import im.vector.riotx.core.resources.StringProvider import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStorageKeyFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageKeyFragment.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStorageKeyFragment.kt rename to vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageKeyFragment.kt index 054c7a354a..818a0e62bc 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStorageKeyFragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageKeyFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.quads +package im.vector.app.features.crypto.quads import android.app.Activity import android.content.Intent @@ -24,10 +24,10 @@ import android.view.inputmethod.EditorInfo import com.airbnb.mvrx.activityViewModel import com.jakewharton.rxbinding3.widget.editorActionEvents import com.jakewharton.rxbinding3.widget.textChanges +import im.vector.app.R +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.utils.startImportTextFromFileIntent import im.vector.matrix.android.api.extensions.tryThis -import im.vector.riotx.R -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.utils.startImportTextFromFileIntent import io.reactivex.android.schedulers.AndroidSchedulers import kotlinx.android.synthetic.main.fragment_ssss_access_from_key.* import java.util.concurrent.TimeUnit diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt rename to vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt index c14b452a60..09e67948d0 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.quads +package im.vector.app.features.crypto.quads import android.os.Bundle import android.view.View @@ -24,11 +24,11 @@ import com.airbnb.mvrx.activityViewModel import com.airbnb.mvrx.withState import com.jakewharton.rxbinding3.widget.editorActionEvents import com.jakewharton.rxbinding3.widget.textChanges -import im.vector.riotx.R -import im.vector.riotx.core.extensions.showPassword -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.utils.colorizeMatchingText +import im.vector.app.R +import im.vector.app.core.extensions.showPassword +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.utils.colorizeMatchingText import io.reactivex.android.schedulers.AndroidSchedulers import kotlinx.android.synthetic.main.fragment_ssss_access_from_passphrase.* import java.util.concurrent.TimeUnit diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BackupToQuadSMigrationTask.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BackupToQuadSMigrationTask.kt rename to vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt index 02bdab6990..c31923eb79 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BackupToQuadSMigrationTask.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BackupToQuadSMigrationTask.kt @@ -14,8 +14,12 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.recover +package im.vector.app.features.crypto.recover +import im.vector.app.R +import im.vector.app.core.platform.ViewModelTask +import im.vector.app.core.platform.WaitingViewData +import im.vector.app.core.resources.StringProvider import im.vector.matrix.android.api.NoOpMatrixCallback import im.vector.matrix.android.api.listeners.ProgressListener import im.vector.matrix.android.api.session.Session @@ -29,10 +33,6 @@ import im.vector.matrix.android.internal.crypto.keysbackup.deriveKey import im.vector.matrix.android.internal.crypto.keysbackup.util.computeRecoveryKey import im.vector.matrix.android.internal.crypto.keysbackup.util.extractCurveKeyFromRecoveryKey import im.vector.matrix.android.internal.util.awaitCallback -import im.vector.riotx.R -import im.vector.riotx.core.platform.ViewModelTask -import im.vector.riotx.core.platform.WaitingViewData -import im.vector.riotx.core.resources.StringProvider import timber.log.Timber import java.util.UUID import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapAccountPasswordFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapAccountPasswordFragment.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapAccountPasswordFragment.kt rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapAccountPasswordFragment.kt index dca8cd4227..744a2de761 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapAccountPasswordFragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapAccountPasswordFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.recover +package im.vector.app.features.crypto.recover import android.os.Bundle import android.view.View @@ -24,12 +24,12 @@ import com.airbnb.mvrx.parentFragmentViewModel import com.airbnb.mvrx.withState import com.jakewharton.rxbinding3.widget.editorActionEvents import com.jakewharton.rxbinding3.widget.textChanges -import im.vector.riotx.R -import im.vector.riotx.core.extensions.hideKeyboard -import im.vector.riotx.core.extensions.showPassword -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.utils.colorizeMatchingText +import im.vector.app.R +import im.vector.app.core.extensions.hideKeyboard +import im.vector.app.core.extensions.showPassword +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.utils.colorizeMatchingText import io.reactivex.android.schedulers.AndroidSchedulers import kotlinx.android.synthetic.main.fragment_bootstrap_enter_account_password.* import kotlinx.android.synthetic.main.fragment_bootstrap_enter_passphrase.bootstrapDescriptionText diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapActions.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapActions.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapActions.kt rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapActions.kt index ae8dbdc9f4..0785290d2a 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapActions.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapActions.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.recover +package im.vector.app.features.crypto.recover -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction import java.io.OutputStream sealed class BootstrapActions : VectorViewModelAction { diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapBottomSheet.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapBottomSheet.kt rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt index 945a8c2866..1b9beabe9c 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapBottomSheet.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.recover +package im.vector.app.features.crypto.recover import android.app.Dialog import android.os.Bundle @@ -31,11 +31,11 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.extensions.commitTransaction -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.extensions.commitTransaction +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment import kotlinx.android.parcel.Parcelize import kotlinx.android.synthetic.main.bottom_sheet_bootstrap.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapConclusionFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConclusionFragment.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapConclusionFragment.kt rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConclusionFragment.kt index fd7ba2dbb7..a50d9e6dff 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapConclusionFragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConclusionFragment.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.recover +package im.vector.app.features.crypto.recover import android.os.Bundle import android.view.View import androidx.core.text.toSpannable import com.airbnb.mvrx.parentFragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.utils.colorizeMatchingText +import im.vector.app.R +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.utils.colorizeMatchingText import kotlinx.android.synthetic.main.fragment_bootstrap_conclusion.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt index bed3b96a5d..46e9315477 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapConfirmPassphraseFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.recover +package im.vector.app.features.crypto.recover import android.os.Bundle import android.view.View @@ -24,10 +24,10 @@ import com.airbnb.mvrx.parentFragmentViewModel import com.airbnb.mvrx.withState import com.jakewharton.rxbinding3.widget.editorActionEvents import com.jakewharton.rxbinding3.widget.textChanges -import im.vector.riotx.R -import im.vector.riotx.core.extensions.hideKeyboard -import im.vector.riotx.core.extensions.showPassword -import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.app.R +import im.vector.app.core.extensions.hideKeyboard +import im.vector.app.core.extensions.showPassword +import im.vector.app.core.platform.VectorBaseFragment import io.reactivex.android.schedulers.AndroidSchedulers import kotlinx.android.synthetic.main.fragment_bootstrap_enter_passphrase.* import java.util.concurrent.TimeUnit diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapCrossSigningTask.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapCrossSigningTask.kt rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt index 8781cbe570..6a5aef283c 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapCrossSigningTask.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt @@ -14,8 +14,12 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.recover +package im.vector.app.features.crypto.recover +import im.vector.app.R +import im.vector.app.core.platform.ViewModelTask +import im.vector.app.core.platform.WaitingViewData +import im.vector.app.core.resources.StringProvider import im.vector.matrix.android.api.auth.data.LoginFlowTypes import im.vector.matrix.android.api.failure.Failure import im.vector.matrix.android.api.failure.MatrixError @@ -36,12 +40,7 @@ import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersio import im.vector.matrix.android.internal.crypto.keysbackup.util.extractCurveKeyFromRecoveryKey import im.vector.matrix.android.internal.crypto.model.rest.UserPasswordAuth import im.vector.matrix.android.internal.util.awaitCallback -import im.vector.riotx.R -import im.vector.riotx.core.platform.ViewModelTask -import im.vector.riotx.core.platform.WaitingViewData -import im.vector.riotx.core.resources.StringProvider import timber.log.Timber -import java.lang.IllegalArgumentException import java.util.UUID import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapEnterPassphraseFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapEnterPassphraseFragment.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapEnterPassphraseFragment.kt rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapEnterPassphraseFragment.kt index b7bd38a5eb..53c3ee4356 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapEnterPassphraseFragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapEnterPassphraseFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.recover +package im.vector.app.features.crypto.recover import android.os.Bundle import android.view.View @@ -23,10 +23,10 @@ import com.airbnb.mvrx.parentFragmentViewModel import com.airbnb.mvrx.withState import com.jakewharton.rxbinding3.widget.editorActionEvents import com.jakewharton.rxbinding3.widget.textChanges -import im.vector.riotx.R -import im.vector.riotx.core.extensions.showPassword -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.features.settings.VectorLocale +import im.vector.app.R +import im.vector.app.core.extensions.showPassword +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.features.settings.VectorLocale import io.reactivex.android.schedulers.AndroidSchedulers import kotlinx.android.synthetic.main.fragment_bootstrap_enter_passphrase.* import java.util.concurrent.TimeUnit diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapMigrateBackupFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapMigrateBackupFragment.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapMigrateBackupFragment.kt rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapMigrateBackupFragment.kt index 053ffee1f4..9906c4f08e 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapMigrateBackupFragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapMigrateBackupFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.recover +package im.vector.app.features.crypto.recover import android.app.Activity import android.content.Intent @@ -30,15 +30,15 @@ import com.airbnb.mvrx.parentFragmentViewModel import com.airbnb.mvrx.withState import com.jakewharton.rxbinding3.widget.editorActionEvents import com.jakewharton.rxbinding3.widget.textChanges +import im.vector.app.R +import im.vector.app.core.extensions.hideKeyboard +import im.vector.app.core.extensions.showPassword +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.utils.colorizeMatchingText +import im.vector.app.core.utils.startImportTextFromFileIntent import im.vector.matrix.android.api.extensions.tryThis import im.vector.matrix.android.internal.crypto.keysbackup.util.isValidRecoveryKey -import im.vector.riotx.R -import im.vector.riotx.core.extensions.hideKeyboard -import im.vector.riotx.core.extensions.showPassword -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.utils.colorizeMatchingText -import im.vector.riotx.core.utils.startImportTextFromFileIntent import io.reactivex.android.schedulers.AndroidSchedulers import kotlinx.android.synthetic.main.fragment_bootstrap_enter_passphrase.bootstrapDescriptionText import kotlinx.android.synthetic.main.fragment_bootstrap_migrate_backup.* diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt index 1808c99629..750dadbc9f 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.recover +package im.vector.app.features.crypto.recover import android.app.Activity.RESULT_OK import android.content.ActivityNotFoundException @@ -24,11 +24,11 @@ import android.view.View import androidx.core.view.isVisible import com.airbnb.mvrx.parentFragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.utils.startSharePlainTextIntent -import im.vector.riotx.core.utils.toast +import im.vector.app.R +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.utils.startSharePlainTextIntent +import im.vector.app.core.utils.toast import kotlinx.android.synthetic.main.fragment_bootstrap_save_key.* import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt index ea558145c0..ed68e3daac 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSetupRecoveryKeyFragment.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.recover +package im.vector.app.features.crypto.recover import android.os.Bundle import android.view.View import androidx.core.view.isVisible import com.airbnb.mvrx.parentFragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.app.R +import im.vector.app.core.platform.VectorBaseFragment import kotlinx.android.synthetic.main.fragment_bootstrap_setup_recovery.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapSharedViewModel.kt rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt index 8b247bd975..a30d4df447 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapSharedViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.recover +package im.vector.app.features.crypto.recover import androidx.lifecycle.viewModelScope import com.airbnb.mvrx.Fail @@ -27,6 +27,13 @@ import com.airbnb.mvrx.ViewModelContext import com.nulabinc.zxcvbn.Zxcvbn import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.R +import im.vector.app.core.error.ErrorFormatter +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.core.platform.WaitingViewData +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.login.ReAuthHelper import im.vector.matrix.android.api.failure.Failure import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.securestorage.RawBytesKeySpec @@ -34,13 +41,6 @@ import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersio import im.vector.matrix.android.internal.crypto.keysbackup.util.extractCurveKeyFromRecoveryKey import im.vector.matrix.android.internal.crypto.model.rest.UserPasswordAuth import im.vector.matrix.android.internal.util.awaitCallback -import im.vector.riotx.R -import im.vector.riotx.core.error.ErrorFormatter -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.core.platform.WaitingViewData -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.login.ReAuthHelper import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import java.io.OutputStream diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapStep.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapStep.kt similarity index 99% rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapStep.kt rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapStep.kt index 71b00016ab..222a5d78c6 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapStep.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapStep.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.recover +package im.vector.app.features.crypto.recover /** * TODO The schema is not up to date diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapViewEvents.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewEvents.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapViewEvents.kt rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewEvents.kt index 679eabd561..58bc64a9ad 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewEvents.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.recover +package im.vector.app.features.crypto.recover -import im.vector.riotx.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewEvents sealed class BootstrapViewEvents : VectorViewEvents { object Dismiss : BootstrapViewEvents() diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapViewState.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewState.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapViewState.kt rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewState.kt index 4aa18eb7e7..14f9a8360c 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapViewState.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewState.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.recover +package im.vector.app.features.crypto.recover import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState import com.airbnb.mvrx.Uninitialized import com.nulabinc.zxcvbn.Strength +import im.vector.app.core.platform.WaitingViewData import im.vector.matrix.android.api.session.securestorage.SsssKeyCreationInfo -import im.vector.riotx.core.platform.WaitingViewData data class BootstrapViewState( val step: BootstrapStep = BootstrapStep.CheckingMigration, diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapWaitingFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapWaitingFragment.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapWaitingFragment.kt rename to vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapWaitingFragment.kt index 1c6c9e6d9b..0004420494 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapWaitingFragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapWaitingFragment.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.recover +package im.vector.app.features.crypto.recover import androidx.core.view.isVisible import com.airbnb.mvrx.parentFragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.app.R +import im.vector.app.core.platform.VectorBaseFragment import kotlinx.android.synthetic.main.fragment_bootstrap_waiting.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/KeepItSafeDialog.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/KeepItSafeDialog.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/KeepItSafeDialog.kt rename to vector/src/main/java/im/vector/app/features/crypto/recover/KeepItSafeDialog.kt index c8348ea7e9..31fb9d01e3 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/KeepItSafeDialog.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/recover/KeepItSafeDialog.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.recover +package im.vector.app.features.crypto.recover import android.app.Activity import android.content.DialogInterface @@ -22,7 +22,7 @@ import android.view.KeyEvent import android.widget.TextView import androidx.appcompat.app.AlertDialog import androidx.core.content.ContextCompat -import im.vector.riotx.R +import im.vector.app.R import me.gujun.android.span.image import me.gujun.android.span.span diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/RecoveryKeyExt.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/RecoveryKeyExt.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/crypto/recover/RecoveryKeyExt.kt rename to vector/src/main/java/im/vector/app/features/crypto/recover/RecoveryKeyExt.kt index 29453af932..8fd7229c5d 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/RecoveryKeyExt.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/recover/RecoveryKeyExt.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.recover +package im.vector.app.features.crypto.recover fun String.formatRecoveryKey(): String { return this.replace(" ", "") diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/util/Extensions.kt b/vector/src/main/java/im/vector/app/features/crypto/util/Extensions.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/crypto/util/Extensions.kt rename to vector/src/main/java/im/vector/app/features/crypto/util/Extensions.kt index f4885498c3..9d7f7ff8ce 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/util/Extensions.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/util/Extensions.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.util +package im.vector.app.features.crypto.util import androidx.annotation.DrawableRes +import im.vector.app.R +import im.vector.app.core.extensions.exhaustive import im.vector.matrix.android.api.crypto.RoomEncryptionTrustLevel -import im.vector.riotx.R -import im.vector.riotx.core.extensions.exhaustive @DrawableRes fun RoomEncryptionTrustLevel?.toImageRes(): Int { diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/IncomingVerificationRequestHandler.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/IncomingVerificationRequestHandler.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt index 2bd815b6df..b1a26413a2 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/IncomingVerificationRequestHandler.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.crypto.verification +package im.vector.app.features.crypto.verification import android.content.Context +import im.vector.app.R +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.features.home.room.detail.RoomDetailActivity +import im.vector.app.features.home.room.detail.RoomDetailArgs +import im.vector.app.features.popup.PopupAlertManager +import im.vector.app.features.popup.VerificationVectorAlert +import im.vector.app.features.themes.ThemeUtils import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.crypto.verification.PendingVerificationRequest import im.vector.matrix.android.api.session.crypto.verification.VerificationService import im.vector.matrix.android.api.session.crypto.verification.VerificationTransaction import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState import im.vector.matrix.android.api.util.toMatrixItem -import im.vector.riotx.R -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.features.home.room.detail.RoomDetailActivity -import im.vector.riotx.features.home.room.detail.RoomDetailArgs -import im.vector.riotx.features.popup.PopupAlertManager -import im.vector.riotx.features.popup.VerificationVectorAlert -import im.vector.riotx.features.themes.ThemeUtils import javax.inject.Inject import javax.inject.Singleton diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/SupportedVerificationMethodsProvider.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/SupportedVerificationMethodsProvider.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/SupportedVerificationMethodsProvider.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/SupportedVerificationMethodsProvider.kt index e7ed123de6..afbee93d59 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/SupportedVerificationMethodsProvider.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/SupportedVerificationMethodsProvider.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.verification +package im.vector.app.features.crypto.verification +import im.vector.app.core.hardware.HardwareInfo import im.vector.matrix.android.api.session.crypto.verification.VerificationMethod -import im.vector.riotx.core.hardware.HardwareInfo import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationAction.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationAction.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationAction.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/VerificationAction.kt index 79facb71d0..1c6ea413cb 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationAction.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationAction.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.verification +package im.vector.app.features.crypto.verification -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction // TODO Remove otherUserId and transactionId when it's not necessary. Should be known by the ViewModel, no? sealed class VerificationAction : VectorViewModelAction { diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheet.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheet.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt index cd9fed108b..5708f45a53 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheet.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.crypto.verification +package im.vector.app.features.crypto.verification import android.app.Activity import android.app.Dialog @@ -31,6 +31,23 @@ import butterknife.BindView import com.airbnb.mvrx.MvRx import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.extensions.commitTransaction +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment +import im.vector.app.features.crypto.quads.SharedSecureStorageActivity +import im.vector.app.features.crypto.verification.cancel.VerificationCancelFragment +import im.vector.app.features.crypto.verification.cancel.VerificationNotMeFragment +import im.vector.app.features.crypto.verification.choose.VerificationChooseMethodFragment +import im.vector.app.features.crypto.verification.conclusion.VerificationConclusionFragment +import im.vector.app.features.crypto.verification.emoji.VerificationEmojiCodeFragment +import im.vector.app.features.crypto.verification.qrconfirmation.VerificationQRWaitingFragment +import im.vector.app.features.crypto.verification.qrconfirmation.VerificationQrScannedByOtherFragment +import im.vector.app.features.crypto.verification.request.VerificationRequestFragment +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.settings.VectorSettingsActivity import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME import im.vector.matrix.android.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME @@ -38,23 +55,6 @@ import im.vector.matrix.android.api.session.crypto.crosssigning.SELF_SIGNING_KEY import im.vector.matrix.android.api.session.crypto.crosssigning.USER_SIGNING_KEY_SSSS_NAME import im.vector.matrix.android.api.session.crypto.verification.CancelCode import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState -import im.vector.riotx.R -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.extensions.commitTransaction -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment -import im.vector.riotx.features.crypto.quads.SharedSecureStorageActivity -import im.vector.riotx.features.crypto.verification.cancel.VerificationCancelFragment -import im.vector.riotx.features.crypto.verification.cancel.VerificationNotMeFragment -import im.vector.riotx.features.crypto.verification.choose.VerificationChooseMethodFragment -import im.vector.riotx.features.crypto.verification.conclusion.VerificationConclusionFragment -import im.vector.riotx.features.crypto.verification.emoji.VerificationEmojiCodeFragment -import im.vector.riotx.features.crypto.verification.qrconfirmation.VerificationQRWaitingFragment -import im.vector.riotx.features.crypto.verification.qrconfirmation.VerificationQrScannedByOtherFragment -import im.vector.riotx.features.crypto.verification.request.VerificationRequestFragment -import im.vector.riotx.features.home.AvatarRenderer -import im.vector.riotx.features.settings.VectorSettingsActivity import kotlinx.android.parcel.Parcelize import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewEvents.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewEvents.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewEvents.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewEvents.kt index 7e3a5441de..ba47de18fc 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewEvents.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.verification +package im.vector.app.features.crypto.verification -import im.vector.riotx.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewEvents /** * Transient events for the verification bottom sheet diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt similarity index 99% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt index 53c9deb296..8494dab49d 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/VerificationBottomSheetViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.crypto.verification +package im.vector.app.features.crypto.verification import androidx.lifecycle.viewModelScope import com.airbnb.mvrx.Async @@ -27,6 +27,10 @@ import com.airbnb.mvrx.Uninitialized import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.R +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.core.resources.StringProvider import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME @@ -52,10 +56,6 @@ import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersio import im.vector.matrix.android.internal.crypto.keysbackup.util.computeRecoveryKey import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult import im.vector.matrix.android.internal.util.awaitCallback -import im.vector.riotx.R -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.core.resources.StringProvider import kotlinx.coroutines.launch import timber.log.Timber diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/cancel/VerificationCancelController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelController.kt similarity index 85% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/cancel/VerificationCancelController.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelController.kt index 73f449a3c3..fc0d31af1a 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/cancel/VerificationCancelController.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelController.kt @@ -14,18 +14,18 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.verification.cancel +package im.vector.app.features.crypto.verification.cancel import androidx.core.text.toSpannable import com.airbnb.epoxy.EpoxyController -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.dividerItem -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.core.utils.colorizeMatchingText -import im.vector.riotx.features.crypto.verification.VerificationBottomSheetViewState -import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationActionItem -import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem +import im.vector.app.R +import im.vector.app.core.epoxy.dividerItem +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.utils.colorizeMatchingText +import im.vector.app.features.crypto.verification.VerificationBottomSheetViewState +import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem +import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem import javax.inject.Inject class VerificationCancelController @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/cancel/VerificationCancelFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelFragment.kt similarity index 85% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/cancel/VerificationCancelFragment.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelFragment.kt index 0c5c070156..8e31cd2fab 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/cancel/VerificationCancelFragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationCancelFragment.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.verification.cancel +package im.vector.app.features.crypto.verification.cancel import android.os.Bundle import android.view.View import com.airbnb.mvrx.parentFragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.features.crypto.verification.VerificationBottomSheetViewModel +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.features.crypto.verification.VerificationBottomSheetViewModel import kotlinx.android.synthetic.main.bottom_sheet_verification_child_fragment.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/cancel/VerificationNotMeController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeController.kt similarity index 80% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/cancel/VerificationNotMeController.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeController.kt index 3978ab8ba5..a1c482f8d3 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/cancel/VerificationNotMeController.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeController.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.verification.cancel +package im.vector.app.features.crypto.verification.cancel import com.airbnb.epoxy.EpoxyController -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.dividerItem -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.crypto.verification.VerificationBottomSheetViewState -import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationActionItem -import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem -import im.vector.riotx.features.html.EventHtmlRenderer +import im.vector.app.R +import im.vector.app.core.epoxy.dividerItem +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.crypto.verification.VerificationBottomSheetViewState +import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem +import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem +import im.vector.app.features.html.EventHtmlRenderer import javax.inject.Inject class VerificationNotMeController @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/cancel/VerificationNotMeFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeFragment.kt similarity index 85% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/cancel/VerificationNotMeFragment.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeFragment.kt index b764639078..5059c2a2c9 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/cancel/VerificationNotMeFragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/cancel/VerificationNotMeFragment.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.verification.cancel +package im.vector.app.features.crypto.verification.cancel import android.os.Bundle import android.view.View import com.airbnb.mvrx.parentFragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.features.crypto.verification.VerificationBottomSheetViewModel +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.features.crypto.verification.VerificationBottomSheetViewModel import kotlinx.android.synthetic.main.bottom_sheet_verification_child_fragment.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/choose/VerificationChooseMethodController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodController.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/choose/VerificationChooseMethodController.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodController.kt index 919869500f..953b20cb0c 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/choose/VerificationChooseMethodController.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodController.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.verification.choose +package im.vector.app.features.crypto.verification.choose import com.airbnb.epoxy.EpoxyController -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.dividerItem -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationActionItem -import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem -import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationQrCodeItem +import im.vector.app.R +import im.vector.app.core.epoxy.dividerItem +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem +import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem +import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationQrCodeItem import javax.inject.Inject class VerificationChooseMethodController @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/choose/VerificationChooseMethodFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/choose/VerificationChooseMethodFragment.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt index eb32f5b0e3..fc715301f2 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/choose/VerificationChooseMethodFragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.crypto.verification.choose +package im.vector.app.features.crypto.verification.choose import android.app.Activity import android.content.Intent @@ -22,17 +22,17 @@ import android.view.View import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.parentFragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -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.allGranted -import im.vector.riotx.core.utils.checkPermissions -import im.vector.riotx.features.crypto.verification.VerificationAction -import im.vector.riotx.features.crypto.verification.VerificationBottomSheetViewModel -import im.vector.riotx.features.qrcode.QrCodeScannerActivity +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO +import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA +import im.vector.app.core.utils.allGranted +import im.vector.app.core.utils.checkPermissions +import im.vector.app.features.crypto.verification.VerificationAction +import im.vector.app.features.crypto.verification.VerificationBottomSheetViewModel +import im.vector.app.features.qrcode.QrCodeScannerActivity import kotlinx.android.synthetic.main.bottom_sheet_verification_child_fragment.* import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt index 3c3009ed01..e8b8791a56 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodViewModel.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.crypto.verification.choose +package im.vector.app.features.crypto.verification.choose import com.airbnb.mvrx.FragmentViewModelContext import com.airbnb.mvrx.MvRxState @@ -21,17 +21,17 @@ import com.airbnb.mvrx.MvRxViewModelFactory import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.core.di.HasScreenInjector +import im.vector.app.core.platform.EmptyAction +import im.vector.app.core.platform.EmptyViewEvents +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.features.crypto.verification.VerificationBottomSheet import im.vector.matrix.android.api.extensions.orFalse import im.vector.matrix.android.api.session.Session +import im.vector.matrix.android.api.session.crypto.verification.PendingVerificationRequest import im.vector.matrix.android.api.session.crypto.verification.QrCodeVerificationTransaction import im.vector.matrix.android.api.session.crypto.verification.VerificationService import im.vector.matrix.android.api.session.crypto.verification.VerificationTransaction -import im.vector.matrix.android.api.session.crypto.verification.PendingVerificationRequest -import im.vector.riotx.core.di.HasScreenInjector -import im.vector.riotx.core.platform.EmptyAction -import im.vector.riotx.core.platform.EmptyViewEvents -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.features.crypto.verification.VerificationBottomSheet data class VerificationChooseMethodViewState( val otherUserId: String = "", diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/conclusion/VerificationConclusionController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt similarity index 87% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/conclusion/VerificationConclusionController.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt index bd40bec210..3c7c6d5745 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/conclusion/VerificationConclusionController.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.verification.conclusion +package im.vector.app.features.crypto.verification.conclusion import com.airbnb.epoxy.EpoxyController -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.dividerItem -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationActionItem -import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationBigImageItem -import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem -import im.vector.riotx.features.html.EventHtmlRenderer +import im.vector.app.R +import im.vector.app.core.epoxy.dividerItem +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem +import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationBigImageItem +import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem +import im.vector.app.features.html.EventHtmlRenderer import javax.inject.Inject class VerificationConclusionController @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/conclusion/VerificationConclusionFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionFragment.kt similarity index 85% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/conclusion/VerificationConclusionFragment.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionFragment.kt index 7405722c04..885cc8f853 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/conclusion/VerificationConclusionFragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionFragment.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.crypto.verification.conclusion +package im.vector.app.features.crypto.verification.conclusion import android.os.Bundle import android.os.Parcelable @@ -21,12 +21,12 @@ import android.view.View import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.parentFragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.features.crypto.verification.VerificationAction -import im.vector.riotx.features.crypto.verification.VerificationBottomSheetViewModel +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.features.crypto.verification.VerificationAction +import im.vector.app.features.crypto.verification.VerificationBottomSheetViewModel import kotlinx.android.parcel.Parcelize import kotlinx.android.synthetic.main.bottom_sheet_verification_child_fragment.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/conclusion/VerificationConclusionViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionViewModel.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/conclusion/VerificationConclusionViewModel.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionViewModel.kt index 868e355150..119c911d4f 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/conclusion/VerificationConclusionViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionViewModel.kt @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.crypto.verification.conclusion +package im.vector.app.features.crypto.verification.conclusion import com.airbnb.mvrx.MvRxState import com.airbnb.mvrx.MvRxViewModelFactory import com.airbnb.mvrx.ViewModelContext +import im.vector.app.core.platform.EmptyAction +import im.vector.app.core.platform.EmptyViewEvents +import im.vector.app.core.platform.VectorViewModel import im.vector.matrix.android.api.session.crypto.verification.CancelCode import im.vector.matrix.android.api.session.crypto.verification.safeValueOf -import im.vector.riotx.core.platform.EmptyAction -import im.vector.riotx.core.platform.EmptyViewEvents -import im.vector.riotx.core.platform.VectorViewModel data class VerificationConclusionViewState( val conclusionState: ConclusionState = ConclusionState.CANCELLED, diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/emoji/VerificationEmojiCodeController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeController.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/emoji/VerificationEmojiCodeController.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeController.kt index 12fffd3e11..851219c54c 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/emoji/VerificationEmojiCodeController.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeController.kt @@ -14,22 +14,22 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.verification.emoji +package im.vector.app.features.crypto.verification.emoji import com.airbnb.epoxy.EpoxyController import com.airbnb.mvrx.Fail import com.airbnb.mvrx.Success -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.dividerItem -import im.vector.riotx.core.epoxy.errorWithRetryItem -import im.vector.riotx.core.error.ErrorFormatter -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationActionItem -import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationDecimalCodeItem -import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationEmojisItem -import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem -import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationWaitingItem +import im.vector.app.R +import im.vector.app.core.epoxy.dividerItem +import im.vector.app.core.epoxy.errorWithRetryItem +import im.vector.app.core.error.ErrorFormatter +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem +import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationDecimalCodeItem +import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationEmojisItem +import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem +import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationWaitingItem import javax.inject.Inject class VerificationEmojiCodeController @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/emoji/VerificationEmojiCodeFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeFragment.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/emoji/VerificationEmojiCodeFragment.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeFragment.kt index 2cd20ca4fb..20d0d7de75 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/emoji/VerificationEmojiCodeFragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeFragment.kt @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.crypto.verification.emoji +package im.vector.app.features.crypto.verification.emoji import android.os.Bundle import android.view.View import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.parentFragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.features.crypto.verification.VerificationAction -import im.vector.riotx.features.crypto.verification.VerificationBottomSheetViewModel +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.features.crypto.verification.VerificationAction +import im.vector.app.features.crypto.verification.VerificationBottomSheetViewModel import kotlinx.android.synthetic.main.bottom_sheet_verification_child_fragment.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt index be5df38353..b66ac109be 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeViewModel.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.crypto.verification.emoji +package im.vector.app.features.crypto.verification.emoji import com.airbnb.mvrx.Async import com.airbnb.mvrx.Fail @@ -26,6 +26,11 @@ import com.airbnb.mvrx.Uninitialized import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.core.di.HasScreenInjector +import im.vector.app.core.platform.EmptyAction +import im.vector.app.core.platform.EmptyViewEvents +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.features.crypto.verification.VerificationBottomSheet import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.crypto.verification.EmojiRepresentation import im.vector.matrix.android.api.session.crypto.verification.SasVerificationTransaction @@ -34,11 +39,6 @@ import im.vector.matrix.android.api.session.crypto.verification.VerificationTran import im.vector.matrix.android.api.session.crypto.verification.VerificationTxState import im.vector.matrix.android.api.util.MatrixItem import im.vector.matrix.android.api.util.toMatrixItem -import im.vector.riotx.core.di.HasScreenInjector -import im.vector.riotx.core.platform.EmptyAction -import im.vector.riotx.core.platform.EmptyViewEvents -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.features.crypto.verification.VerificationBottomSheet data class VerificationEmojiCodeViewState( val transactionId: String?, diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetSelfWaitItem.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetSelfWaitItem.kt similarity index 82% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetSelfWaitItem.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetSelfWaitItem.kt index 6afc330f62..205dd6a10a 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetSelfWaitItem.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetSelfWaitItem.kt @@ -14,12 +14,12 @@ * limitations under the License. * */ -package im.vector.riotx.features.crypto.verification.epoxy +package im.vector.app.features.crypto.verification.epoxy import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel /** * A action for bottom sheet. diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationActionItem.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationActionItem.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationActionItem.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationActionItem.kt index f07fce98b0..e87be702db 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationActionItem.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationActionItem.kt @@ -14,7 +14,7 @@ * limitations under the License. * */ -package im.vector.riotx.features.crypto.verification.epoxy +package im.vector.app.features.crypto.verification.epoxy import android.content.res.ColorStateList import android.widget.ImageView @@ -24,10 +24,10 @@ import androidx.core.view.isVisible import androidx.core.widget.ImageViewCompat import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -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.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.extensions.setTextOrHide /** * A action for bottom sheet. diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt index c806778c3a..a7625688c0 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationBigImageItem.kt @@ -14,15 +14,15 @@ * limitations under the License. * */ -package im.vector.riotx.features.crypto.verification.epoxy +package im.vector.app.features.crypto.verification.epoxy import android.widget.ImageView import androidx.core.view.ViewCompat import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel /** * A action for bottom sheet. diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationDecimalCodeItem.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationDecimalCodeItem.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationDecimalCodeItem.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationDecimalCodeItem.kt index 1681bf0db8..053c6e3ff4 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationDecimalCodeItem.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationDecimalCodeItem.kt @@ -14,14 +14,14 @@ * limitations under the License. * */ -package im.vector.riotx.features.crypto.verification.epoxy +package im.vector.app.features.crypto.verification.epoxy import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel /** * A action for bottom sheet. diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt index 112c26e69a..82bea7b1fb 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt @@ -14,7 +14,7 @@ * limitations under the License. * */ -package im.vector.riotx.features.crypto.verification.epoxy +package im.vector.app.features.crypto.verification.epoxy import android.content.Context import android.view.ViewGroup @@ -24,10 +24,10 @@ import androidx.core.content.ContextCompat import androidx.core.view.isVisible import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel import im.vector.matrix.android.api.session.crypto.verification.EmojiRepresentation -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel import me.gujun.android.span.Span import me.gujun.android.span.image import me.gujun.android.span.span diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationNoticeItem.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationNoticeItem.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationNoticeItem.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationNoticeItem.kt index c21410b7eb..232cdd0f4a 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationNoticeItem.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationNoticeItem.kt @@ -14,14 +14,14 @@ * limitations under the License. * */ -package im.vector.riotx.features.crypto.verification.epoxy +package im.vector.app.features.crypto.verification.epoxy import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel /** * A action for bottom sheet. diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationQrCodeItem.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationQrCodeItem.kt similarity index 83% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationQrCodeItem.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationQrCodeItem.kt index 024321b6dc..8d78c1c9d6 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationQrCodeItem.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationQrCodeItem.kt @@ -14,14 +14,14 @@ * limitations under the License. * */ -package im.vector.riotx.features.crypto.verification.epoxy +package im.vector.app.features.crypto.verification.epoxy import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel -import im.vector.riotx.core.ui.views.QrCodeImageView +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.ui.views.QrCodeImageView /** * An Epoxy item displaying a QR code diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationWaitingItem.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationWaitingItem.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationWaitingItem.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationWaitingItem.kt index 32ad4e77c6..d8fc928471 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/epoxy/BottomSheetVerificationWaitingItem.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationWaitingItem.kt @@ -14,14 +14,14 @@ * limitations under the License. * */ -package im.vector.riotx.features.crypto.verification.epoxy +package im.vector.app.features.crypto.verification.epoxy import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel /** * A action for bottom sheet. diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/qrconfirmation/VerificationQRWaitingController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingController.kt similarity index 77% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/qrconfirmation/VerificationQRWaitingController.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingController.kt index 2214774882..8cb5068b63 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/qrconfirmation/VerificationQRWaitingController.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingController.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.verification.qrconfirmation +package im.vector.app.features.crypto.verification.qrconfirmation import com.airbnb.epoxy.EpoxyController -import im.vector.riotx.R -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationBigImageItem -import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem -import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationWaitingItem +import im.vector.app.R +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationBigImageItem +import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem +import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationWaitingItem import javax.inject.Inject class VerificationQRWaitingController @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/qrconfirmation/VerificationQRWaitingFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingFragment.kt similarity index 87% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/qrconfirmation/VerificationQRWaitingFragment.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingFragment.kt index 77de3997cb..c2d7536134 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/qrconfirmation/VerificationQRWaitingFragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQRWaitingFragment.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.verification.qrconfirmation +package im.vector.app.features.crypto.verification.qrconfirmation import android.os.Bundle import android.os.Parcelable import android.view.View import com.airbnb.mvrx.MvRx -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseFragment import kotlinx.android.parcel.Parcelize import kotlinx.android.synthetic.main.bottom_sheet_verification_child_fragment.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherController.kt similarity index 82% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherController.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherController.kt index dd1d3d0f90..cabce6410d 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherController.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherController.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.verification.qrconfirmation +package im.vector.app.features.crypto.verification.qrconfirmation import com.airbnb.epoxy.EpoxyController -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.dividerItem -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.crypto.verification.VerificationBottomSheetViewState -import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationActionItem -import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationBigImageItem -import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem +import im.vector.app.R +import im.vector.app.core.epoxy.dividerItem +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.crypto.verification.VerificationBottomSheetViewState +import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem +import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationBigImageItem +import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem import javax.inject.Inject class VerificationQrScannedByOtherController @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherFragment.kt similarity index 84% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherFragment.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherFragment.kt index a8a16f8006..7e9b19e491 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherFragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/qrconfirmation/VerificationQrScannedByOtherFragment.kt @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.crypto.verification.qrconfirmation +package im.vector.app.features.crypto.verification.qrconfirmation import android.os.Bundle import android.view.View import com.airbnb.mvrx.parentFragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.features.crypto.verification.VerificationAction -import im.vector.riotx.features.crypto.verification.VerificationBottomSheetViewModel +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.features.crypto.verification.VerificationAction +import im.vector.app.features.crypto.verification.VerificationBottomSheetViewModel import kotlinx.android.synthetic.main.bottom_sheet_verification_child_fragment.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/request/VerificationRequestController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/request/VerificationRequestController.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt index 8ac2ce72cb..3f4c3120e7 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/request/VerificationRequestController.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt @@ -14,23 +14,23 @@ * limitations under the License. */ -package im.vector.riotx.features.crypto.verification.request +package im.vector.app.features.crypto.verification.request import androidx.core.text.toSpannable import com.airbnb.epoxy.EpoxyController import com.airbnb.mvrx.Loading import com.airbnb.mvrx.Success import com.airbnb.mvrx.Uninitialized -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.dividerItem -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.core.utils.colorizeMatchingText -import im.vector.riotx.features.crypto.verification.VerificationBottomSheetViewState -import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetSelfWaitItem -import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationActionItem -import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem -import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationWaitingItem +import im.vector.app.R +import im.vector.app.core.epoxy.dividerItem +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.utils.colorizeMatchingText +import im.vector.app.features.crypto.verification.VerificationBottomSheetViewState +import im.vector.app.features.crypto.verification.epoxy.bottomSheetSelfWaitItem +import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem +import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem +import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationWaitingItem import javax.inject.Inject class VerificationRequestController @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/request/VerificationRequestFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestFragment.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/crypto/verification/request/VerificationRequestFragment.kt rename to vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestFragment.kt index 967f2946c1..fc7dcaf15f 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/request/VerificationRequestFragment.kt +++ b/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestFragment.kt @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.crypto.verification.request +package im.vector.app.features.crypto.verification.request import android.os.Bundle import android.view.View import com.airbnb.mvrx.parentFragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.features.crypto.verification.VerificationAction -import im.vector.riotx.features.crypto.verification.VerificationBottomSheetViewModel +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.features.crypto.verification.VerificationAction +import im.vector.app.features.crypto.verification.VerificationBottomSheetViewModel import kotlinx.android.synthetic.main.bottom_sheet_verification_child_fragment.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/disclaimer/DisclaimerDialog.kt b/vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/disclaimer/DisclaimerDialog.kt rename to vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt index 51c61c99a9..b9568e0b62 100644 --- a/vector/src/main/java/im/vector/riotx/features/disclaimer/DisclaimerDialog.kt +++ b/vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package im.vector.riotx.features.disclaimer +package im.vector.app.features.disclaimer import android.app.Activity import android.content.Context import androidx.appcompat.app.AlertDialog import androidx.core.content.edit import androidx.preference.PreferenceManager -import im.vector.riotx.R -import im.vector.riotx.core.utils.openUrlInChromeCustomTab -import im.vector.riotx.features.settings.VectorSettingsUrls +import im.vector.app.R +import im.vector.app.core.utils.openUrlInChromeCustomTab +import im.vector.app.features.settings.VectorSettingsUrls // Increase this value to show again the disclaimer dialog after an upgrade of the application private const val CURRENT_DISCLAIMER_VALUE = 2 diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsAction.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsAction.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsAction.kt rename to vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsAction.kt index 57b23d26d2..fb6438f312 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsAction.kt +++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsAction.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.discovery +package im.vector.app.features.discovery +import im.vector.app.core.platform.VectorViewModelAction import im.vector.matrix.android.api.session.identity.ThreePid -import im.vector.riotx.core.platform.VectorViewModelAction sealed class DiscoverySettingsAction : VectorViewModelAction { object RetrieveBinding : DiscoverySettingsAction() diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsController.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsController.kt rename to vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt index f92cb1a8bb..e56022387b 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsController.kt +++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.discovery +package im.vector.app.features.discovery import android.view.View import com.airbnb.epoxy.TypedEpoxyController @@ -24,17 +24,17 @@ import com.airbnb.mvrx.Loading import com.airbnb.mvrx.Success import com.airbnb.mvrx.Uninitialized import com.google.i18n.phonenumbers.PhoneNumberUtil +import im.vector.app.R +import im.vector.app.core.epoxy.attributes.ButtonStyle +import im.vector.app.core.epoxy.attributes.ButtonType +import im.vector.app.core.epoxy.attributes.IconMode +import im.vector.app.core.epoxy.loadingItem +import im.vector.app.core.error.ErrorFormatter +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.resources.StringProvider import im.vector.matrix.android.api.failure.Failure import im.vector.matrix.android.api.session.identity.SharedState import im.vector.matrix.android.api.session.identity.ThreePid -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.attributes.ButtonStyle -import im.vector.riotx.core.epoxy.attributes.ButtonType -import im.vector.riotx.core.epoxy.attributes.IconMode -import im.vector.riotx.core.epoxy.loadingItem -import im.vector.riotx.core.error.ErrorFormatter -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.resources.StringProvider import timber.log.Timber import javax.inject.Inject import javax.net.ssl.HttpsURLConnection diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsFragment.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsFragment.kt rename to vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt index b772db7322..3df92924a8 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsFragment.kt +++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.discovery +package im.vector.app.features.discovery import android.app.Activity import android.content.Intent @@ -22,19 +22,19 @@ import android.view.View import androidx.appcompat.app.AlertDialog import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.extensions.observeEvent +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.utils.ensureProtocol +import im.vector.app.features.discovery.change.SetIdentityServerFragment +import im.vector.app.features.terms.ReviewTermsActivity import im.vector.matrix.android.api.session.identity.SharedState import im.vector.matrix.android.api.session.identity.ThreePid import im.vector.matrix.android.api.session.terms.TermsService -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.extensions.observeEvent -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.utils.ensureProtocol -import im.vector.riotx.features.discovery.change.SetIdentityServerFragment -import im.vector.riotx.features.terms.ReviewTermsActivity import kotlinx.android.synthetic.main.fragment_generic_recycler.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsState.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsState.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsState.kt rename to vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsState.kt index 5dc4b2354a..6b28c07e89 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsState.kt +++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.discovery +package im.vector.app.features.discovery import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsViewEvents.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewEvents.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsViewEvents.kt rename to vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewEvents.kt index 6fd45394a2..c0edd5df6d 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewEvents.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.discovery +package im.vector.app.features.discovery -import im.vector.riotx.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewEvents sealed class DiscoverySettingsViewEvents : VectorViewEvents { data class Failure(val throwable: Throwable) : DiscoverySettingsViewEvents() diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewModel.kt similarity index 99% rename from vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsViewModel.kt rename to vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewModel.kt index 9693b6a4ad..586b3ef002 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewModel.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.discovery +package im.vector.app.features.discovery import androidx.lifecycle.viewModelScope import com.airbnb.mvrx.Async @@ -26,6 +26,8 @@ import com.airbnb.mvrx.Uninitialized import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorViewModel import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.identity.IdentityServiceError import im.vector.matrix.android.api.session.identity.IdentityServiceListener @@ -33,8 +35,6 @@ import im.vector.matrix.android.api.session.identity.SharedState import im.vector.matrix.android.api.session.identity.ThreePid import im.vector.matrix.android.internal.util.awaitCallback import im.vector.matrix.rx.rx -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorViewModel import kotlinx.coroutines.launch class DiscoverySettingsViewModel @AssistedInject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySharedViewModel.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySharedViewModel.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySharedViewModel.kt rename to vector/src/main/java/im/vector/app/features/discovery/DiscoverySharedViewModel.kt index cde326d824..e85e919e68 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySharedViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySharedViewModel.kt @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.discovery +package im.vector.app.features.discovery import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import im.vector.riotx.core.extensions.postLiveEvent -import im.vector.riotx.core.utils.LiveEvent +import im.vector.app.core.extensions.postLiveEvent +import im.vector.app.core.utils.LiveEvent import javax.inject.Inject class DiscoverySharedViewModel @Inject constructor() : ViewModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySharedViewModelAction.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySharedViewModelAction.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySharedViewModelAction.kt rename to vector/src/main/java/im/vector/app/features/discovery/DiscoverySharedViewModelAction.kt index 5889ce4a63..8be9ac0b55 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySharedViewModelAction.kt +++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySharedViewModelAction.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.discovery +package im.vector.app.features.discovery sealed class DiscoverySharedViewModelAction { data class ChangeIdentityServer(val newUrl: String) : DiscoverySharedViewModelAction() diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/PidInfo.kt b/vector/src/main/java/im/vector/app/features/discovery/PidInfo.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/discovery/PidInfo.kt rename to vector/src/main/java/im/vector/app/features/discovery/PidInfo.kt index 67739c48ce..764d90b5b0 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/PidInfo.kt +++ b/vector/src/main/java/im/vector/app/features/discovery/PidInfo.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.discovery +package im.vector.app.features.discovery import com.airbnb.mvrx.Async import com.airbnb.mvrx.Uninitialized diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsButtonItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsButtonItem.kt similarity index 84% rename from vector/src/main/java/im/vector/riotx/features/discovery/SettingsButtonItem.kt rename to vector/src/main/java/im/vector/app/features/discovery/SettingsButtonItem.kt index 11a2737496..38f2343316 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsButtonItem.kt +++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsButtonItem.kt @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.discovery +package im.vector.app.features.discovery import android.widget.Button import androidx.annotation.StringRes import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelWithHolder -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.ClickListener -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.attributes.ButtonStyle -import im.vector.riotx.core.epoxy.onClick -import im.vector.riotx.core.extensions.setTextOrHide -import im.vector.riotx.core.resources.ColorProvider +import im.vector.app.R +import im.vector.app.core.epoxy.ClickListener +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.attributes.ButtonStyle +import im.vector.app.core.epoxy.onClick +import im.vector.app.core.extensions.setTextOrHide +import im.vector.app.core.resources.ColorProvider @EpoxyModelClass(layout = R.layout.item_settings_button) abstract class SettingsButtonItem : EpoxyModelWithHolder() { diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsContinueCancelItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsContinueCancelItem.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/discovery/SettingsContinueCancelItem.kt rename to vector/src/main/java/im/vector/app/features/discovery/SettingsContinueCancelItem.kt index 0e424de540..bb225f4ef4 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsContinueCancelItem.kt +++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsContinueCancelItem.kt @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.discovery +package im.vector.app.features.discovery import android.widget.Button import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelWithHolder -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder @EpoxyModelClass(layout = R.layout.item_settings_continue_cancel) abstract class SettingsContinueCancelItem : EpoxyModelWithHolder() { diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsEditTextItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsEditTextItem.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/discovery/SettingsEditTextItem.kt rename to vector/src/main/java/im/vector/app/features/discovery/SettingsEditTextItem.kt index aaa4435f3a..81d46373a2 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsEditTextItem.kt +++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsEditTextItem.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.discovery +package im.vector.app.features.discovery import android.view.KeyEvent import android.view.inputmethod.EditorInfo @@ -24,9 +24,9 @@ import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelWithHolder import com.google.android.material.textfield.TextInputLayout -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.extensions.setTextOrHide +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.extensions.setTextOrHide @EpoxyModelClass(layout = R.layout.item_settings_edit_text) abstract class SettingsEditTextItem : EpoxyModelWithHolder() { diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsInfoItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsInfoItem.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/discovery/SettingsInfoItem.kt rename to vector/src/main/java/im/vector/app/features/discovery/SettingsInfoItem.kt index c28b58340b..20eaae980d 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsInfoItem.kt +++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsInfoItem.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.discovery +package im.vector.app.features.discovery import android.view.View import android.widget.TextView @@ -22,9 +22,9 @@ import androidx.annotation.StringRes import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelWithHolder -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.extensions.setTextOrHide +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.extensions.setTextOrHide @EpoxyModelClass(layout = R.layout.item_settings_helper_info) abstract class SettingsInfoItem : EpoxyModelWithHolder() { diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsInformationItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsInformationItem.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/discovery/SettingsInformationItem.kt rename to vector/src/main/java/im/vector/app/features/discovery/SettingsInformationItem.kt index ad3c445ac3..5748df711e 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsInformationItem.kt +++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsInformationItem.kt @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.discovery +package im.vector.app.features.discovery import android.widget.TextView import androidx.annotation.ColorRes import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelWithHolder -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.resources.ColorProvider +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.resources.ColorProvider @EpoxyModelClass(layout = R.layout.item_settings_information) abstract class SettingsInformationItem : EpoxyModelWithHolder() { diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsItem.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/discovery/SettingsItem.kt rename to vector/src/main/java/im/vector/app/features/discovery/SettingsItem.kt index e11ae68f18..53bf7e64d6 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsItem.kt +++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsItem.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.discovery +package im.vector.app.features.discovery import android.view.View import android.widget.Switch @@ -23,9 +23,9 @@ import androidx.core.view.isVisible import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelWithHolder -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.extensions.setTextOrHide +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.extensions.setTextOrHide @EpoxyModelClass(layout = R.layout.item_settings_simple_item) abstract class SettingsItem : EpoxyModelWithHolder() { diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsProgressItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsProgressItem.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/discovery/SettingsProgressItem.kt rename to vector/src/main/java/im/vector/app/features/discovery/SettingsProgressItem.kt index b48fc3b7f1..8d62b37972 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsProgressItem.kt +++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsProgressItem.kt @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.discovery +package im.vector.app.features.discovery import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelWithHolder -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder @EpoxyModelClass(layout = R.layout.item_settings_progress) abstract class SettingsProgressItem : EpoxyModelWithHolder() { diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsSectionTitleItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsSectionTitleItem.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/discovery/SettingsSectionTitleItem.kt rename to vector/src/main/java/im/vector/app/features/discovery/SettingsSectionTitleItem.kt index d8b6eb7daa..fe97984c8b 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsSectionTitleItem.kt +++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsSectionTitleItem.kt @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.discovery +package im.vector.app.features.discovery import android.widget.TextView import androidx.annotation.StringRes import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelWithHolder -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.extensions.setTextOrHide +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.extensions.setTextOrHide @EpoxyModelClass(layout = R.layout.item_settings_section_title) abstract class SettingsSectionTitleItem : EpoxyModelWithHolder() { diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsTextButtonSingleLineItem.kt b/vector/src/main/java/im/vector/app/features/discovery/SettingsTextButtonSingleLineItem.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/discovery/SettingsTextButtonSingleLineItem.kt rename to vector/src/main/java/im/vector/app/features/discovery/SettingsTextButtonSingleLineItem.kt index 90a1a9ef99..b7d9997d46 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsTextButtonSingleLineItem.kt +++ b/vector/src/main/java/im/vector/app/features/discovery/SettingsTextButtonSingleLineItem.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.discovery +package im.vector.app.features.discovery import android.widget.Button import android.widget.CompoundButton @@ -27,18 +27,18 @@ import androidx.core.view.isVisible import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelWithHolder -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.ClickListener -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.attributes.ButtonStyle -import im.vector.riotx.core.epoxy.attributes.ButtonType -import im.vector.riotx.core.epoxy.attributes.IconMode -import im.vector.riotx.core.epoxy.onClick -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.extensions.setTextOrHide -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.themes.ThemeUtils +import im.vector.app.R +import im.vector.app.core.epoxy.ClickListener +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.attributes.ButtonStyle +import im.vector.app.core.epoxy.attributes.ButtonType +import im.vector.app.core.epoxy.attributes.IconMode +import im.vector.app.core.epoxy.onClick +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.extensions.setTextOrHide +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.themes.ThemeUtils @EpoxyModelClass(layout = R.layout.item_settings_button_single_line) abstract class SettingsTextButtonSingleLineItem : EpoxyModelWithHolder() { diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerAction.kt b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerAction.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerAction.kt rename to vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerAction.kt index 14f149c282..11e2e8671f 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerAction.kt +++ b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerAction.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.discovery.change +package im.vector.app.features.discovery.change -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction sealed class SetIdentityServerAction : VectorViewModelAction { object UseDefaultIdentityServer : SetIdentityServerAction() diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerFragment.kt b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerFragment.kt rename to vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt index 701c187cef..84426eab8d 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerFragment.kt +++ b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.discovery.change +package im.vector.app.features.discovery.change import android.app.Activity import android.content.Intent @@ -26,16 +26,16 @@ import androidx.core.view.isVisible import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState import com.jakewharton.rxbinding3.widget.textChanges +import im.vector.app.R +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.extensions.toReducedUrl +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.utils.colorizeMatchingText +import im.vector.app.features.discovery.DiscoverySharedViewModel +import im.vector.app.features.terms.ReviewTermsActivity import im.vector.matrix.android.api.session.terms.TermsService -import im.vector.riotx.R -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.extensions.toReducedUrl -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.utils.colorizeMatchingText -import im.vector.riotx.features.discovery.DiscoverySharedViewModel -import im.vector.riotx.features.terms.ReviewTermsActivity import kotlinx.android.synthetic.main.fragment_set_identity_server.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerState.kt b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerState.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerState.kt rename to vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerState.kt index 2b76d21ce5..4c2f437e07 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerState.kt +++ b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.discovery.change +package im.vector.app.features.discovery.change import com.airbnb.mvrx.MvRxState diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerViewEvents.kt b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewEvents.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerViewEvents.kt rename to vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewEvents.kt index b840afac11..dc33a9fa3e 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewEvents.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.discovery.change +package im.vector.app.features.discovery.change import androidx.annotation.StringRes -import im.vector.riotx.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewEvents sealed class SetIdentityServerViewEvents : VectorViewEvents { data class Loading(val message: CharSequence? = null) : SetIdentityServerViewEvents() diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerViewModel.kt b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerViewModel.kt rename to vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt index 9bec24548e..0fb5854fcd 100644 --- a/vector/src/main/java/im/vector/riotx/features/discovery/change/SetIdentityServerViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.discovery.change +package im.vector.app.features.discovery.change import androidx.lifecycle.viewModelScope import com.airbnb.mvrx.FragmentViewModelContext @@ -21,18 +21,18 @@ import com.airbnb.mvrx.MvRxViewModelFactory import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.R +import im.vector.app.core.di.HasScreenInjector +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.utils.ensureProtocol import im.vector.matrix.android.api.failure.Failure import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.identity.IdentityServiceError import im.vector.matrix.android.api.session.terms.GetTermsResponse import im.vector.matrix.android.api.session.terms.TermsService import im.vector.matrix.android.internal.util.awaitCallback -import im.vector.riotx.R -import im.vector.riotx.core.di.HasScreenInjector -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.core.utils.ensureProtocol import kotlinx.coroutines.launch import java.net.UnknownHostException diff --git a/vector/src/main/java/im/vector/riotx/features/form/FormEditTextItem.kt b/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/form/FormEditTextItem.kt rename to vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt index d31d2cca7e..f0c43228c1 100644 --- a/vector/src/main/java/im/vector/riotx/features/form/FormEditTextItem.kt +++ b/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotx.features.form +package im.vector.app.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.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel -import im.vector.riotx.core.platform.SimpleTextWatcher +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.platform.SimpleTextWatcher @EpoxyModelClass(layout = R.layout.item_form_text_input) abstract class FormEditTextItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/form/FormEditTextWithButtonItem.kt b/vector/src/main/java/im/vector/app/features/form/FormEditTextWithButtonItem.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/form/FormEditTextWithButtonItem.kt rename to vector/src/main/java/im/vector/app/features/form/FormEditTextWithButtonItem.kt index 799f6abe00..eadae3ba0c 100644 --- a/vector/src/main/java/im/vector/riotx/features/form/FormEditTextWithButtonItem.kt +++ b/vector/src/main/java/im/vector/app/features/form/FormEditTextWithButtonItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.form +package im.vector.app.features.form import android.text.Editable import android.view.View @@ -23,10 +23,10 @@ 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.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel -import im.vector.riotx.core.platform.SimpleTextWatcher +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.platform.SimpleTextWatcher @EpoxyModelClass(layout = R.layout.item_form_text_input_with_button) abstract class FormEditTextWithButtonItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/form/FormSwitchItem.kt b/vector/src/main/java/im/vector/app/features/form/FormSwitchItem.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/form/FormSwitchItem.kt rename to vector/src/main/java/im/vector/app/features/form/FormSwitchItem.kt index 9f2c04eec5..08d1332920 100644 --- a/vector/src/main/java/im/vector/riotx/features/form/FormSwitchItem.kt +++ b/vector/src/main/java/im/vector/app/features/form/FormSwitchItem.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package im.vector.riotx.features.form +package im.vector.app.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.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.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.extensions.setTextOrHide @EpoxyModelClass(layout = R.layout.item_form_switch) abstract class FormSwitchItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/grouplist/GroupListAction.kt b/vector/src/main/java/im/vector/app/features/grouplist/GroupListAction.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/grouplist/GroupListAction.kt rename to vector/src/main/java/im/vector/app/features/grouplist/GroupListAction.kt index 3697989af7..f82ff3cc66 100644 --- a/vector/src/main/java/im/vector/riotx/features/grouplist/GroupListAction.kt +++ b/vector/src/main/java/im/vector/app/features/grouplist/GroupListAction.kt @@ -15,10 +15,10 @@ * */ -package im.vector.riotx.features.grouplist +package im.vector.app.features.grouplist +import im.vector.app.core.platform.VectorViewModelAction import im.vector.matrix.android.api.session.group.model.GroupSummary -import im.vector.riotx.core.platform.VectorViewModelAction sealed class GroupListAction : VectorViewModelAction { data class SelectGroup(val groupSummary: GroupSummary) : GroupListAction() diff --git a/vector/src/main/java/im/vector/riotx/features/grouplist/GroupListFragment.kt b/vector/src/main/java/im/vector/app/features/grouplist/GroupListFragment.kt similarity index 85% rename from vector/src/main/java/im/vector/riotx/features/grouplist/GroupListFragment.kt rename to vector/src/main/java/im/vector/app/features/grouplist/GroupListFragment.kt index 66c4a2325b..dd8cd40b7e 100644 --- a/vector/src/main/java/im/vector/riotx/features/grouplist/GroupListFragment.kt +++ b/vector/src/main/java/im/vector/app/features/grouplist/GroupListFragment.kt @@ -15,7 +15,7 @@ * */ -package im.vector.riotx.features.grouplist +package im.vector.app.features.grouplist import android.os.Bundle import android.view.View @@ -23,15 +23,15 @@ import com.airbnb.mvrx.Incomplete import com.airbnb.mvrx.Success import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.StateView +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.features.home.HomeActivitySharedAction +import im.vector.app.features.home.HomeSharedActionViewModel import im.vector.matrix.android.api.session.group.model.GroupSummary -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.StateView -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.features.home.HomeActivitySharedAction -import im.vector.riotx.features.home.HomeSharedActionViewModel import kotlinx.android.synthetic.main.fragment_group_list.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/grouplist/GroupListViewEvents.kt b/vector/src/main/java/im/vector/app/features/grouplist/GroupListViewEvents.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/grouplist/GroupListViewEvents.kt rename to vector/src/main/java/im/vector/app/features/grouplist/GroupListViewEvents.kt index 3638934473..7cd12b8364 100644 --- a/vector/src/main/java/im/vector/riotx/features/grouplist/GroupListViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/grouplist/GroupListViewEvents.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.grouplist +package im.vector.app.features.grouplist -import im.vector.riotx.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewEvents /** * Transient events for group list screen diff --git a/vector/src/main/java/im/vector/riotx/features/grouplist/GroupListViewModel.kt b/vector/src/main/java/im/vector/app/features/grouplist/GroupListViewModel.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/grouplist/GroupListViewModel.kt rename to vector/src/main/java/im/vector/app/features/grouplist/GroupListViewModel.kt index 4c8e5c2333..8549821c05 100644 --- a/vector/src/main/java/im/vector/riotx/features/grouplist/GroupListViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/grouplist/GroupListViewModel.kt @@ -15,7 +15,7 @@ * */ -package im.vector.riotx.features.grouplist +package im.vector.app.features.grouplist import arrow.core.Option import com.airbnb.mvrx.FragmentViewModelContext @@ -23,6 +23,9 @@ import com.airbnb.mvrx.MvRxViewModelFactory import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.R +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.core.resources.StringProvider import im.vector.matrix.android.api.NoOpMatrixCallback import im.vector.matrix.android.api.query.QueryStringValue import im.vector.matrix.android.api.session.Session @@ -30,9 +33,6 @@ import im.vector.matrix.android.api.session.group.groupSummaryQueryParams import im.vector.matrix.android.api.session.group.model.GroupSummary import im.vector.matrix.android.api.session.room.model.Membership import im.vector.matrix.rx.rx -import im.vector.riotx.R -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.core.resources.StringProvider import io.reactivex.Observable import io.reactivex.functions.BiFunction diff --git a/vector/src/main/java/im/vector/riotx/features/grouplist/GroupListViewState.kt b/vector/src/main/java/im/vector/app/features/grouplist/GroupListViewState.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/grouplist/GroupListViewState.kt rename to vector/src/main/java/im/vector/app/features/grouplist/GroupListViewState.kt index ef8fd6ea6f..034ac51e02 100644 --- a/vector/src/main/java/im/vector/riotx/features/grouplist/GroupListViewState.kt +++ b/vector/src/main/java/im/vector/app/features/grouplist/GroupListViewState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.grouplist +package im.vector.app.features.grouplist import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState diff --git a/vector/src/main/java/im/vector/riotx/features/grouplist/GroupSummaryController.kt b/vector/src/main/java/im/vector/app/features/grouplist/GroupSummaryController.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/grouplist/GroupSummaryController.kt rename to vector/src/main/java/im/vector/app/features/grouplist/GroupSummaryController.kt index bc8e87b023..8ae1b6ceaa 100644 --- a/vector/src/main/java/im/vector/riotx/features/grouplist/GroupSummaryController.kt +++ b/vector/src/main/java/im/vector/app/features/grouplist/GroupSummaryController.kt @@ -15,12 +15,12 @@ * */ -package im.vector.riotx.features.grouplist +package im.vector.app.features.grouplist import com.airbnb.epoxy.EpoxyController +import im.vector.app.features.home.AvatarRenderer import im.vector.matrix.android.api.session.group.model.GroupSummary import im.vector.matrix.android.api.util.toMatrixItem -import im.vector.riotx.features.home.AvatarRenderer import javax.inject.Inject class GroupSummaryController @Inject constructor(private val avatarRenderer: AvatarRenderer) : EpoxyController() { diff --git a/vector/src/main/java/im/vector/riotx/features/grouplist/GroupSummaryItem.kt b/vector/src/main/java/im/vector/app/features/grouplist/GroupSummaryItem.kt similarity index 85% rename from vector/src/main/java/im/vector/riotx/features/grouplist/GroupSummaryItem.kt rename to vector/src/main/java/im/vector/app/features/grouplist/GroupSummaryItem.kt index 129e562581..88071db32a 100644 --- a/vector/src/main/java/im/vector/riotx/features/grouplist/GroupSummaryItem.kt +++ b/vector/src/main/java/im/vector/app/features/grouplist/GroupSummaryItem.kt @@ -15,18 +15,18 @@ * */ -package im.vector.riotx.features.grouplist +package im.vector.app.features.grouplist import android.widget.ImageView import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.platform.CheckableConstraintLayout +import im.vector.app.features.home.AvatarRenderer import im.vector.matrix.android.api.util.MatrixItem -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/riotx/features/grouplist/SelectedGroupDataSource.kt b/vector/src/main/java/im/vector/app/features/grouplist/SelectedGroupDataSource.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/grouplist/SelectedGroupDataSource.kt rename to vector/src/main/java/im/vector/app/features/grouplist/SelectedGroupDataSource.kt index a8f6b62cab..f680b7c193 100644 --- a/vector/src/main/java/im/vector/riotx/features/grouplist/SelectedGroupDataSource.kt +++ b/vector/src/main/java/im/vector/app/features/grouplist/SelectedGroupDataSource.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package im.vector.riotx.features.grouplist +package im.vector.app.features.grouplist import arrow.core.Option +import im.vector.app.core.utils.BehaviorDataSource import im.vector.matrix.android.api.session.group.model.GroupSummary -import im.vector.riotx.core.utils.BehaviorDataSource import javax.inject.Inject import javax.inject.Singleton diff --git a/vector/src/main/java/im/vector/riotx/features/home/AvatarRenderer.kt b/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/home/AvatarRenderer.kt rename to vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt index 3bf2f13d48..20974973c1 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/AvatarRenderer.kt +++ b/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home +package im.vector.app.features.home import android.content.Context import android.graphics.Bitmap @@ -28,14 +28,14 @@ import com.amulyakhare.textdrawable.TextDrawable import com.bumptech.glide.request.RequestOptions import com.bumptech.glide.request.target.DrawableImageViewTarget import com.bumptech.glide.request.target.Target +import im.vector.app.core.contacts.MappedContact +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.glide.GlideApp +import im.vector.app.core.glide.GlideRequest +import im.vector.app.core.glide.GlideRequests +import im.vector.app.core.utils.getColorFromUserId import im.vector.matrix.android.api.session.content.ContentUrlResolver import im.vector.matrix.android.api.util.MatrixItem -import im.vector.riotx.core.contacts.MappedContact -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 im.vector.riotx.core.utils.getColorFromUserId import javax.inject.Inject /** diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt rename to vector/src/main/java/im/vector/app/features/home/HomeActivity.kt index ef9bece7e6..ee51fbf72e 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt +++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home +package im.vector.app.features.home import android.content.Context import android.content.Intent @@ -29,29 +29,29 @@ import androidx.core.view.isVisible import androidx.drawerlayout.widget.DrawerLayout import com.airbnb.mvrx.MvRx import com.airbnb.mvrx.viewModel +import im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.extensions.hideKeyboard +import im.vector.app.core.extensions.replaceFragment +import im.vector.app.core.platform.ToolbarConfigurable +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.core.pushers.PushersManager +import im.vector.app.features.disclaimer.showDisclaimerDialog +import im.vector.app.features.notifications.NotificationDrawerManager +import im.vector.app.features.popup.DefaultVectorAlert +import im.vector.app.features.popup.PopupAlertManager +import im.vector.app.features.popup.VerificationVectorAlert +import im.vector.app.features.rageshake.VectorUncaughtExceptionHandler +import im.vector.app.features.settings.VectorPreferences +import im.vector.app.features.settings.VectorSettingsActivity +import im.vector.app.features.themes.ThemeUtils +import im.vector.app.features.workers.signout.ServerBackupStatusViewModel +import im.vector.app.features.workers.signout.ServerBackupStatusViewState +import im.vector.app.push.fcm.FcmHelper import im.vector.matrix.android.api.session.InitialSyncProgressService import im.vector.matrix.android.api.util.MatrixItem -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.exhaustive -import im.vector.riotx.core.extensions.hideKeyboard -import im.vector.riotx.core.extensions.replaceFragment -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.disclaimer.showDisclaimerDialog -import im.vector.riotx.features.notifications.NotificationDrawerManager -import im.vector.riotx.features.popup.DefaultVectorAlert -import im.vector.riotx.features.popup.PopupAlertManager -import im.vector.riotx.features.popup.VerificationVectorAlert -import im.vector.riotx.features.rageshake.VectorUncaughtExceptionHandler -import im.vector.riotx.features.settings.VectorPreferences -import im.vector.riotx.features.settings.VectorSettingsActivity -import im.vector.riotx.features.themes.ThemeUtils -import im.vector.riotx.features.workers.signout.ServerBackupStatusViewModel -import im.vector.riotx.features.workers.signout.ServerBackupStatusViewState -import im.vector.riotx.push.fcm.FcmHelper import kotlinx.android.parcel.Parcelize import kotlinx.android.synthetic.main.activity_home.* import kotlinx.android.synthetic.main.merge_overlay_waiting_view.* diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeActivitySharedAction.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/home/HomeActivitySharedAction.kt rename to vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt index 49c8de4d8f..52b3c58785 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/HomeActivitySharedAction.kt +++ b/vector/src/main/java/im/vector/app/features/home/HomeActivitySharedAction.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.home +package im.vector.app.features.home -import im.vector.riotx.core.platform.VectorSharedAction +import im.vector.app.core.platform.VectorSharedAction /** * Supported navigation actions for [HomeActivity] diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewActions.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewActions.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewActions.kt rename to vector/src/main/java/im/vector/app/features/home/HomeActivityViewActions.kt index 605e0916c7..9df45e4553 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewActions.kt +++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewActions.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.home +package im.vector.app.features.home -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction sealed class HomeActivityViewActions : VectorViewModelAction { object PushPromptHasBeenReviewed : HomeActivityViewActions() diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewEvents.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewEvents.kt rename to vector/src/main/java/im/vector/app/features/home/HomeActivityViewEvents.kt index 03004d0b73..74659d2657 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewEvents.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.home +package im.vector.app.features.home +import im.vector.app.core.platform.VectorViewEvents import im.vector.matrix.android.api.util.MatrixItem -import im.vector.riotx.core.platform.VectorViewEvents sealed class HomeActivityViewEvents : VectorViewEvents { data class AskPasswordToInitCrossSigning(val userItem: MatrixItem.UserItem?) : HomeActivityViewEvents() diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewModel.kt rename to vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt index ba95d1d43d..d11534211e 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home +package im.vector.app.features.home import androidx.lifecycle.viewModelScope import com.airbnb.mvrx.MvRx @@ -22,6 +22,11 @@ import com.airbnb.mvrx.MvRxViewModelFactory import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.features.login.ReAuthHelper +import im.vector.app.features.settings.VectorPreferences import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.NoOpMatrixCallback import im.vector.matrix.android.api.pushrules.RuleIds @@ -33,11 +38,6 @@ import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap import im.vector.matrix.android.internal.crypto.model.rest.UserPasswordAuth import im.vector.matrix.rx.asObservable -import im.vector.riotx.core.di.ActiveSessionHolder -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.features.login.ReAuthHelper -import im.vector.riotx.features.settings.VectorPreferences import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.launch diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewState.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewState.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewState.kt rename to vector/src/main/java/im/vector/app/features/home/HomeActivityViewState.kt index 2b29305c71..48e81f215c 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewState.kt +++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home +package im.vector.app.features.home import com.airbnb.mvrx.MvRxState import im.vector.matrix.android.api.session.InitialSyncProgressService diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeDetailAction.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailAction.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/home/HomeDetailAction.kt rename to vector/src/main/java/im/vector/app/features/home/HomeDetailAction.kt index 3309f987fd..447820ed7b 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/HomeDetailAction.kt +++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailAction.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.home +package im.vector.app.features.home -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction sealed class HomeDetailAction : VectorViewModelAction { data class SwitchDisplayMode(val displayMode: RoomListDisplayMode) : HomeDetailAction() diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/home/HomeDetailFragment.kt rename to vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt index 65a599665e..83686575b1 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/HomeDetailFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home +package im.vector.app.features.home import android.os.Bundle import android.view.View @@ -24,31 +24,31 @@ import com.airbnb.mvrx.activityViewModel import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState import com.google.android.material.badge.BadgeDrawable +import im.vector.app.R +import im.vector.app.core.extensions.commitTransaction +import im.vector.app.core.glide.GlideApp +import im.vector.app.core.platform.ToolbarConfigurable +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.ui.views.ActiveCallView +import im.vector.app.core.ui.views.ActiveCallViewHolder +import im.vector.app.core.ui.views.KeysBackupBanner +import im.vector.app.features.call.SharedActiveCallViewModel +import im.vector.app.features.call.VectorCallActivity +import im.vector.app.features.call.WebRtcPeerConnectionManager +import im.vector.app.features.home.room.list.RoomListFragment +import im.vector.app.features.home.room.list.RoomListParams +import im.vector.app.features.popup.PopupAlertManager +import im.vector.app.features.popup.VerificationVectorAlert +import im.vector.app.features.settings.VectorPreferences +import im.vector.app.features.settings.VectorSettingsActivity.Companion.EXTRA_DIRECT_ACCESS_SECURITY_PRIVACY_MANAGE_SESSIONS +import im.vector.app.features.themes.ThemeUtils +import im.vector.app.features.workers.signout.BannerState +import im.vector.app.features.workers.signout.ServerBackupStatusViewModel +import im.vector.app.features.workers.signout.ServerBackupStatusViewState import im.vector.matrix.android.api.session.group.model.GroupSummary import im.vector.matrix.android.api.util.toMatrixItem import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo -import im.vector.riotx.R -import im.vector.riotx.core.extensions.commitTransaction -import im.vector.riotx.core.glide.GlideApp -import im.vector.riotx.core.platform.ToolbarConfigurable -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.ui.views.ActiveCallView -import im.vector.riotx.core.ui.views.ActiveCallViewHolder -import im.vector.riotx.core.ui.views.KeysBackupBanner -import im.vector.riotx.features.call.SharedActiveCallViewModel -import im.vector.riotx.features.call.VectorCallActivity -import im.vector.riotx.features.call.WebRtcPeerConnectionManager -import im.vector.riotx.features.home.room.list.RoomListFragment -import im.vector.riotx.features.home.room.list.RoomListParams -import im.vector.riotx.features.popup.PopupAlertManager -import im.vector.riotx.features.popup.VerificationVectorAlert -import im.vector.riotx.features.settings.VectorPreferences -import im.vector.riotx.features.settings.VectorSettingsActivity.Companion.EXTRA_DIRECT_ACCESS_SECURITY_PRIVACY_MANAGE_SESSIONS -import im.vector.riotx.features.themes.ThemeUtils -import im.vector.riotx.features.workers.signout.BannerState -import im.vector.riotx.features.workers.signout.ServerBackupStatusViewModel -import im.vector.riotx.features.workers.signout.ServerBackupStatusViewState import kotlinx.android.synthetic.main.fragment_home_detail.* import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewModel.kt rename to vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt index 98bd3a76ab..be7e9493ca 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt @@ -14,22 +14,22 @@ * limitations under the License. */ -package im.vector.riotx.features.home +package im.vector.app.features.home import com.airbnb.mvrx.FragmentViewModelContext import com.airbnb.mvrx.MvRxViewModelFactory import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.core.di.HasScreenInjector +import im.vector.app.core.platform.EmptyViewEvents +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.grouplist.SelectedGroupDataSource +import im.vector.app.features.ui.UiStateRepository 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.riotx.core.di.HasScreenInjector -import im.vector.riotx.core.platform.EmptyViewEvents -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.grouplist.SelectedGroupDataSource -import im.vector.riotx.features.ui.UiStateRepository import io.reactivex.schedulers.Schedulers /** diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewState.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewState.kt rename to vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt index a9a838195b..f6bca46343 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewState.kt +++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home +package im.vector.app.features.home import arrow.core.Option import com.airbnb.mvrx.Async diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeDrawerFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/home/HomeDrawerFragment.kt rename to vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt index 3439b1793c..a5e9e519d2 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/HomeDrawerFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotx.features.home +package im.vector.app.features.home import android.os.Bundle import android.view.View +import im.vector.app.R +import im.vector.app.core.extensions.observeK +import im.vector.app.core.extensions.replaceChildFragment +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.features.grouplist.GroupListFragment import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.util.toMatrixItem -import im.vector.riotx.R -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.grouplist.GroupListFragment import kotlinx.android.synthetic.main.fragment_home_drawer.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeModule.kt b/vector/src/main/java/im/vector/app/features/home/HomeModule.kt similarity index 80% rename from vector/src/main/java/im/vector/riotx/features/home/HomeModule.kt rename to vector/src/main/java/im/vector/app/features/home/HomeModule.kt index ba6949c2bf..5c34d0715d 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/HomeModule.kt +++ b/vector/src/main/java/im/vector/app/features/home/HomeModule.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package im.vector.riotx.features.home +package im.vector.app.features.home import android.os.Handler import dagger.Module import dagger.Provides -import im.vector.riotx.features.home.room.detail.timeline.TimelineEventControllerHandler -import im.vector.riotx.features.home.room.detail.timeline.helper.TimelineAsyncHelper +import im.vector.app.features.home.room.detail.timeline.TimelineEventControllerHandler +import im.vector.app.features.home.room.detail.timeline.helper.TimelineAsyncHelper @Module object HomeModule { diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeRoomListDataSource.kt b/vector/src/main/java/im/vector/app/features/home/HomeRoomListDataSource.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/home/HomeRoomListDataSource.kt rename to vector/src/main/java/im/vector/app/features/home/HomeRoomListDataSource.kt index c27a58d177..80983e73c8 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/HomeRoomListDataSource.kt +++ b/vector/src/main/java/im/vector/app/features/home/HomeRoomListDataSource.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.home +package im.vector.app.features.home +import im.vector.app.core.utils.BehaviorDataSource import im.vector.matrix.android.api.session.room.model.RoomSummary -import im.vector.riotx.core.utils.BehaviorDataSource import javax.inject.Inject import javax.inject.Singleton diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeSharedActionViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeSharedActionViewModel.kt similarity index 87% rename from vector/src/main/java/im/vector/riotx/features/home/HomeSharedActionViewModel.kt rename to vector/src/main/java/im/vector/app/features/home/HomeSharedActionViewModel.kt index cd81448a0a..58747a4c18 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/HomeSharedActionViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/home/HomeSharedActionViewModel.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.home +package im.vector.app.features.home -import im.vector.riotx.core.platform.VectorSharedActionViewModel +import im.vector.app.core.platform.VectorSharedActionViewModel import javax.inject.Inject class HomeSharedActionViewModel @Inject constructor() : VectorSharedActionViewModel() diff --git a/vector/src/main/java/im/vector/riotx/features/home/LoadingFragment.kt b/vector/src/main/java/im/vector/app/features/home/LoadingFragment.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/home/LoadingFragment.kt rename to vector/src/main/java/im/vector/app/features/home/LoadingFragment.kt index e376514955..b3c80b3642 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/LoadingFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/LoadingFragment.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package im.vector.riotx.features.home +package im.vector.app.features.home import android.graphics.drawable.AnimationDrawable import android.os.Bundle import android.view.View -import im.vector.riotx.R -import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.app.R +import im.vector.app.core.platform.VectorBaseFragment import kotlinx.android.synthetic.main.fragment_loading.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/home/RoomColor.kt b/vector/src/main/java/im/vector/app/features/home/RoomColor.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/home/RoomColor.kt rename to vector/src/main/java/im/vector/app/features/home/RoomColor.kt index 0b3fd5396f..88ec582c92 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/RoomColor.kt +++ b/vector/src/main/java/im/vector/app/features/home/RoomColor.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.home +package im.vector.app.features.home import androidx.annotation.ColorRes -import im.vector.riotx.R +import im.vector.app.R @ColorRes fun getColorFromRoomId(roomId: String?): Int { diff --git a/vector/src/main/java/im/vector/riotx/features/home/RoomListDisplayMode.kt b/vector/src/main/java/im/vector/app/features/home/RoomListDisplayMode.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/home/RoomListDisplayMode.kt rename to vector/src/main/java/im/vector/app/features/home/RoomListDisplayMode.kt index 365eda74a8..d52d4be6dd 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/RoomListDisplayMode.kt +++ b/vector/src/main/java/im/vector/app/features/home/RoomListDisplayMode.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.home +package im.vector.app.features.home import androidx.annotation.StringRes -import im.vector.riotx.R +import im.vector.app.R enum class RoomListDisplayMode(@StringRes val titleRes: Int) { NOTIFICATIONS(R.string.bottom_action_notification), diff --git a/vector/src/main/java/im/vector/riotx/features/home/ShortcutsHandler.kt b/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/home/ShortcutsHandler.kt rename to vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt index 805014a81e..5d27f8ca69 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/ShortcutsHandler.kt +++ b/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home +package im.vector.app.features.home import android.content.Context import android.content.pm.ShortcutManager @@ -23,10 +23,10 @@ import android.os.Build import androidx.core.content.pm.ShortcutInfoCompat import androidx.core.content.pm.ShortcutManagerCompat import androidx.core.graphics.drawable.IconCompat +import im.vector.app.core.glide.GlideApp +import im.vector.app.core.utils.DimensionConverter +import im.vector.app.features.home.room.detail.RoomDetailActivity import im.vector.matrix.android.api.util.toMatrixItem -import im.vector.riotx.core.glide.GlideApp -import im.vector.riotx.core.utils.DimensionConverter -import im.vector.riotx.features.home.room.detail.RoomDetailActivity import io.reactivex.Observable import io.reactivex.disposables.Disposable import io.reactivex.schedulers.Schedulers diff --git a/vector/src/main/java/im/vector/riotx/features/home/UnknownDeviceDetectorSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/home/UnknownDeviceDetectorSharedViewModel.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/home/UnknownDeviceDetectorSharedViewModel.kt rename to vector/src/main/java/im/vector/app/features/home/UnknownDeviceDetectorSharedViewModel.kt index a61d726ac7..1e440fdc00 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/UnknownDeviceDetectorSharedViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/home/UnknownDeviceDetectorSharedViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home +package im.vector.app.features.home import com.airbnb.mvrx.ActivityViewModelContext import com.airbnb.mvrx.Async @@ -26,6 +26,10 @@ import com.airbnb.mvrx.Uninitialized import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.core.platform.EmptyViewEvents +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.core.platform.VectorViewModelAction +import im.vector.app.features.settings.VectorPreferences import im.vector.matrix.android.api.NoOpMatrixCallback import im.vector.matrix.android.api.extensions.orFalse import im.vector.matrix.android.api.session.Session @@ -36,10 +40,6 @@ import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo import im.vector.matrix.android.internal.crypto.store.PrivateKeysInfo import im.vector.matrix.rx.rx -import im.vector.riotx.core.platform.EmptyViewEvents -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.core.platform.VectorViewModelAction -import im.vector.riotx.features.settings.VectorPreferences import io.reactivex.Observable import io.reactivex.functions.Function3 import timber.log.Timber diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsAnimator.kt b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsAnimator.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsAnimator.kt rename to vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsAnimator.kt index 2e849dfe38..86494ffbed 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsAnimator.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsAnimator.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.breadcrumbs +package im.vector.app.features.home.room.breadcrumbs import androidx.recyclerview.widget.DefaultItemAnimator diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsController.kt b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsController.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsController.kt rename to vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsController.kt index df0f0845b5..484bd6a3b8 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsController.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsController.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.breadcrumbs +package im.vector.app.features.home.room.breadcrumbs import android.view.View import com.airbnb.epoxy.EpoxyController +import im.vector.app.core.epoxy.zeroItem +import im.vector.app.core.utils.DebouncedClickListener +import im.vector.app.features.home.AvatarRenderer import im.vector.matrix.android.api.util.toMatrixItem -import im.vector.riotx.core.epoxy.zeroItem -import im.vector.riotx.core.utils.DebouncedClickListener -import im.vector.riotx.features.home.AvatarRenderer import javax.inject.Inject class BreadcrumbsController @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsFragment.kt similarity index 85% rename from vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsFragment.kt rename to vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsFragment.kt index 6bae5b604f..c147985809 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsFragment.kt @@ -14,18 +14,18 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.breadcrumbs +package im.vector.app.features.home.room.breadcrumbs import android.os.Bundle import android.view.View import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.features.home.room.detail.RoomDetailSharedAction -import im.vector.riotx.features.home.room.detail.RoomDetailSharedActionViewModel +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.features.home.room.detail.RoomDetailSharedAction +import im.vector.app.features.home.room.detail.RoomDetailSharedActionViewModel import kotlinx.android.synthetic.main.fragment_breadcrumbs.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsItem.kt b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.kt index 3e97c6103c..99cb8d3d03 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.breadcrumbs +package im.vector.app.features.home.room.breadcrumbs import android.view.View import android.view.ViewGroup @@ -22,12 +22,12 @@ import android.widget.ImageView import androidx.core.view.isVisible import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.home.room.list.UnreadCounterBadgeView import im.vector.matrix.android.api.util.MatrixItem -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 -import im.vector.riotx.features.home.room.list.UnreadCounterBadgeView @EpoxyModelClass(layout = R.layout.item_breadcrumbs) abstract class BreadcrumbsItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsViewModel.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsViewModel.kt rename to vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsViewModel.kt index 2e847176ff..d98e31abcb 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsViewModel.kt @@ -14,21 +14,21 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.breadcrumbs +package im.vector.app.features.home.room.breadcrumbs import com.airbnb.mvrx.FragmentViewModelContext import com.airbnb.mvrx.MvRxViewModelFactory import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.core.platform.EmptyAction +import im.vector.app.core.platform.EmptyViewEvents +import im.vector.app.core.platform.VectorViewModel import im.vector.matrix.android.api.query.QueryStringValue 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.roomSummaryQueryParams import im.vector.matrix.rx.rx -import im.vector.riotx.core.platform.EmptyAction -import im.vector.riotx.core.platform.EmptyViewEvents -import im.vector.riotx.core.platform.VectorViewModel import io.reactivex.schedulers.Schedulers class BreadcrumbsViewModel @AssistedInject constructor(@Assisted initialState: BreadcrumbsViewState, diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsViewState.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsViewState.kt rename to vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsViewState.kt index 7cc634c8b0..e5b6df3874 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/breadcrumbs/BreadcrumbsViewState.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsViewState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.breadcrumbs +package im.vector.app.features.home.room.breadcrumbs import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/AutoCompleter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/AutoCompleter.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt index edc77bc83e..69288dd633 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/AutoCompleter.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail +package im.vector.app.features.home.room.detail import android.graphics.drawable.ColorDrawable import android.graphics.drawable.Drawable @@ -26,25 +26,25 @@ import com.otaliastudios.autocomplete.AutocompleteCallback import com.otaliastudios.autocomplete.CharPolicy import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.R +import im.vector.app.core.glide.GlideApp +import im.vector.app.core.glide.GlideRequests +import im.vector.app.features.autocomplete.command.AutocompleteCommandPresenter +import im.vector.app.features.autocomplete.command.CommandAutocompletePolicy +import im.vector.app.features.autocomplete.emoji.AutocompleteEmojiPresenter +import im.vector.app.features.autocomplete.group.AutocompleteGroupPresenter +import im.vector.app.features.autocomplete.member.AutocompleteMemberPresenter +import im.vector.app.features.autocomplete.room.AutocompleteRoomPresenter +import im.vector.app.features.command.Command +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.html.PillImageSpan +import im.vector.app.features.themes.ThemeUtils import im.vector.matrix.android.api.session.group.model.GroupSummary import im.vector.matrix.android.api.session.room.model.RoomMemberSummary import im.vector.matrix.android.api.session.room.model.RoomSummary import im.vector.matrix.android.api.util.MatrixItem import im.vector.matrix.android.api.util.toMatrixItem import im.vector.matrix.android.api.util.toRoomAliasMatrixItem -import im.vector.riotx.R -import im.vector.riotx.core.glide.GlideApp -import im.vector.riotx.core.glide.GlideRequests -import im.vector.riotx.features.autocomplete.command.AutocompleteCommandPresenter -import im.vector.riotx.features.autocomplete.command.CommandAutocompletePolicy -import im.vector.riotx.features.autocomplete.emoji.AutocompleteEmojiPresenter -import im.vector.riotx.features.autocomplete.group.AutocompleteGroupPresenter -import im.vector.riotx.features.autocomplete.member.AutocompleteMemberPresenter -import im.vector.riotx.features.autocomplete.room.AutocompleteRoomPresenter -import im.vector.riotx.features.command.Command -import im.vector.riotx.features.home.AvatarRenderer -import im.vector.riotx.features.html.PillImageSpan -import im.vector.riotx.features.themes.ThemeUtils class AutoCompleter @AssistedInject constructor( @Assisted val roomId: String, diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/JumpToBottomViewVisibilityManager.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/JumpToBottomViewVisibilityManager.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/JumpToBottomViewVisibilityManager.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/JumpToBottomViewVisibilityManager.kt index 50a28b8a8b..d3f9b6eda5 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/JumpToBottomViewVisibilityManager.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/JumpToBottomViewVisibilityManager.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail +package im.vector.app.features.home.room.detail import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.google.android.material.floatingactionbutton.FloatingActionButton -import im.vector.riotx.core.utils.Debouncer +import im.vector.app.core.utils.Debouncer /** * Show or hide the jumpToBottomView, depending on the scrolling and if the timeline is displaying the more recent event diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailAction.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt index c664e7e62c..1db541f8c3 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailAction.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail +package im.vector.app.features.home.room.detail +import im.vector.app.core.platform.VectorViewModelAction import im.vector.matrix.android.api.session.content.ContentAttachmentData import im.vector.matrix.android.api.session.events.model.Event import im.vector.matrix.android.api.session.room.model.message.MessageStickerContent import im.vector.matrix.android.api.session.room.model.message.MessageWithAttachmentContent import im.vector.matrix.android.api.session.room.timeline.Timeline import im.vector.matrix.android.api.session.room.timeline.TimelineEvent -import im.vector.riotx.core.platform.VectorViewModelAction sealed class RoomDetailAction : VectorViewModelAction { data class UserIsTyping(val isTyping: Boolean) : RoomDetailAction() diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailActivity.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailActivity.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt index cd36222d9a..58eb77b454 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailActivity.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail +package im.vector.app.features.home.room.detail import android.content.Context import android.content.Intent @@ -24,17 +24,17 @@ import androidx.appcompat.widget.Toolbar import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import com.airbnb.mvrx.viewModel -import im.vector.riotx.R -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.extensions.hideKeyboard -import im.vector.riotx.core.extensions.replaceFragment -import im.vector.riotx.core.platform.ToolbarConfigurable -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.features.home.room.breadcrumbs.BreadcrumbsFragment -import im.vector.riotx.features.room.RequireActiveMembershipAction -import im.vector.riotx.features.room.RequireActiveMembershipViewEvents -import im.vector.riotx.features.room.RequireActiveMembershipViewModel -import im.vector.riotx.features.room.RequireActiveMembershipViewState +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.extensions.hideKeyboard +import im.vector.app.core.extensions.replaceFragment +import im.vector.app.core.platform.ToolbarConfigurable +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.features.home.room.breadcrumbs.BreadcrumbsFragment +import im.vector.app.features.room.RequireActiveMembershipAction +import im.vector.app.features.room.RequireActiveMembershipViewEvents +import im.vector.app.features.room.RequireActiveMembershipViewModel +import im.vector.app.features.room.RequireActiveMembershipViewState import kotlinx.android.synthetic.main.activity_room_detail.* import kotlinx.android.synthetic.main.merge_overlay_waiting_view.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt index 3c65b6281f..cb568a46a8 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail +package im.vector.app.features.home.room.detail import android.annotation.SuppressLint import android.app.Activity.RESULT_OK @@ -61,6 +61,92 @@ import com.airbnb.mvrx.withState import com.google.android.material.snackbar.Snackbar import com.google.android.material.textfield.TextInputEditText import com.jakewharton.rxbinding3.widget.textChanges +import im.vector.app.R +import im.vector.app.core.dialogs.ConfirmationDialogBuilder +import im.vector.app.core.dialogs.withColoredButton +import im.vector.app.core.epoxy.LayoutManagerStateRestorer +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.extensions.hideKeyboard +import im.vector.app.core.extensions.setTextOrHide +import im.vector.app.core.extensions.showKeyboard +import im.vector.app.core.extensions.trackItemsVisibilityChange +import im.vector.app.core.glide.GlideApp +import im.vector.app.core.intent.getMimeTypeFromUri +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.ui.views.ActiveCallView +import im.vector.app.core.ui.views.ActiveCallViewHolder +import im.vector.app.core.ui.views.JumpToReadMarkerView +import im.vector.app.core.ui.views.NotificationAreaView +import im.vector.app.core.utils.Debouncer +import im.vector.app.core.utils.KeyboardStateUtils +import im.vector.app.core.utils.PERMISSIONS_FOR_AUDIO_IP_CALL +import im.vector.app.core.utils.PERMISSIONS_FOR_VIDEO_IP_CALL +import im.vector.app.core.utils.PERMISSIONS_FOR_WRITING_FILES +import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_INCOMING_URI +import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_PICK_ATTACHMENT +import im.vector.app.core.utils.TextUtils +import im.vector.app.core.utils.allGranted +import im.vector.app.core.utils.checkPermissions +import im.vector.app.core.utils.colorizeMatchingText +import im.vector.app.core.utils.copyToClipboard +import im.vector.app.core.utils.createJSonViewerStyleProvider +import im.vector.app.core.utils.createUIHandler +import im.vector.app.core.utils.getColorFromUserId +import im.vector.app.core.utils.isValidUrl +import im.vector.app.core.utils.onPermissionResultAudioIpCall +import im.vector.app.core.utils.onPermissionResultVideoIpCall +import im.vector.app.core.utils.openUrlInExternalBrowser +import im.vector.app.core.utils.saveMedia +import im.vector.app.core.utils.shareMedia +import im.vector.app.core.utils.toast +import im.vector.app.features.attachments.AttachmentTypeSelectorView +import im.vector.app.features.attachments.AttachmentsHelper +import im.vector.app.features.attachments.ContactAttachment +import im.vector.app.features.attachments.preview.AttachmentsPreviewActivity +import im.vector.app.features.attachments.preview.AttachmentsPreviewArgs +import im.vector.app.features.attachments.toGroupedContentAttachmentData +import im.vector.app.features.call.SharedActiveCallViewModel +import im.vector.app.features.call.VectorCallActivity +import im.vector.app.features.call.WebRtcPeerConnectionManager +import im.vector.app.features.command.Command +import im.vector.app.features.crypto.keysbackup.restore.KeysBackupRestoreActivity +import im.vector.app.features.crypto.util.toImageRes +import im.vector.app.features.crypto.verification.VerificationBottomSheet +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.home.room.detail.composer.TextComposerView +import im.vector.app.features.home.room.detail.readreceipts.DisplayReadReceiptsBottomSheet +import im.vector.app.features.home.room.detail.timeline.TimelineEventController +import im.vector.app.features.home.room.detail.timeline.action.EventSharedAction +import im.vector.app.features.home.room.detail.timeline.action.MessageActionsBottomSheet +import im.vector.app.features.home.room.detail.timeline.action.MessageSharedActionViewModel +import im.vector.app.features.home.room.detail.timeline.edithistory.ViewEditHistoryBottomSheet +import im.vector.app.features.home.room.detail.timeline.item.AbsMessageItem +import im.vector.app.features.home.room.detail.timeline.item.MessageFileItem +import im.vector.app.features.home.room.detail.timeline.item.MessageImageVideoItem +import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData +import im.vector.app.features.home.room.detail.timeline.item.MessageTextItem +import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptData +import im.vector.app.features.home.room.detail.timeline.reactions.ViewReactionsBottomSheet +import im.vector.app.features.home.room.detail.widget.RoomWidgetsBannerView +import im.vector.app.features.home.room.detail.widget.RoomWidgetsBottomSheet +import im.vector.app.features.home.room.detail.widget.WidgetRequestCodes +import im.vector.app.features.html.EventHtmlRenderer +import im.vector.app.features.html.PillImageSpan +import im.vector.app.features.invite.VectorInviteView +import im.vector.app.features.media.ImageContentRenderer +import im.vector.app.features.media.VideoContentRenderer +import im.vector.app.features.notifications.NotificationDrawerManager +import im.vector.app.features.notifications.NotificationUtils +import im.vector.app.features.permalink.NavigationInterceptor +import im.vector.app.features.permalink.PermalinkHandler +import im.vector.app.features.reactions.EmojiReactionPickerActivity +import im.vector.app.features.settings.VectorPreferences +import im.vector.app.features.settings.VectorSettingsActivity +import im.vector.app.features.share.SharedData +import im.vector.app.features.themes.ThemeUtils +import im.vector.app.features.widgets.WidgetActivity import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.permalinks.PermalinkFactory import im.vector.matrix.android.api.session.Session @@ -89,92 +175,6 @@ import im.vector.matrix.android.api.util.toMatrixItem import im.vector.matrix.android.internal.crypto.attachments.toElementToDecrypt import im.vector.matrix.android.internal.crypto.model.event.EncryptedEventContent import im.vector.matrix.android.internal.crypto.model.event.WithHeldCode -import im.vector.riotx.R -import im.vector.riotx.core.dialogs.ConfirmationDialogBuilder -import im.vector.riotx.core.dialogs.withColoredButton -import im.vector.riotx.core.epoxy.LayoutManagerStateRestorer -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.extensions.hideKeyboard -import im.vector.riotx.core.extensions.setTextOrHide -import im.vector.riotx.core.extensions.showKeyboard -import im.vector.riotx.core.extensions.trackItemsVisibilityChange -import im.vector.riotx.core.glide.GlideApp -import im.vector.riotx.core.intent.getMimeTypeFromUri -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.ui.views.ActiveCallView -import im.vector.riotx.core.ui.views.ActiveCallViewHolder -import im.vector.riotx.core.ui.views.JumpToReadMarkerView -import im.vector.riotx.core.ui.views.NotificationAreaView -import im.vector.riotx.core.utils.Debouncer -import im.vector.riotx.core.utils.KeyboardStateUtils -import im.vector.riotx.core.utils.PERMISSIONS_FOR_AUDIO_IP_CALL -import im.vector.riotx.core.utils.PERMISSIONS_FOR_VIDEO_IP_CALL -import im.vector.riotx.core.utils.PERMISSIONS_FOR_WRITING_FILES -import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_INCOMING_URI -import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_PICK_ATTACHMENT -import im.vector.riotx.core.utils.TextUtils -import im.vector.riotx.core.utils.allGranted -import im.vector.riotx.core.utils.checkPermissions -import im.vector.riotx.core.utils.colorizeMatchingText -import im.vector.riotx.core.utils.copyToClipboard -import im.vector.riotx.core.utils.createJSonViewerStyleProvider -import im.vector.riotx.core.utils.createUIHandler -import im.vector.riotx.core.utils.getColorFromUserId -import im.vector.riotx.core.utils.isValidUrl -import im.vector.riotx.core.utils.onPermissionResultAudioIpCall -import im.vector.riotx.core.utils.onPermissionResultVideoIpCall -import im.vector.riotx.core.utils.openUrlInExternalBrowser -import im.vector.riotx.core.utils.saveMedia -import im.vector.riotx.core.utils.shareMedia -import im.vector.riotx.core.utils.toast -import im.vector.riotx.features.attachments.AttachmentTypeSelectorView -import im.vector.riotx.features.attachments.AttachmentsHelper -import im.vector.riotx.features.attachments.ContactAttachment -import im.vector.riotx.features.attachments.preview.AttachmentsPreviewActivity -import im.vector.riotx.features.attachments.preview.AttachmentsPreviewArgs -import im.vector.riotx.features.attachments.toGroupedContentAttachmentData -import im.vector.riotx.features.call.SharedActiveCallViewModel -import im.vector.riotx.features.call.VectorCallActivity -import im.vector.riotx.features.call.WebRtcPeerConnectionManager -import im.vector.riotx.features.command.Command -import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreActivity -import im.vector.riotx.features.crypto.util.toImageRes -import im.vector.riotx.features.crypto.verification.VerificationBottomSheet -import im.vector.riotx.features.home.AvatarRenderer -import im.vector.riotx.features.home.room.detail.composer.TextComposerView -import im.vector.riotx.features.home.room.detail.readreceipts.DisplayReadReceiptsBottomSheet -import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController -import im.vector.riotx.features.home.room.detail.timeline.action.EventSharedAction -import im.vector.riotx.features.home.room.detail.timeline.action.MessageActionsBottomSheet -import im.vector.riotx.features.home.room.detail.timeline.action.MessageSharedActionViewModel -import im.vector.riotx.features.home.room.detail.timeline.edithistory.ViewEditHistoryBottomSheet -import im.vector.riotx.features.home.room.detail.timeline.item.AbsMessageItem -import im.vector.riotx.features.home.room.detail.timeline.item.MessageFileItem -import im.vector.riotx.features.home.room.detail.timeline.item.MessageImageVideoItem -import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData -import im.vector.riotx.features.home.room.detail.timeline.item.MessageTextItem -import im.vector.riotx.features.home.room.detail.timeline.item.ReadReceiptData -import im.vector.riotx.features.home.room.detail.timeline.reactions.ViewReactionsBottomSheet -import im.vector.riotx.features.home.room.detail.widget.RoomWidgetsBannerView -import im.vector.riotx.features.home.room.detail.widget.RoomWidgetsBottomSheet -import im.vector.riotx.features.home.room.detail.widget.WidgetRequestCodes -import im.vector.riotx.features.html.EventHtmlRenderer -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.VideoContentRenderer -import im.vector.riotx.features.notifications.NotificationDrawerManager -import im.vector.riotx.features.notifications.NotificationUtils -import im.vector.riotx.features.permalink.NavigationInterceptor -import im.vector.riotx.features.permalink.PermalinkHandler -import im.vector.riotx.features.reactions.EmojiReactionPickerActivity -import im.vector.riotx.features.settings.VectorPreferences -import im.vector.riotx.features.settings.VectorSettingsActivity -import im.vector.riotx.features.share.SharedData -import im.vector.riotx.features.themes.ThemeUtils -import im.vector.riotx.features.widgets.WidgetActivity import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers import kotlinx.android.parcel.Parcelize diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailSharedAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailSharedAction.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailSharedAction.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailSharedAction.kt index 95dd34ebb8..1b4435bf57 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailSharedAction.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailSharedAction.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail +package im.vector.app.features.home.room.detail -import im.vector.riotx.core.platform.VectorSharedAction +import im.vector.app.core.platform.VectorSharedAction /** * Supported navigation actions for [RoomDetailActivity] diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailSharedActionViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailSharedActionViewModel.kt similarity index 87% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailSharedActionViewModel.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailSharedActionViewModel.kt index 6f2162bebc..065be461f3 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailSharedActionViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailSharedActionViewModel.kt @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.home.room.detail +package im.vector.app.features.home.room.detail -import im.vector.riotx.core.platform.VectorSharedActionViewModel +import im.vector.app.core.platform.VectorSharedActionViewModel import javax.inject.Inject /** diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewEvents.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt index b4c1f751bc..669959f5f4 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail +package im.vector.app.features.home.room.detail import android.net.Uri import androidx.annotation.StringRes +import im.vector.app.core.platform.VectorViewEvents +import im.vector.app.features.command.Command import im.vector.matrix.android.api.session.widgets.model.Widget import im.vector.matrix.android.internal.crypto.model.event.WithHeldCode -import im.vector.riotx.core.platform.VectorViewEvents -import im.vector.riotx.features.command.Command import java.io.File /** diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt index 2bec8017f0..89ac0e8204 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail +package im.vector.app.features.home.room.detail import android.net.Uri import androidx.annotation.IdRes @@ -27,6 +27,23 @@ import com.jakewharton.rxrelay2.BehaviorRelay import com.jakewharton.rxrelay2.PublishRelay import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.R +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.resources.UserPreferencesProvider +import im.vector.app.core.utils.subscribeLogError +import im.vector.app.features.call.WebRtcPeerConnectionManager +import im.vector.app.features.command.CommandParser +import im.vector.app.features.command.ParsedCommand +import im.vector.app.features.crypto.verification.SupportedVerificationMethodsProvider +import im.vector.app.features.home.room.detail.composer.rainbow.RainbowGenerator +import im.vector.app.features.home.room.detail.sticker.StickerPickerActionHandler +import im.vector.app.features.home.room.detail.timeline.helper.RoomSummaryHolder +import im.vector.app.features.home.room.detail.timeline.helper.TimelineDisplayableEvents +import im.vector.app.features.home.room.typing.TypingHelper +import im.vector.app.features.powerlevel.PowerLevelsObservableFactory +import im.vector.app.features.settings.VectorPreferences import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.MatrixPatterns import im.vector.matrix.android.api.NoOpMatrixCallback @@ -65,23 +82,6 @@ import im.vector.matrix.android.internal.crypto.model.event.EncryptedEventConten import im.vector.matrix.android.internal.crypto.model.event.WithHeldCode import im.vector.matrix.rx.rx import im.vector.matrix.rx.unwrap -import im.vector.riotx.R -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.core.resources.UserPreferencesProvider -import im.vector.riotx.core.utils.subscribeLogError -import im.vector.riotx.features.call.WebRtcPeerConnectionManager -import im.vector.riotx.features.command.CommandParser -import im.vector.riotx.features.command.ParsedCommand -import im.vector.riotx.features.crypto.verification.SupportedVerificationMethodsProvider -import im.vector.riotx.features.home.room.detail.composer.rainbow.RainbowGenerator -import im.vector.riotx.features.home.room.detail.sticker.StickerPickerActionHandler -import im.vector.riotx.features.home.room.detail.timeline.helper.RoomSummaryHolder -import im.vector.riotx.features.home.room.detail.timeline.helper.TimelineDisplayableEvents -import im.vector.riotx.features.home.room.typing.TypingHelper -import im.vector.riotx.features.powerlevel.PowerLevelsObservableFactory -import im.vector.riotx.features.settings.VectorPreferences import io.reactivex.Observable import io.reactivex.functions.BiFunction import io.reactivex.rxkotlin.subscribeBy diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewState.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt index 6800850c48..5451be62e0 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailViewState.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail +package im.vector.app.features.home.room.detail import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomMessageTouchHelperCallback.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomMessageTouchHelperCallback.kt similarity index 99% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomMessageTouchHelperCallback.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/RoomMessageTouchHelperCallback.kt index 4616cb4b25..ef13865374 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomMessageTouchHelperCallback.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomMessageTouchHelperCallback.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.home.room.detail +package im.vector.app.features.home.room.detail import android.annotation.SuppressLint import android.content.Context diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/ScrollOnHighlightedEventCallback.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnHighlightedEventCallback.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/ScrollOnHighlightedEventCallback.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnHighlightedEventCallback.kt index f741023630..56058a9759 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/ScrollOnHighlightedEventCallback.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnHighlightedEventCallback.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail +package im.vector.app.features.home.room.detail import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView +import im.vector.app.core.platform.DefaultListUpdateCallback +import im.vector.app.features.home.room.detail.timeline.TimelineEventController import im.vector.matrix.android.api.session.room.timeline.Timeline -import im.vector.riotx.core.platform.DefaultListUpdateCallback -import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController import timber.log.Timber import java.util.concurrent.atomic.AtomicReference diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/ScrollOnNewMessageCallback.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnNewMessageCallback.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/ScrollOnNewMessageCallback.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnNewMessageCallback.kt index a18ee31e2c..af56e2eb02 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/ScrollOnNewMessageCallback.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/ScrollOnNewMessageCallback.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail +package im.vector.app.features.home.room.detail import androidx.recyclerview.widget.LinearLayoutManager -import im.vector.riotx.core.platform.DefaultListUpdateCallback -import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController -import im.vector.riotx.features.home.room.detail.timeline.item.BaseEventItem +import im.vector.app.core.platform.DefaultListUpdateCallback +import im.vector.app.features.home.room.detail.timeline.TimelineEventController +import im.vector.app.features.home.room.detail.timeline.item.BaseEventItem import timber.log.Timber import java.util.concurrent.CopyOnWriteArrayList diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/ComposerEditText.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/ComposerEditText.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt index ab37431103..353ab783db 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/ComposerEditText.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt @@ -15,7 +15,7 @@ * */ -package im.vector.riotx.features.home.room.detail.composer +package im.vector.app.features.home.room.detail.composer import android.content.Context import android.net.Uri @@ -27,9 +27,9 @@ import android.view.inputmethod.InputConnection import androidx.appcompat.widget.AppCompatEditText import androidx.core.view.inputmethod.EditorInfoCompat import androidx.core.view.inputmethod.InputConnectionCompat -import im.vector.riotx.core.extensions.ooi -import im.vector.riotx.core.platform.SimpleTextWatcher -import im.vector.riotx.features.html.PillImageSpan +import im.vector.app.core.extensions.ooi +import im.vector.app.core.platform.SimpleTextWatcher +import im.vector.app.features.html.PillImageSpan import timber.log.Timber class ComposerEditText @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = android.R.attr.editTextStyle) diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerView.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt index 9e2a6c0f05..7d606e8d96 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerView.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.composer +package im.vector.app.features.home.room.detail.composer import android.content.Context import android.net.Uri @@ -33,8 +33,8 @@ import androidx.transition.Transition import androidx.transition.TransitionManager import butterknife.BindView import butterknife.ButterKnife +import im.vector.app.R import im.vector.matrix.android.api.crypto.RoomEncryptionTrustLevel -import im.vector.riotx.R import kotlinx.android.synthetic.main.merge_composer_layout.view.* /** diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/rainbow/RainbowGenerator.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/rainbow/RainbowGenerator.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/rainbow/RainbowGenerator.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/composer/rainbow/RainbowGenerator.kt index 3868be4e2e..7bed9f8e64 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/rainbow/RainbowGenerator.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/rainbow/RainbowGenerator.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.composer.rainbow +package im.vector.app.features.home.room.detail.composer.rainbow -import im.vector.riotx.core.utils.splitEmoji +import im.vector.app.core.utils.splitEmoji import javax.inject.Inject import kotlin.math.abs import kotlin.math.roundToInt diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/rainbow/RgbColor.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/rainbow/RgbColor.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/rainbow/RgbColor.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/composer/rainbow/RgbColor.kt index bf2e808a36..4e8c1b8bc8 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/rainbow/RgbColor.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/rainbow/RgbColor.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.composer.rainbow +package im.vector.app.features.home.room.detail.composer.rainbow data class RgbColor( val r: Int, diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/readreceipts/DisplayReadReceiptItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptItem.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/readreceipts/DisplayReadReceiptItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptItem.kt index 45e5fbfc6a..7e6ebde028 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/readreceipts/DisplayReadReceiptItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.readreceipts +package im.vector.app.features.home.room.detail.readreceipts import android.widget.ImageView import android.widget.TextView @@ -22,10 +22,10 @@ import androidx.core.view.isVisible import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelWithHolder +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.features.home.AvatarRenderer import im.vector.matrix.android.api.util.MatrixItem -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.features.home.AvatarRenderer @EpoxyModelClass(layout = R.layout.item_display_read_receipt) abstract class DisplayReadReceiptItem : EpoxyModelWithHolder() { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/readreceipts/DisplayReadReceiptsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsBottomSheet.kt similarity index 84% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/readreceipts/DisplayReadReceiptsBottomSheet.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsBottomSheet.kt index cb978d5fc0..7593118c9f 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/readreceipts/DisplayReadReceiptsBottomSheet.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsBottomSheet.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.readreceipts +package im.vector.app.features.home.room.detail.readreceipts import android.os.Bundle import android.os.Parcelable @@ -22,14 +22,14 @@ import androidx.recyclerview.widget.RecyclerView import butterknife.BindView import com.airbnb.mvrx.MvRx import com.airbnb.mvrx.args -import im.vector.riotx.R -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment -import im.vector.riotx.features.home.room.detail.timeline.action.EventSharedAction -import im.vector.riotx.features.home.room.detail.timeline.action.MessageSharedActionViewModel -import im.vector.riotx.features.home.room.detail.timeline.item.ReadReceiptData +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment +import im.vector.app.features.home.room.detail.timeline.action.EventSharedAction +import im.vector.app.features.home.room.detail.timeline.action.MessageSharedActionViewModel +import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptData import kotlinx.android.parcel.Parcelize import kotlinx.android.synthetic.main.bottom_sheet_generic_list_with_title.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/readreceipts/DisplayReadReceiptsController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsController.kt similarity index 84% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/readreceipts/DisplayReadReceiptsController.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsController.kt index fe8ecb0f86..7d950e7c3c 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/readreceipts/DisplayReadReceiptsController.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsController.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.readreceipts +package im.vector.app.features.home.room.detail.readreceipts import com.airbnb.epoxy.TypedEpoxyController +import im.vector.app.core.date.VectorDateFormatter +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptData +import im.vector.app.features.home.room.detail.timeline.item.toMatrixItem import im.vector.matrix.android.api.session.Session -import im.vector.riotx.core.date.VectorDateFormatter -import im.vector.riotx.features.home.AvatarRenderer -import im.vector.riotx.features.home.room.detail.timeline.item.ReadReceiptData -import im.vector.riotx.features.home.room.detail.timeline.item.toMatrixItem import javax.inject.Inject /** diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/sticker/StickerPickerActionHandler.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/sticker/StickerPickerActionHandler.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/sticker/StickerPickerActionHandler.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/sticker/StickerPickerActionHandler.kt index ebae583d8c..d25edffa7e 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/sticker/StickerPickerActionHandler.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/sticker/StickerPickerActionHandler.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.sticker +package im.vector.app.features.home.room.detail.sticker +import im.vector.app.features.home.room.detail.RoomDetailViewEvents import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.widgets.model.WidgetType -import im.vector.riotx.features.home.room.detail.RoomDetailViewEvents import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/MessageColorProvider.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/MessageColorProvider.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/MessageColorProvider.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/MessageColorProvider.kt index 96f7885e5d..6e7a87c98e 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/MessageColorProvider.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/MessageColorProvider.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline +package im.vector.app.features.home.room.detail.timeline import androidx.annotation.ColorInt +import im.vector.app.R +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.utils.getColorFromUserId +import im.vector.app.features.settings.VectorPreferences import im.vector.matrix.android.api.session.room.send.SendState -import im.vector.riotx.R -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.utils.getColorFromUserId -import im.vector.riotx.features.settings.VectorPreferences import javax.inject.Inject class MessageColorProvider @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/TimelineEventController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/TimelineEventController.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt index d79972c59a..afb7a67aa9 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/TimelineEventController.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline +package im.vector.app.features.home.room.detail.timeline import android.os.Handler import android.os.Looper @@ -25,34 +25,34 @@ import androidx.recyclerview.widget.RecyclerView import com.airbnb.epoxy.EpoxyController import com.airbnb.epoxy.EpoxyModel import com.airbnb.epoxy.VisibilityState +import im.vector.app.core.date.VectorDateFormatter +import im.vector.app.core.epoxy.LoadingItem_ +import im.vector.app.core.extensions.localDateTime +import im.vector.app.core.extensions.nextOrNull +import im.vector.app.features.home.room.detail.RoomDetailAction +import im.vector.app.features.home.room.detail.RoomDetailViewState +import im.vector.app.features.home.room.detail.UnreadState +import im.vector.app.features.home.room.detail.timeline.factory.MergedHeaderItemFactory +import im.vector.app.features.home.room.detail.timeline.factory.TimelineItemFactory +import im.vector.app.features.home.room.detail.timeline.helper.ContentDownloadStateTrackerBinder +import im.vector.app.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder +import im.vector.app.features.home.room.detail.timeline.helper.ReadMarkerVisibilityStateChangedListener +import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventDiffUtilCallback +import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventVisibilityStateChangedListener +import im.vector.app.features.home.room.detail.timeline.helper.TimelineMediaSizeProvider +import im.vector.app.features.home.room.detail.timeline.item.BaseEventItem +import im.vector.app.features.home.room.detail.timeline.item.BasedMergedItem +import im.vector.app.features.home.room.detail.timeline.item.DaySeparatorItem +import im.vector.app.features.home.room.detail.timeline.item.DaySeparatorItem_ +import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData +import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptData +import im.vector.app.features.home.room.detail.timeline.item.TimelineReadMarkerItem_ +import im.vector.app.features.media.ImageContentRenderer +import im.vector.app.features.media.VideoContentRenderer import im.vector.matrix.android.api.session.room.model.message.MessageImageInfoContent import im.vector.matrix.android.api.session.room.model.message.MessageVideoContent import im.vector.matrix.android.api.session.room.timeline.Timeline import im.vector.matrix.android.api.session.room.timeline.TimelineEvent -import im.vector.riotx.core.date.VectorDateFormatter -import im.vector.riotx.core.epoxy.LoadingItem_ -import im.vector.riotx.core.extensions.localDateTime -import im.vector.riotx.core.extensions.nextOrNull -import im.vector.riotx.features.home.room.detail.RoomDetailAction -import im.vector.riotx.features.home.room.detail.RoomDetailViewState -import im.vector.riotx.features.home.room.detail.UnreadState -import im.vector.riotx.features.home.room.detail.timeline.factory.MergedHeaderItemFactory -import im.vector.riotx.features.home.room.detail.timeline.factory.TimelineItemFactory -import im.vector.riotx.features.home.room.detail.timeline.helper.ContentDownloadStateTrackerBinder -import im.vector.riotx.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder -import im.vector.riotx.features.home.room.detail.timeline.helper.ReadMarkerVisibilityStateChangedListener -import im.vector.riotx.features.home.room.detail.timeline.helper.TimelineEventDiffUtilCallback -import im.vector.riotx.features.home.room.detail.timeline.helper.TimelineEventVisibilityStateChangedListener -import im.vector.riotx.features.home.room.detail.timeline.helper.TimelineMediaSizeProvider -import im.vector.riotx.features.home.room.detail.timeline.item.BaseEventItem -import im.vector.riotx.features.home.room.detail.timeline.item.BasedMergedItem -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.MessageInformationData -import im.vector.riotx.features.home.room.detail.timeline.item.ReadReceiptData -import im.vector.riotx.features.home.room.detail.timeline.item.TimelineReadMarkerItem_ -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/riotx/features/home/room/detail/timeline/TimelineEventControllerHandler.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventControllerHandler.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/TimelineEventControllerHandler.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventControllerHandler.kt index 5af7df86c1..dbd59e5e3f 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/TimelineEventControllerHandler.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventControllerHandler.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline +package im.vector.app.features.home.room.detail.timeline import javax.inject.Qualifier diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/EventSharedAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/EventSharedAction.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt index b141e9a8cd..006a0827b1 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/EventSharedAction.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.action +package im.vector.app.features.home.room.detail.timeline.action import androidx.annotation.DrawableRes import androidx.annotation.StringRes +import im.vector.app.R +import im.vector.app.core.platform.VectorSharedAction +import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData import im.vector.matrix.android.api.session.room.model.message.MessageWithAttachmentContent -import im.vector.riotx.R -import im.vector.riotx.core.platform.VectorSharedAction -import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData sealed class EventSharedAction(@StringRes val titleRes: Int, @DrawableRes val iconResId: Int, diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionState.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt index 4eeed1292e..ab7c550a7c 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionState.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionState.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.action +package im.vector.app.features.home.room.detail.timeline.action import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState import com.airbnb.mvrx.Uninitialized +import im.vector.app.core.extensions.canReact +import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData import im.vector.matrix.android.api.session.room.timeline.TimelineEvent -import im.vector.riotx.core.extensions.canReact -import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData import java.text.SimpleDateFormat import java.util.Date import java.util.Locale diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsAction.kt similarity index 85% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsAction.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsAction.kt index fe8a10d364..f1b5bbe7d0 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsAction.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsAction.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.action +package im.vector.app.features.home.room.detail.timeline.action -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction sealed class MessageActionsAction : VectorViewModelAction { object ToggleReportMenu : MessageActionsAction() diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsAnimator.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsAnimator.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsAnimator.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsAnimator.kt index fbe32e0e2b..5530abf839 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsAnimator.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsAnimator.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.action +package im.vector.app.features.home.room.detail.timeline.action import androidx.recyclerview.widget.DefaultItemAnimator diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt index eeb090092c..9858d2a03c 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.action +package im.vector.app.features.home.room.detail.timeline.action import android.os.Bundle import androidx.recyclerview.widget.RecyclerView import butterknife.BindView import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment -import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment +import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData import javax.inject.Inject /** diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt index e063016be1..f4287eb3a4 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt @@ -13,25 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.action +package im.vector.app.features.home.room.detail.timeline.action import android.view.View import com.airbnb.epoxy.TypedEpoxyController import com.airbnb.mvrx.Success -import im.vector.riotx.EmojiCompatFontProvider -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.bottomsheet.BottomSheetQuickReactionsItem -import im.vector.riotx.core.epoxy.bottomsheet.bottomSheetActionItem -import im.vector.riotx.core.epoxy.bottomsheet.bottomSheetMessagePreviewItem -import im.vector.riotx.core.epoxy.bottomsheet.bottomSheetQuickReactionsItem -import im.vector.riotx.core.epoxy.bottomsheet.bottomSheetSendStateItem -import im.vector.riotx.core.epoxy.dividerItem -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.item.E2EDecoration -import im.vector.riotx.features.home.room.detail.timeline.tools.createLinkMovementMethod -import im.vector.riotx.features.home.room.detail.timeline.tools.linkify +import im.vector.app.EmojiCompatFontProvider +import im.vector.app.R +import im.vector.app.core.epoxy.bottomsheet.BottomSheetQuickReactionsItem +import im.vector.app.core.epoxy.bottomsheet.bottomSheetActionItem +import im.vector.app.core.epoxy.bottomsheet.bottomSheetMessagePreviewItem +import im.vector.app.core.epoxy.bottomsheet.bottomSheetQuickReactionsItem +import im.vector.app.core.epoxy.bottomsheet.bottomSheetSendStateItem +import im.vector.app.core.epoxy.dividerItem +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.home.room.detail.timeline.TimelineEventController +import im.vector.app.features.home.room.detail.timeline.item.E2EDecoration +import im.vector.app.features.home.room.detail.timeline.tools.createLinkMovementMethod +import im.vector.app.features.home.room.detail.timeline.tools.linkify import javax.inject.Inject /** diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsViewModel.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt index a50d748f93..58e2898d9f 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsViewModel.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.home.room.detail.timeline.action +package im.vector.app.features.home.room.detail.timeline.action import com.airbnb.mvrx.FragmentViewModelContext import com.airbnb.mvrx.MvRxViewModelFactory @@ -21,6 +21,17 @@ import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject import dagger.Lazy +import im.vector.app.R +import im.vector.app.core.extensions.canReact +import im.vector.app.core.platform.EmptyViewEvents +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.home.room.detail.timeline.format.NoticeEventFormatter +import im.vector.app.features.html.EventHtmlRenderer +import im.vector.app.features.html.VectorHtmlCompressor +import im.vector.app.features.powerlevel.PowerLevelsObservableFactory +import im.vector.app.features.reactions.data.EmojiDataSource +import im.vector.app.features.settings.VectorPreferences 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.events.model.EventType @@ -39,17 +50,6 @@ import im.vector.matrix.android.api.session.room.timeline.getLastMessageContent import im.vector.matrix.android.api.session.room.timeline.hasBeenEdited import im.vector.matrix.rx.rx import im.vector.matrix.rx.unwrap -import im.vector.riotx.R -import im.vector.riotx.core.extensions.canReact -import im.vector.riotx.core.platform.EmptyViewEvents -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.home.room.detail.timeline.format.NoticeEventFormatter -import im.vector.riotx.features.html.EventHtmlRenderer -import im.vector.riotx.features.html.VectorHtmlCompressor -import im.vector.riotx.features.powerlevel.PowerLevelsObservableFactory -import im.vector.riotx.features.reactions.data.EmojiDataSource -import im.vector.riotx.features.settings.VectorPreferences /** * Information related to an event and used to display preview in contextual bottom sheet. diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageSharedActionViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageSharedActionViewModel.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageSharedActionViewModel.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageSharedActionViewModel.kt index ec5c49f814..cff9a8c5e2 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageSharedActionViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageSharedActionViewModel.kt @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.action +package im.vector.app.features.home.room.detail.timeline.action -import im.vector.riotx.core.platform.VectorSharedActionViewModel +import im.vector.app.core.platform.VectorSharedActionViewModel import javax.inject.Inject /** diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt similarity index 84% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt index 2acfec8a89..fcfd6cdb8d 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/TimelineEventFragmentArgs.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.action +package im.vector.app.features.home.room.detail.timeline.action import android.os.Parcelable -import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData +import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData import kotlinx.android.parcel.Parcelize @Parcelize diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/animation/TimelineItemAnimator.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/animation/TimelineItemAnimator.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/animation/TimelineItemAnimator.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/animation/TimelineItemAnimator.kt index fc19438af5..7bb0a6090c 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/animation/TimelineItemAnimator.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/animation/TimelineItemAnimator.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.animation +package im.vector.app.features.home.room.detail.timeline.animation import androidx.recyclerview.widget.DefaultItemAnimator diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt similarity index 83% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt index bf3816a030..93fdd253d8 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.edithistory +package im.vector.app.features.home.room.detail.timeline.edithistory import android.os.Bundle import androidx.recyclerview.widget.RecyclerView @@ -21,14 +21,14 @@ import butterknife.BindView import com.airbnb.mvrx.MvRx import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment -import im.vector.riotx.features.home.room.detail.timeline.action.TimelineEventFragmentArgs -import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData -import im.vector.riotx.features.html.EventHtmlRenderer +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment +import im.vector.app.features.home.room.detail.timeline.action.TimelineEventFragmentArgs +import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData +import im.vector.app.features.html.EventHtmlRenderer import kotlinx.android.synthetic.main.bottom_sheet_generic_list_with_title.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt index 329f66459b..32c21afccc 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryEpoxyController.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.edithistory +package im.vector.app.features.home.room.detail.timeline.edithistory import android.content.Context import android.text.Spannable @@ -23,19 +23,19 @@ import com.airbnb.epoxy.TypedEpoxyController import com.airbnb.mvrx.Fail import com.airbnb.mvrx.Incomplete import com.airbnb.mvrx.Success +import im.vector.app.R +import im.vector.app.core.date.VectorDateFormatter +import im.vector.app.core.extensions.localDateTime +import im.vector.app.core.ui.list.genericFooterItem +import im.vector.app.core.ui.list.genericItem +import im.vector.app.core.ui.list.genericItemHeader +import im.vector.app.core.ui.list.genericLoaderItem +import im.vector.app.features.html.EventHtmlRenderer import im.vector.matrix.android.api.session.events.model.Event import im.vector.matrix.android.api.session.events.model.toModel import im.vector.matrix.android.api.session.room.model.message.MessageTextContent import im.vector.matrix.android.api.util.ContentUtils.extractUsefulTextFromReply import im.vector.matrix.android.internal.session.room.send.TextContent -import im.vector.riotx.R -import im.vector.riotx.core.date.VectorDateFormatter -import im.vector.riotx.core.extensions.localDateTime -import im.vector.riotx.core.ui.list.genericFooterItem -import im.vector.riotx.core.ui.list.genericItem -import im.vector.riotx.core.ui.list.genericItemHeader -import im.vector.riotx.core.ui.list.genericLoaderItem -import im.vector.riotx.features.html.EventHtmlRenderer import me.gujun.android.span.span import name.fraser.neil.plaintext.diff_match_patch import java.util.Calendar diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt index 2180e18684..7b1a87c28b 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryViewModel.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.edithistory +package im.vector.app.features.home.room.detail.timeline.edithistory import com.airbnb.mvrx.Async import com.airbnb.mvrx.Fail @@ -26,17 +26,17 @@ import com.airbnb.mvrx.Uninitialized import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.core.date.VectorDateFormatter +import im.vector.app.core.platform.EmptyAction +import im.vector.app.core.platform.EmptyViewEvents +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.features.home.room.detail.timeline.action.TimelineEventFragmentArgs import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.crypto.MXCryptoError import im.vector.matrix.android.api.session.events.model.Event import im.vector.matrix.android.api.session.events.model.isReply import im.vector.matrix.android.internal.crypto.algorithms.olm.OlmDecryptionResult -import im.vector.riotx.core.date.VectorDateFormatter -import im.vector.riotx.core.platform.EmptyAction -import im.vector.riotx.core.platform.EmptyViewEvents -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.features.home.room.detail.timeline.action.TimelineEventFragmentArgs import timber.log.Timber import java.util.UUID diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/DefaultItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/DefaultItemFactory.kt similarity index 78% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/DefaultItemFactory.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/DefaultItemFactory.kt index 89e21e04a2..76dae013f7 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/DefaultItemFactory.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/DefaultItemFactory.kt @@ -14,19 +14,19 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.factory +package im.vector.app.features.home.room.detail.timeline.factory import android.view.View +import im.vector.app.R +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.home.room.detail.timeline.TimelineEventController +import im.vector.app.features.home.room.detail.timeline.helper.AvatarSizeProvider +import im.vector.app.features.home.room.detail.timeline.helper.MessageInformationDataFactory +import im.vector.app.features.home.room.detail.timeline.item.DefaultItem +import im.vector.app.features.home.room.detail.timeline.item.DefaultItem_ +import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData import im.vector.matrix.android.api.session.room.timeline.TimelineEvent -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.AvatarSizeProvider -import im.vector.riotx.features.home.room.detail.timeline.helper.MessageInformationDataFactory -import im.vector.riotx.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.MessageInformationData import javax.inject.Inject class DefaultItemFactory @Inject constructor(private val avatarSizeProvider: AvatarSizeProvider, diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt index 997c68cb52..08f2131ca8 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt @@ -14,25 +14,25 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.factory +package im.vector.app.features.home.room.detail.timeline.factory +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.resources.DrawableProvider +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.home.room.detail.timeline.TimelineEventController +import im.vector.app.features.home.room.detail.timeline.helper.AvatarSizeProvider +import im.vector.app.features.home.room.detail.timeline.helper.MessageInformationDataFactory +import im.vector.app.features.home.room.detail.timeline.helper.MessageItemAttributesFactory +import im.vector.app.features.home.room.detail.timeline.item.MessageTextItem_ +import im.vector.app.features.home.room.detail.timeline.tools.createLinkMovementMethod +import im.vector.app.features.settings.VectorPreferences 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.events.model.toModel import im.vector.matrix.android.api.session.room.timeline.TimelineEvent import im.vector.matrix.android.internal.crypto.model.event.EncryptedEventContent -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.DrawableProvider -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController -import im.vector.riotx.features.home.room.detail.timeline.helper.AvatarSizeProvider -import im.vector.riotx.features.home.room.detail.timeline.helper.MessageInformationDataFactory -import im.vector.riotx.features.home.room.detail.timeline.helper.MessageItemAttributesFactory -import im.vector.riotx.features.home.room.detail.timeline.item.MessageTextItem_ -import im.vector.riotx.features.home.room.detail.timeline.tools.createLinkMovementMethod -import im.vector.riotx.features.settings.VectorPreferences import me.gujun.android.span.image import me.gujun.android.span.span import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt similarity index 82% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt index ff65b0e656..705fd6b842 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt @@ -14,21 +14,21 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.factory +package im.vector.app.features.home.room.detail.timeline.factory +import im.vector.app.R +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.home.room.detail.timeline.MessageColorProvider +import im.vector.app.features.home.room.detail.timeline.TimelineEventController +import im.vector.app.features.home.room.detail.timeline.helper.AvatarSizeProvider +import im.vector.app.features.home.room.detail.timeline.helper.MessageInformationDataFactory +import im.vector.app.features.home.room.detail.timeline.helper.MessageItemAttributesFactory +import im.vector.app.features.home.room.detail.timeline.item.StatusTileTimelineItem +import im.vector.app.features.home.room.detail.timeline.item.StatusTileTimelineItem_ 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.MXCRYPTO_ALGORITHM_MEGOLM import im.vector.matrix.android.internal.crypto.model.event.EncryptionEventContent -import im.vector.riotx.R -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.home.room.detail.timeline.MessageColorProvider -import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController -import im.vector.riotx.features.home.room.detail.timeline.helper.AvatarSizeProvider -import im.vector.riotx.features.home.room.detail.timeline.helper.MessageInformationDataFactory -import im.vector.riotx.features.home.room.detail.timeline.helper.MessageItemAttributesFactory -import im.vector.riotx.features.home.room.detail.timeline.item.StatusTileTimelineItem -import im.vector.riotx.features.home.room.detail.timeline.item.StatusTileTimelineItem_ import javax.inject.Inject class EncryptionItemFactory @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt index d3b7edbde6..520a2be5fd 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt @@ -14,31 +14,31 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.factory +package im.vector.app.features.home.room.detail.timeline.factory +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.extensions.prevOrNull +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.home.room.detail.timeline.TimelineEventController +import im.vector.app.features.home.room.detail.timeline.helper.AvatarSizeProvider +import im.vector.app.features.home.room.detail.timeline.helper.MergedTimelineEventVisibilityStateChangedListener +import im.vector.app.features.home.room.detail.timeline.helper.canBeMerged +import im.vector.app.features.home.room.detail.timeline.helper.isRoomConfiguration +import im.vector.app.features.home.room.detail.timeline.helper.prevSameTypeEvents +import im.vector.app.features.home.room.detail.timeline.item.BasedMergedItem +import im.vector.app.features.home.room.detail.timeline.item.MergedMembershipEventsItem +import im.vector.app.features.home.room.detail.timeline.item.MergedMembershipEventsItem_ +import im.vector.app.features.home.room.detail.timeline.item.MergedRoomCreationItem +import im.vector.app.features.home.room.detail.timeline.item.MergedRoomCreationItem_ +import im.vector.app.features.home.room.detail.timeline.item.MergedUTDItem +import im.vector.app.features.home.room.detail.timeline.item.MergedUTDItem_ +import im.vector.app.features.settings.VectorPreferences 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.create.RoomCreateContent import im.vector.matrix.android.api.session.room.timeline.TimelineEvent import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM import im.vector.matrix.android.internal.crypto.model.event.EncryptionEventContent -import im.vector.riotx.core.di.ActiveSessionHolder -import im.vector.riotx.core.extensions.prevOrNull -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.AvatarSizeProvider -import im.vector.riotx.features.home.room.detail.timeline.helper.MergedTimelineEventVisibilityStateChangedListener -import im.vector.riotx.features.home.room.detail.timeline.helper.canBeMerged -import im.vector.riotx.features.home.room.detail.timeline.helper.isRoomConfiguration -import im.vector.riotx.features.home.room.detail.timeline.helper.prevSameTypeEvents -import im.vector.riotx.features.home.room.detail.timeline.item.BasedMergedItem -import im.vector.riotx.features.home.room.detail.timeline.item.MergedMembershipEventsItem -import im.vector.riotx.features.home.room.detail.timeline.item.MergedMembershipEventsItem_ -import im.vector.riotx.features.home.room.detail.timeline.item.MergedRoomCreationItem -import im.vector.riotx.features.home.room.detail.timeline.item.MergedRoomCreationItem_ -import im.vector.riotx.features.home.room.detail.timeline.item.MergedUTDItem -import im.vector.riotx.features.home.room.detail.timeline.item.MergedUTDItem_ -import im.vector.riotx.features.settings.VectorPreferences import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MessageItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MessageItemFactory.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt index 47a15327b6..22a26d60dd 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MessageItemFactory.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.factory +package im.vector.app.features.home.room.detail.timeline.factory import android.text.SpannableStringBuilder import android.text.Spanned @@ -24,6 +24,44 @@ import android.text.style.ClickableSpan import android.text.style.ForegroundColorSpan import android.view.View import dagger.Lazy +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.utils.DebouncedClickListener +import im.vector.app.core.utils.DimensionConverter +import im.vector.app.core.utils.containsOnlyEmojis +import im.vector.app.core.utils.isLocalFile +import im.vector.app.features.home.room.detail.timeline.TimelineEventController +import im.vector.app.features.home.room.detail.timeline.helper.AvatarSizeProvider +import im.vector.app.features.home.room.detail.timeline.helper.ContentDownloadStateTrackerBinder +import im.vector.app.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder +import im.vector.app.features.home.room.detail.timeline.helper.MessageInformationDataFactory +import im.vector.app.features.home.room.detail.timeline.helper.MessageItemAttributesFactory +import im.vector.app.features.home.room.detail.timeline.helper.TimelineMediaSizeProvider +import im.vector.app.features.home.room.detail.timeline.item.AbsMessageItem +import im.vector.app.features.home.room.detail.timeline.item.MessageBlockCodeItem +import im.vector.app.features.home.room.detail.timeline.item.MessageBlockCodeItem_ +import im.vector.app.features.home.room.detail.timeline.item.MessageFileItem +import im.vector.app.features.home.room.detail.timeline.item.MessageFileItem_ +import im.vector.app.features.home.room.detail.timeline.item.MessageImageVideoItem +import im.vector.app.features.home.room.detail.timeline.item.MessageImageVideoItem_ +import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData +import im.vector.app.features.home.room.detail.timeline.item.MessageOptionsItem_ +import im.vector.app.features.home.room.detail.timeline.item.MessagePollItem_ +import im.vector.app.features.home.room.detail.timeline.item.MessageTextItem +import im.vector.app.features.home.room.detail.timeline.item.MessageTextItem_ +import im.vector.app.features.home.room.detail.timeline.item.RedactedMessageItem +import im.vector.app.features.home.room.detail.timeline.item.RedactedMessageItem_ +import im.vector.app.features.home.room.detail.timeline.item.VerificationRequestItem +import im.vector.app.features.home.room.detail.timeline.item.VerificationRequestItem_ +import im.vector.app.features.home.room.detail.timeline.tools.createLinkMovementMethod +import im.vector.app.features.home.room.detail.timeline.tools.linkify +import im.vector.app.features.html.CodeVisitor +import im.vector.app.features.html.EventHtmlRenderer +import im.vector.app.features.html.VectorHtmlCompressor +import im.vector.app.features.media.ImageContentRenderer +import im.vector.app.features.media.VideoContentRenderer import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.events.model.RelationType import im.vector.matrix.android.api.session.events.model.toModel @@ -47,44 +85,6 @@ import im.vector.matrix.android.api.session.room.timeline.TimelineEvent import im.vector.matrix.android.api.session.room.timeline.getLastMessageContent import im.vector.matrix.android.internal.crypto.attachments.toElementToDecrypt import im.vector.matrix.android.internal.crypto.model.event.EncryptedEventContent -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.core.utils.DimensionConverter -import im.vector.riotx.core.utils.containsOnlyEmojis -import im.vector.riotx.core.utils.isLocalFile -import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController -import im.vector.riotx.features.home.room.detail.timeline.helper.AvatarSizeProvider -import im.vector.riotx.features.home.room.detail.timeline.helper.ContentDownloadStateTrackerBinder -import im.vector.riotx.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder -import im.vector.riotx.features.home.room.detail.timeline.helper.MessageInformationDataFactory -import im.vector.riotx.features.home.room.detail.timeline.helper.MessageItemAttributesFactory -import im.vector.riotx.features.home.room.detail.timeline.helper.TimelineMediaSizeProvider -import im.vector.riotx.features.home.room.detail.timeline.item.AbsMessageItem -import im.vector.riotx.features.home.room.detail.timeline.item.MessageBlockCodeItem -import im.vector.riotx.features.home.room.detail.timeline.item.MessageBlockCodeItem_ -import im.vector.riotx.features.home.room.detail.timeline.item.MessageFileItem -import im.vector.riotx.features.home.room.detail.timeline.item.MessageFileItem_ -import im.vector.riotx.features.home.room.detail.timeline.item.MessageImageVideoItem -import im.vector.riotx.features.home.room.detail.timeline.item.MessageImageVideoItem_ -import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData -import im.vector.riotx.features.home.room.detail.timeline.item.MessageOptionsItem_ -import im.vector.riotx.features.home.room.detail.timeline.item.MessagePollItem_ -import im.vector.riotx.features.home.room.detail.timeline.item.MessageTextItem -import im.vector.riotx.features.home.room.detail.timeline.item.MessageTextItem_ -import im.vector.riotx.features.home.room.detail.timeline.item.RedactedMessageItem -import im.vector.riotx.features.home.room.detail.timeline.item.RedactedMessageItem_ -import im.vector.riotx.features.home.room.detail.timeline.item.VerificationRequestItem -import im.vector.riotx.features.home.room.detail.timeline.item.VerificationRequestItem_ -import im.vector.riotx.features.home.room.detail.timeline.tools.createLinkMovementMethod -import im.vector.riotx.features.home.room.detail.timeline.tools.linkify -import im.vector.riotx.features.html.CodeVisitor -import im.vector.riotx.features.html.EventHtmlRenderer -import im.vector.riotx.features.html.VectorHtmlCompressor -import im.vector.riotx.features.media.ImageContentRenderer -import im.vector.riotx.features.media.VideoContentRenderer import me.gujun.android.span.span import org.commonmark.node.Document import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/NoticeItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt similarity index 77% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/NoticeItemFactory.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt index 85118e6a91..13b1288f0a 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/NoticeItemFactory.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.factory +package im.vector.app.features.home.room.detail.timeline.factory import android.view.View +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.home.room.detail.timeline.TimelineEventController +import im.vector.app.features.home.room.detail.timeline.format.NoticeEventFormatter +import im.vector.app.features.home.room.detail.timeline.helper.AvatarSizeProvider +import im.vector.app.features.home.room.detail.timeline.helper.MessageInformationDataFactory +import im.vector.app.features.home.room.detail.timeline.item.NoticeItem +import im.vector.app.features.home.room.detail.timeline.item.NoticeItem_ import im.vector.matrix.android.api.session.room.timeline.TimelineEvent -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.AvatarSizeProvider -import im.vector.riotx.features.home.room.detail.timeline.helper.MessageInformationDataFactory -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/riotx/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt similarity index 85% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt index d5471d7f4f..b96998b337 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt @@ -14,18 +14,18 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.factory +package im.vector.app.features.home.room.detail.timeline.factory +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.resources.UserPreferencesProvider +import im.vector.app.features.home.room.detail.timeline.TimelineEventController +import im.vector.app.features.home.room.detail.timeline.item.RoomCreateItem_ import im.vector.matrix.android.api.permalinks.PermalinkFactory import im.vector.matrix.android.api.session.events.model.toModel import im.vector.matrix.android.api.session.room.model.create.RoomCreateContent import im.vector.matrix.android.api.session.room.timeline.TimelineEvent -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyModel -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.core.resources.UserPreferencesProvider -import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController -import im.vector.riotx.features.home.room.detail.timeline.item.RoomCreateItem_ import me.gujun.android.span.span import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/TimelineItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/TimelineItemFactory.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt index 72da87415c..6f4e4de29c 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/TimelineItemFactory.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.factory +package im.vector.app.features.home.room.detail.timeline.factory +import im.vector.app.core.epoxy.EmptyItem_ +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.resources.UserPreferencesProvider +import im.vector.app.features.home.room.detail.timeline.TimelineEventController import im.vector.matrix.android.api.session.events.model.EventType import im.vector.matrix.android.api.session.room.timeline.TimelineEvent -import im.vector.riotx.core.epoxy.EmptyItem_ -import im.vector.riotx.core.epoxy.VectorEpoxyModel -import im.vector.riotx.core.resources.UserPreferencesProvider -import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/VerificationItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/VerificationItemFactory.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt index 837d0ad571..e990b102c6 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/VerificationItemFactory.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt @@ -13,8 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.factory +package im.vector.app.features.home.room.detail.timeline.factory +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.resources.UserPreferencesProvider +import im.vector.app.features.home.room.detail.timeline.MessageColorProvider +import im.vector.app.features.home.room.detail.timeline.TimelineEventController +import im.vector.app.features.home.room.detail.timeline.helper.AvatarSizeProvider +import im.vector.app.features.home.room.detail.timeline.helper.MessageInformationDataFactory +import im.vector.app.features.home.room.detail.timeline.helper.MessageItemAttributesFactory +import im.vector.app.features.home.room.detail.timeline.item.StatusTileTimelineItem +import im.vector.app.features.home.room.detail.timeline.item.StatusTileTimelineItem_ import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.crypto.verification.CancelCode import im.vector.matrix.android.api.session.crypto.verification.safeValueOf @@ -25,17 +36,6 @@ import im.vector.matrix.android.api.session.room.model.message.MessageRelationCo import im.vector.matrix.android.api.session.room.model.message.MessageVerificationCancelContent import im.vector.matrix.android.api.session.room.timeline.TimelineEvent import im.vector.matrix.android.internal.session.room.VerificationState -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyModel -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.core.resources.UserPreferencesProvider -import im.vector.riotx.features.home.room.detail.timeline.MessageColorProvider -import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController -import im.vector.riotx.features.home.room.detail.timeline.helper.AvatarSizeProvider -import im.vector.riotx.features.home.room.detail.timeline.helper.MessageInformationDataFactory -import im.vector.riotx.features.home.room.detail.timeline.helper.MessageItemAttributesFactory -import im.vector.riotx.features.home.room.detail.timeline.item.StatusTileTimelineItem -import im.vector.riotx.features.home.room.detail.timeline.item.StatusTileTimelineItem_ import javax.inject.Inject /** diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt index 42a8dd2604..6a8734d191 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt @@ -14,8 +14,12 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.format +package im.vector.app.features.home.room.detail.timeline.format +import im.vector.app.EmojiCompatWrapper +import im.vector.app.R +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.resources.StringProvider 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.message.MessageType @@ -24,10 +28,6 @@ import im.vector.matrix.android.api.session.room.timeline.TimelineEvent import im.vector.matrix.android.api.session.room.timeline.getLastMessageContent import im.vector.matrix.android.api.session.room.timeline.getTextEditableContent import im.vector.matrix.android.api.session.room.timeline.isReply -import im.vector.riotx.EmojiCompatWrapper -import im.vector.riotx.R -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.resources.StringProvider import me.gujun.android.span.span import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt similarity index 99% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/NoticeEventFormatter.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt index 090e2dda3f..c12d0fa819 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/NoticeEventFormatter.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt @@ -14,8 +14,11 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.format +package im.vector.app.features.home.room.detail.timeline.format +import im.vector.app.ActiveSessionDataSource +import im.vector.app.R +import im.vector.app.core.resources.StringProvider import im.vector.matrix.android.api.extensions.orFalse import im.vector.matrix.android.api.session.events.model.Event import im.vector.matrix.android.api.session.events.model.EventType @@ -41,9 +44,6 @@ import im.vector.matrix.android.api.session.room.timeline.TimelineEvent import im.vector.matrix.android.api.session.widgets.model.WidgetContent import im.vector.matrix.android.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM import im.vector.matrix.android.internal.crypto.model.event.EncryptionEventContent -import im.vector.riotx.ActiveSessionDataSource -import im.vector.riotx.R -import im.vector.riotx.core.resources.StringProvider import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/RoomHistoryVisibilityFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/RoomHistoryVisibilityFormatter.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/RoomHistoryVisibilityFormatter.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/RoomHistoryVisibilityFormatter.kt index c5de02f57f..6ac545c350 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/RoomHistoryVisibilityFormatter.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/RoomHistoryVisibilityFormatter.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.format +package im.vector.app.features.home.room.detail.timeline.format +import im.vector.app.R +import im.vector.app.core.resources.StringProvider import im.vector.matrix.android.api.session.room.model.RoomHistoryVisibility -import im.vector.riotx.R -import im.vector.riotx.core.resources.StringProvider import javax.inject.Inject class RoomHistoryVisibilityFormatter @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/AvatarSizeProvider.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/AvatarSizeProvider.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/AvatarSizeProvider.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/AvatarSizeProvider.kt index 51efdbb0c3..5fc5deb407 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/AvatarSizeProvider.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/AvatarSizeProvider.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.helper +package im.vector.app.features.home.room.detail.timeline.helper -import im.vector.riotx.core.utils.DimensionConverter +import im.vector.app.core.utils.DimensionConverter import javax.inject.Inject class AvatarSizeProvider @Inject constructor(private val dimensionConverter: DimensionConverter) { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/ContentDownloadStateTrackerBinder.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentDownloadStateTrackerBinder.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/ContentDownloadStateTrackerBinder.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentDownloadStateTrackerBinder.kt index 5c63de3e8d..4d566ed8e2 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/ContentDownloadStateTrackerBinder.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentDownloadStateTrackerBinder.kt @@ -14,18 +14,18 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.helper +package im.vector.app.features.home.room.detail.timeline.helper import android.graphics.drawable.Drawable import androidx.vectordrawable.graphics.drawable.Animatable2Compat import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat +import im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.di.ScreenScope +import im.vector.app.core.error.ErrorFormatter +import im.vector.app.features.home.room.detail.timeline.MessageColorProvider +import im.vector.app.features.home.room.detail.timeline.item.MessageFileItem import im.vector.matrix.android.api.session.file.ContentDownloadStateTracker -import im.vector.riotx.R -import im.vector.riotx.core.di.ActiveSessionHolder -import im.vector.riotx.core.di.ScreenScope -import im.vector.riotx.core.error.ErrorFormatter -import im.vector.riotx.features.home.room.detail.timeline.MessageColorProvider -import im.vector.riotx.features.home.room.detail.timeline.item.MessageFileItem import javax.inject.Inject @ScreenScope diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt index 4cf14fa83b..3bd99ce27b 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/ContentUploadStateTrackerBinder.kt @@ -14,21 +14,21 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.helper +package im.vector.app.features.home.room.detail.timeline.helper import android.view.View import android.view.ViewGroup import android.widget.ProgressBar import android.widget.TextView import androidx.core.view.isVisible +import im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.di.ScreenScope +import im.vector.app.core.error.ErrorFormatter +import im.vector.app.core.utils.TextUtils +import im.vector.app.features.home.room.detail.timeline.MessageColorProvider import im.vector.matrix.android.api.session.content.ContentUploadStateTracker import im.vector.matrix.android.api.session.room.send.SendState -import im.vector.riotx.R -import im.vector.riotx.core.di.ActiveSessionHolder -import im.vector.riotx.core.di.ScreenScope -import im.vector.riotx.core.error.ErrorFormatter -import im.vector.riotx.core.utils.TextUtils -import im.vector.riotx.features.home.room.detail.timeline.MessageColorProvider import javax.inject.Inject @ScreenScope diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt index 44644fb942..dea10f8103 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt @@ -16,8 +16,17 @@ */ -package im.vector.riotx.features.home.room.detail.timeline.helper +package im.vector.app.features.home.room.detail.timeline.helper +import im.vector.app.core.date.VectorDateFormatter +import im.vector.app.core.extensions.localDateTime +import im.vector.app.core.resources.ColorProvider +import im.vector.app.features.home.room.detail.timeline.item.E2EDecoration +import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData +import im.vector.app.features.home.room.detail.timeline.item.PollResponseData +import im.vector.app.features.home.room.detail.timeline.item.ReactionInfoData +import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptData +import im.vector.app.features.home.room.detail.timeline.item.ReferencesInfoData import im.vector.matrix.android.api.extensions.orFalse import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.events.model.EventType @@ -30,15 +39,6 @@ import im.vector.matrix.android.api.session.room.timeline.getLastMessageContent import im.vector.matrix.android.api.session.room.timeline.hasBeenEdited import im.vector.matrix.android.internal.crypto.model.event.EncryptedEventContent import im.vector.matrix.android.internal.session.room.VerificationState -import im.vector.riotx.core.date.VectorDateFormatter -import im.vector.riotx.core.extensions.localDateTime -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.features.home.room.detail.timeline.item.E2EDecoration -import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData -import im.vector.riotx.features.home.room.detail.timeline.item.PollResponseData -import im.vector.riotx.features.home.room.detail.timeline.item.ReactionInfoData -import im.vector.riotx.features.home.room.detail.timeline.item.ReadReceiptData -import im.vector.riotx.features.home.room.detail.timeline.item.ReferencesInfoData import javax.inject.Inject /** diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt similarity index 80% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt index 7646fd37a5..3297f14622 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageItemAttributesFactory.kt @@ -15,16 +15,16 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.helper +package im.vector.app.features.home.room.detail.timeline.helper import android.view.View -import im.vector.riotx.EmojiCompatFontProvider -import im.vector.riotx.core.utils.DebouncedClickListener -import im.vector.riotx.features.home.AvatarRenderer -import im.vector.riotx.features.home.room.detail.timeline.MessageColorProvider -import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController -import im.vector.riotx.features.home.room.detail.timeline.item.AbsMessageItem -import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData +import im.vector.app.EmojiCompatFontProvider +import im.vector.app.core.utils.DebouncedClickListener +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.home.room.detail.timeline.MessageColorProvider +import im.vector.app.features.home.room.detail.timeline.TimelineEventController +import im.vector.app.features.home.room.detail.timeline.item.AbsMessageItem +import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData import javax.inject.Inject class MessageItemAttributesFactory @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/RoomSummaryHolder.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/RoomSummaryHolder.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/RoomSummaryHolder.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/RoomSummaryHolder.kt index a5025c3082..9f9fc9160e 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/RoomSummaryHolder.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/RoomSummaryHolder.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.helper +package im.vector.app.features.home.room.detail.timeline.helper +import im.vector.app.core.di.ScreenScope import im.vector.matrix.android.api.session.room.model.RoomSummary -import im.vector.riotx.core.di.ScreenScope import javax.inject.Inject /* diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt index af549aa2ed..655d46194d 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineAsyncHelper.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.helper +package im.vector.app.features.home.room.detail.timeline.helper import android.os.Handler import android.os.HandlerThread diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt index 62a835ee8e..b25a64eb57 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.helper +package im.vector.app.features.home.room.detail.timeline.helper +import im.vector.app.core.extensions.localDateTime import im.vector.matrix.android.api.session.events.model.EventType import im.vector.matrix.android.api.session.room.timeline.TimelineEvent -import im.vector.riotx.core.extensions.localDateTime object TimelineDisplayableEvents { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt index f9e69e4ce8..33e4918619 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventDiffUtilCallback.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.helper +package im.vector.app.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/riotx/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt index fc3ae98f5c..52229151a0 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineMediaSizeProvider.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.helper +package im.vector.app.features.home.room.detail.timeline.helper import androidx.recyclerview.widget.RecyclerView -import im.vector.riotx.core.di.ScreenScope +import im.vector.app.core.di.ScreenScope import javax.inject.Inject import kotlin.math.roundToInt diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineVisibilityStateChangedListeners.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineVisibilityStateChangedListeners.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineVisibilityStateChangedListeners.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineVisibilityStateChangedListeners.kt index 69b2b24899..907d6510cb 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/TimelineVisibilityStateChangedListeners.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineVisibilityStateChangedListeners.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.helper +package im.vector.app.features.home.room.detail.timeline.helper import com.airbnb.epoxy.VisibilityState +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.features.home.room.detail.timeline.TimelineEventController import im.vector.matrix.android.api.session.room.timeline.TimelineEvent -import im.vector.riotx.core.epoxy.VectorEpoxyModel -import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController class ReadMarkerVisibilityStateChangedListener(private val callback: TimelineEventController.Callback?) : VectorEpoxyModel.OnVisibilityStateChangedListener { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt index 0845b9059c..fb1d9cde42 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.item +package im.vector.app.features.home.room.detail.timeline.item import android.view.View import android.view.ViewGroup @@ -22,13 +22,13 @@ import android.widget.ImageView import android.widget.TextView import androidx.annotation.IdRes import androidx.core.view.isVisible +import im.vector.app.R +import im.vector.app.core.utils.DebouncedClickListener +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.home.room.detail.timeline.MessageColorProvider +import im.vector.app.features.home.room.detail.timeline.TimelineEventController +import im.vector.app.features.reactions.widget.ReactionButton import im.vector.matrix.android.api.session.room.send.SendState -import im.vector.riotx.R -import im.vector.riotx.core.utils.DebouncedClickListener -import im.vector.riotx.features.home.AvatarRenderer -import im.vector.riotx.features.home.room.detail.timeline.MessageColorProvider -import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController -import im.vector.riotx.features.reactions.widget.ReactionButton /** * Base timeline item with reactions and read receipts. diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt index 4f7828ddaf..fa216c15a4 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.item +package im.vector.app.features.home.room.detail.timeline.item import android.graphics.Typeface import android.view.View @@ -22,11 +22,11 @@ import android.widget.ImageView import android.widget.TextView import androidx.annotation.IdRes import com.airbnb.epoxy.EpoxyAttribute -import im.vector.riotx.R -import im.vector.riotx.core.utils.DebouncedClickListener -import im.vector.riotx.features.home.AvatarRenderer -import im.vector.riotx.features.home.room.detail.timeline.MessageColorProvider -import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController +import im.vector.app.R +import im.vector.app.core.utils.DebouncedClickListener +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.home.room.detail.timeline.MessageColorProvider +import im.vector.app.features.home.room.detail.timeline.TimelineEventController /** * Base timeline item that adds an optional information bar with the sender avatar, name and time diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BaseEventItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BaseEventItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt index a8d465d8e0..e8fa23b924 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BaseEventItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.item +package im.vector.app.features.home.room.detail.timeline.item import android.view.View import android.view.ViewStub @@ -22,12 +22,12 @@ import androidx.annotation.CallSuper import androidx.annotation.IdRes import androidx.core.view.updateLayoutParams import com.airbnb.epoxy.EpoxyAttribute -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.ui.views.ReadReceiptsView -import im.vector.riotx.core.utils.DimensionConverter +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.platform.CheckableView +import im.vector.app.core.ui.views.ReadReceiptsView +import im.vector.app.core.utils.DimensionConverter /** * Children must override getViewType() diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BasedMergedItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BasedMergedItem.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BasedMergedItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BasedMergedItem.kt index adc9b1442f..906c2b2902 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BasedMergedItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BasedMergedItem.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.item +package im.vector.app.features.home.room.detail.timeline.item import android.view.View import android.widget.TextView import androidx.annotation.IdRes import androidx.core.view.isVisible +import im.vector.app.R +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.home.room.detail.timeline.TimelineEventController import im.vector.matrix.android.api.util.MatrixItem -import im.vector.riotx.R -import im.vector.riotx.features.home.AvatarRenderer -import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController abstract class BasedMergedItem : BaseEventItem() { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BlankItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BlankItem.kt similarity index 81% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BlankItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BlankItem.kt index 199634ee84..cf3e4a8328 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/BlankItem.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.home.room.detail.timeline.item +package im.vector.app.features.home.room.detail.timeline.item import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel @EpoxyModelClass(layout = R.layout.item_timeline_event_blank_stub) abstract class BlankItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/DaySeparatorItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DaySeparatorItem.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/DaySeparatorItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DaySeparatorItem.kt index 4b36478586..c63ec36205 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/DaySeparatorItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DaySeparatorItem.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.item +package im.vector.app.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.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder +import im.vector.app.R +import im.vector.app.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/riotx/features/home/room/detail/timeline/item/DefaultItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultItem.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/DefaultItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultItem.kt index 0ccc982c4c..e82c4191b9 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/DefaultItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/DefaultItem.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.item +package im.vector.app.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.riotx.R -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.app.R +import im.vector.app.core.utils.DebouncedClickListener +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.home.room.detail.timeline.TimelineEventController @EpoxyModelClass(layout = R.layout.item_timeline_event_base_noinfo) abstract class DefaultItem : BaseEventItem() { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/EventItemAttributes.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/EventItemAttributes.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/EventItemAttributes.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/EventItemAttributes.kt index db0dd3584e..0762c4952f 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/EventItemAttributes.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/EventItemAttributes.kt @@ -14,4 +14,4 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.item +package im.vector.app.features.home.room.detail.timeline.item diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt index 8e3ba0bcff..ef4a6662b4 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedMembershipEventsItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.item +package im.vector.app.features.home.room.detail.timeline.item import android.view.View import android.view.ViewGroup @@ -24,9 +24,9 @@ import androidx.core.view.children import androidx.core.view.isVisible import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.features.home.AvatarRenderer -import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController +import im.vector.app.R +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.home.room.detail.timeline.TimelineEventController @EpoxyModelClass(layout = R.layout.item_timeline_event_base_noinfo) abstract class MergedMembershipEventsItem : BasedMergedItem() { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt index cf044f8a37..dad5f99eeb 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.item +package im.vector.app.features.home.room.detail.timeline.item import android.view.View import android.view.ViewGroup @@ -27,9 +27,9 @@ import androidx.core.view.isVisible import androidx.core.view.updateLayoutParams import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.features.home.AvatarRenderer -import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController +import im.vector.app.R +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.home.room.detail.timeline.TimelineEventController @EpoxyModelClass(layout = R.layout.item_timeline_event_base_noinfo) abstract class MergedRoomCreationItem : BasedMergedItem() { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MergedUTDItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedUTDItem.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MergedUTDItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedUTDItem.kt index 1955ba16a3..9c72d53641 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MergedUTDItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedUTDItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.item +package im.vector.app.features.home.room.detail.timeline.item import android.util.TypedValue import android.view.ViewGroup @@ -24,9 +24,9 @@ import androidx.core.view.isVisible import androidx.core.view.updateLayoutParams import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.features.home.AvatarRenderer -import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController +import im.vector.app.R +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.home.room.detail.timeline.TimelineEventController @EpoxyModelClass(layout = R.layout.item_timeline_event_base_noinfo) abstract class MergedUTDItem : BasedMergedItem() { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageBlockCodeItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageBlockCodeItem.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageBlockCodeItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageBlockCodeItem.kt index 82a6a4db6f..e7501d98ce 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageBlockCodeItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageBlockCodeItem.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.item +package im.vector.app.features.home.room.detail.timeline.item import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.core.extensions.setTextOrHide +import im.vector.app.R +import im.vector.app.core.extensions.setTextOrHide import me.saket.bettermovementmethod.BetterLinkMovementMethod @EpoxyModelClass(layout = R.layout.item_timeline_event_base) diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageFileItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageFileItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt index 1d7f4c634b..b215fa5dd5 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageFileItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.item +package im.vector.app.features.home.room.detail.timeline.item import android.graphics.Paint import android.view.ViewGroup @@ -25,9 +25,9 @@ import androidx.annotation.DrawableRes import androidx.core.view.isVisible import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.features.home.room.detail.timeline.helper.ContentDownloadStateTrackerBinder -import im.vector.riotx.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder +import im.vector.app.R +import im.vector.app.features.home.room.detail.timeline.helper.ContentDownloadStateTrackerBinder +import im.vector.app.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder @EpoxyModelClass(layout = R.layout.item_timeline_event_base) abstract class MessageFileItem : AbsMessageItem() { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageImageVideoItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageImageVideoItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt index 779b132f2d..e8a840918f 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageImageVideoItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.item +package im.vector.app.features.home.room.detail.timeline.item import android.view.View import android.view.ViewGroup @@ -23,10 +23,10 @@ import androidx.core.view.ViewCompat import androidx.core.view.isVisible import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.core.glide.GlideApp -import im.vector.riotx.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder -import im.vector.riotx.features.media.ImageContentRenderer +import im.vector.app.R +import im.vector.app.core.glide.GlideApp +import im.vector.app.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder +import im.vector.app.features.media.ImageContentRenderer @EpoxyModelClass(layout = R.layout.item_timeline_event_base) abstract class MessageImageVideoItem : AbsMessageItem() { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageInformationData.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageInformationData.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt index 088577d03a..769d11a001 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageInformationData.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.item +package im.vector.app.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/riotx/features/home/room/detail/timeline/item/MessageOptionsItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageOptionsItem.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageOptionsItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageOptionsItem.kt index 080ff26992..3420c2de39 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageOptionsItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageOptionsItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.item +package im.vector.app.features.home.room.detail.timeline.item import android.view.LayoutInflater import android.view.ViewGroup @@ -22,11 +22,11 @@ import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import com.google.android.material.button.MaterialButton +import im.vector.app.R +import im.vector.app.core.extensions.setTextOrHide +import im.vector.app.features.home.room.detail.RoomDetailAction +import im.vector.app.features.home.room.detail.timeline.TimelineEventController import im.vector.matrix.android.api.session.room.model.message.MessageOptionsContent -import im.vector.riotx.R -import im.vector.riotx.core.extensions.setTextOrHide -import im.vector.riotx.features.home.room.detail.RoomDetailAction -import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController @EpoxyModelClass(layout = R.layout.item_timeline_event_base) abstract class MessageOptionsItem : AbsMessageItem() { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessagePollItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessagePollItem.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessagePollItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessagePollItem.kt index 5c92c22935..efd618a67a 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessagePollItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessagePollItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.item +package im.vector.app.features.home.room.detail.timeline.item import android.view.View import android.view.ViewGroup @@ -23,12 +23,12 @@ import android.widget.TextView import androidx.core.view.isVisible import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass +import im.vector.app.R +import im.vector.app.core.extensions.setTextOrHide +import im.vector.app.core.utils.DebouncedClickListener +import im.vector.app.features.home.room.detail.RoomDetailAction +import im.vector.app.features.home.room.detail.timeline.TimelineEventController import im.vector.matrix.android.api.session.room.model.message.MessageOptionsContent -import im.vector.riotx.R -import im.vector.riotx.core.extensions.setTextOrHide -import im.vector.riotx.core.utils.DebouncedClickListener -import im.vector.riotx.features.home.room.detail.RoomDetailAction -import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController import kotlin.math.roundToInt @EpoxyModelClass(layout = R.layout.item_timeline_event_base) diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageTextItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageTextItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt index 44f656fd73..6648943ca8 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageTextItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.item +package im.vector.app.features.home.room.detail.timeline.item import android.text.method.MovementMethod import androidx.appcompat.widget.AppCompatTextView @@ -22,8 +22,8 @@ import androidx.core.text.PrecomputedTextCompat import androidx.core.widget.TextViewCompat import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.features.home.room.detail.timeline.tools.findPillsAndProcess +import im.vector.app.R +import im.vector.app.features.home.room.detail.timeline.tools.findPillsAndProcess @EpoxyModelClass(layout = R.layout.item_timeline_event_base) abstract class MessageTextItem : AbsMessageItem() { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/NoticeItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/NoticeItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt index a4d5d273e7..7205ea278b 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/NoticeItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/NoticeItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.item +package im.vector.app.features.home.room.detail.timeline.item import android.view.View 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.riotx.R -import im.vector.riotx.core.epoxy.ClickListener -import im.vector.riotx.core.epoxy.onClick -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.app.R +import im.vector.app.core.epoxy.ClickListener +import im.vector.app.core.epoxy.onClick +import im.vector.app.core.utils.DebouncedClickListener +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.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/riotx/features/home/room/detail/timeline/item/PollResultLineView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/PollResultLineView.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/PollResultLineView.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/PollResultLineView.kt index bee3ca6c5b..83174792e2 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/PollResultLineView.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/PollResultLineView.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.item +package im.vector.app.features.home.room.detail.timeline.item import android.content.Context import android.graphics.Typeface @@ -25,8 +25,8 @@ import android.widget.TextView import androidx.core.content.withStyledAttributes import butterknife.BindView import butterknife.ButterKnife -import im.vector.riotx.R -import im.vector.riotx.core.extensions.setTextOrHide +import im.vector.app.R +import im.vector.app.core.extensions.setTextOrHide class PollResultLineView @JvmOverloads constructor( context: Context, diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/RedactedMessageItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/RedactedMessageItem.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/RedactedMessageItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/RedactedMessageItem.kt index 88e2be2bc5..282550daec 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/RedactedMessageItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/RedactedMessageItem.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.item +package im.vector.app.features.home.room.detail.timeline.item import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R +import im.vector.app.R @EpoxyModelClass(layout = R.layout.item_timeline_event_base) abstract class RedactedMessageItem : AbsMessageItem() { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/RoomCreateItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/RoomCreateItem.kt similarity index 87% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/RoomCreateItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/RoomCreateItem.kt index 5f6c0aedfa..8ad3bb0cf0 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/RoomCreateItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/RoomCreateItem.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.item +package im.vector.app.features.home.room.detail.timeline.item import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel import me.saket.bettermovementmethod.BetterLinkMovementMethod @EpoxyModelClass(layout = R.layout.item_timeline_event_create) diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/StatusTileTimelineItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/StatusTileTimelineItem.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/StatusTileTimelineItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/StatusTileTimelineItem.kt index f9ea2a71df..c9eb14db66 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/StatusTileTimelineItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/StatusTileTimelineItem.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.item +package im.vector.app.features.home.room.detail.timeline.item import android.annotation.SuppressLint import android.graphics.Typeface @@ -25,10 +25,10 @@ import androidx.core.content.ContextCompat import androidx.core.view.updateLayoutParams import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.features.home.AvatarRenderer -import im.vector.riotx.features.home.room.detail.timeline.MessageColorProvider -import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController +import im.vector.app.R +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.home.room.detail.timeline.MessageColorProvider +import im.vector.app.features.home.room.detail.timeline.TimelineEventController @EpoxyModelClass(layout = R.layout.item_timeline_event_base_state) abstract class StatusTileTimelineItem : AbsBaseMessageItem() { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/TimelineReadMarkerItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/TimelineReadMarkerItem.kt similarity index 81% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/TimelineReadMarkerItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/TimelineReadMarkerItem.kt index 01cb3d6b57..106f178216 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/TimelineReadMarkerItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/TimelineReadMarkerItem.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.item +package im.vector.app.features.home.room.detail.timeline.item import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel @EpoxyModelClass(layout = R.layout.item_timeline_read_marker) abstract class TimelineReadMarkerItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/VerificationRequestItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/VerificationRequestItem.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/VerificationRequestItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/VerificationRequestItem.kt index 12ef5c3577..8c5c63cbd8 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/VerificationRequestItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/VerificationRequestItem.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.item +package im.vector.app.features.home.room.detail.timeline.item import android.annotation.SuppressLint import android.graphics.Typeface @@ -28,15 +28,15 @@ import androidx.core.view.isVisible import androidx.core.view.updateLayoutParams import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass +import im.vector.app.R +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.utils.DebouncedClickListener +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.home.room.detail.RoomDetailAction +import im.vector.app.features.home.room.detail.timeline.MessageColorProvider +import im.vector.app.features.home.room.detail.timeline.TimelineEventController import im.vector.matrix.android.api.session.crypto.verification.VerificationService import im.vector.matrix.android.internal.session.room.VerificationState -import im.vector.riotx.R -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.utils.DebouncedClickListener -import im.vector.riotx.features.home.AvatarRenderer -import im.vector.riotx.features.home.room.detail.RoomDetailAction -import im.vector.riotx.features.home.room.detail.timeline.MessageColorProvider -import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController @EpoxyModelClass(layout = R.layout.item_timeline_event_base_state) abstract class VerificationRequestItem : AbsBaseMessageItem() { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/reactions/ReactionInfoSimpleItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ReactionInfoSimpleItem.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/reactions/ReactionInfoSimpleItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ReactionInfoSimpleItem.kt index 3e1bbfb783..9fc5275a81 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/reactions/ReactionInfoSimpleItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ReactionInfoSimpleItem.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.reactions +package im.vector.app.features.home.room.detail.timeline.reactions import android.widget.TextView import androidx.core.view.isVisible import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelWithHolder -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder /** * Item displaying an emoji reaction (single line with emoji, author, time) diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt similarity index 82% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt index f7c9ff04e4..a5555e4ebb 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.reactions +package im.vector.app.features.home.room.detail.timeline.reactions import android.os.Bundle import androidx.recyclerview.widget.RecyclerView @@ -22,15 +22,15 @@ import butterknife.BindView import com.airbnb.mvrx.MvRx import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment -import im.vector.riotx.features.home.room.detail.timeline.action.EventSharedAction -import im.vector.riotx.features.home.room.detail.timeline.action.MessageSharedActionViewModel -import im.vector.riotx.features.home.room.detail.timeline.action.TimelineEventFragmentArgs -import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment +import im.vector.app.features.home.room.detail.timeline.action.EventSharedAction +import im.vector.app.features.home.room.detail.timeline.action.MessageSharedActionViewModel +import im.vector.app.features.home.room.detail.timeline.action.TimelineEventFragmentArgs +import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData import kotlinx.android.synthetic.main.bottom_sheet_generic_list_with_title.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.kt similarity index 87% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.kt index 25a6a26a01..d0bf69da3b 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsEpoxyController.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.reactions +package im.vector.app.features.home.room.detail.timeline.reactions import com.airbnb.epoxy.TypedEpoxyController import com.airbnb.mvrx.Fail import com.airbnb.mvrx.Incomplete import com.airbnb.mvrx.Success -import im.vector.riotx.EmojiCompatWrapper -import im.vector.riotx.R -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.core.ui.list.genericFooterItem -import im.vector.riotx.core.ui.list.genericLoaderItem +import im.vector.app.EmojiCompatWrapper +import im.vector.app.R +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.ui.list.genericFooterItem +import im.vector.app.core.ui.list.genericLoaderItem import javax.inject.Inject /** diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/reactions/ViewReactionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsViewModel.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/reactions/ViewReactionsViewModel.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsViewModel.kt index 3d8382ab98..2fa44b2620 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/reactions/ViewReactionsViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.reactions +package im.vector.app.features.home.room.detail.timeline.reactions import com.airbnb.mvrx.Async import com.airbnb.mvrx.FragmentViewModelContext @@ -24,15 +24,15 @@ import com.airbnb.mvrx.Uninitialized import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.core.date.VectorDateFormatter +import im.vector.app.core.platform.EmptyAction +import im.vector.app.core.platform.EmptyViewEvents +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.features.home.room.detail.timeline.action.TimelineEventFragmentArgs 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.matrix.rx.unwrap -import im.vector.riotx.core.date.VectorDateFormatter -import im.vector.riotx.core.platform.EmptyAction -import im.vector.riotx.core.platform.EmptyViewEvents -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.features.home.room.detail.timeline.action.TimelineEventFragmentArgs import io.reactivex.Observable import io.reactivex.Single diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/tools/EventRenderingTools.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/tools/EventRenderingTools.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/tools/EventRenderingTools.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/timeline/tools/EventRenderingTools.kt index d3d7260206..76b6daf6e3 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/tools/EventRenderingTools.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/tools/EventRenderingTools.kt @@ -14,24 +14,24 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.timeline.tools +package im.vector.app.features.home.room.detail.timeline.tools import android.text.SpannableStringBuilder import android.text.style.ClickableSpan import android.view.MotionEvent import android.widget.TextView import androidx.core.text.toSpannable +import im.vector.app.core.linkify.VectorLinkify +import im.vector.app.core.utils.EvenBetterLinkMovementMethod +import im.vector.app.core.utils.isValidUrl +import im.vector.app.features.home.room.detail.timeline.TimelineEventController +import im.vector.app.features.html.PillImageSpan import im.vector.matrix.android.api.permalinks.MatrixLinkify import im.vector.matrix.android.api.permalinks.MatrixPermalinkSpan -import im.vector.riotx.core.linkify.VectorLinkify -import im.vector.riotx.core.utils.EvenBetterLinkMovementMethod -import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController -import im.vector.riotx.features.html.PillImageSpan import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import im.vector.riotx.core.utils.isValidUrl fun CharSequence.findPillsAndProcess(scope: CoroutineScope, processBlock: (PillImageSpan) -> Unit) { scope.launch(Dispatchers.Main) { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/RoomWidgetController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetController.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/RoomWidgetController.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetController.kt index 1fe85d0264..ff5dd56f9a 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/RoomWidgetController.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetController.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.widget +package im.vector.app.features.home.room.detail.widget import com.airbnb.epoxy.TypedEpoxyController import im.vector.matrix.android.api.session.widgets.model.Widget diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/RoomWidgetItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetItem.kt similarity index 85% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/RoomWidgetItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetItem.kt index 7cdc033157..e36633ffff 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/RoomWidgetItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetItem.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.widget +package im.vector.app.features.home.room.detail.widget import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelWithHolder +import im.vector.app.R +import im.vector.app.core.epoxy.ClickListener +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.onClick import im.vector.matrix.android.api.session.widgets.model.Widget -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.ClickListener -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.onClick @EpoxyModelClass(layout = R.layout.item_room_widget) abstract class RoomWidgetItem : EpoxyModelWithHolder() { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/RoomWidgetsBannerView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBannerView.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/RoomWidgetsBannerView.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBannerView.kt index 48a5c20558..458658ce6c 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/RoomWidgetsBannerView.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBannerView.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.widget +package im.vector.app.features.home.room.detail.widget import android.content.Context import android.util.AttributeSet import android.view.View import android.widget.RelativeLayout +import im.vector.app.R import im.vector.matrix.android.api.session.widgets.model.Widget -import im.vector.riotx.R import kotlinx.android.synthetic.main.view_room_widgets_banner.view.* class RoomWidgetsBannerView @JvmOverloads constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt similarity index 83% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt index 832d4f836f..dc6cd5ae40 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt @@ -14,23 +14,23 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.widget +package im.vector.app.features.home.room.detail.widget import android.os.Bundle import androidx.recyclerview.widget.RecyclerView import butterknife.BindView import com.airbnb.mvrx.parentFragmentViewModel import com.airbnb.mvrx.withState +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment +import im.vector.app.core.resources.ColorProvider +import im.vector.app.features.home.room.detail.RoomDetailViewModel +import im.vector.app.features.home.room.detail.RoomDetailViewState +import im.vector.app.features.navigation.Navigator import im.vector.matrix.android.api.session.widgets.model.Widget -import im.vector.riotx.R -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.features.home.room.detail.RoomDetailViewModel -import im.vector.riotx.features.home.room.detail.RoomDetailViewState -import im.vector.riotx.features.navigation.Navigator import kotlinx.android.synthetic.main.bottom_sheet_generic_list_with_title.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/WidgetRequestCodes.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/WidgetRequestCodes.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/WidgetRequestCodes.kt rename to vector/src/main/java/im/vector/app/features/home/room/detail/widget/WidgetRequestCodes.kt index 6fdfa598e4..5f0e6866db 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/widget/WidgetRequestCodes.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/WidgetRequestCodes.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.widget +package im.vector.app.features.home.room.detail.widget object WidgetRequestCodes { const val STICKER_PICKER_REQUEST_CODE = 16000 diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/filtered/FilteredRoomFooterItem.kt b/vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt similarity index 87% rename from vector/src/main/java/im/vector/riotx/features/home/room/filtered/FilteredRoomFooterItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt index 60b672cef2..0884844777 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/filtered/FilteredRoomFooterItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.filtered +package im.vector.app.features.home.room.filtered import android.widget.Button import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -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.room.list.widget.FabMenuView +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.features.home.room.list.widget.FabMenuView @EpoxyModelClass(layout = R.layout.item_room_filter_footer) abstract class FilteredRoomFooterItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/filtered/FilteredRoomsActivity.kt b/vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomsActivity.kt similarity index 84% rename from vector/src/main/java/im/vector/riotx/features/home/room/filtered/FilteredRoomsActivity.kt rename to vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomsActivity.kt index 04e738cec8..ee33b4339c 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/filtered/FilteredRoomsActivity.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomsActivity.kt @@ -14,19 +14,19 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.filtered +package im.vector.app.features.home.room.filtered import android.content.Context import android.content.Intent import android.os.Bundle import androidx.appcompat.widget.SearchView -import im.vector.riotx.R -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.extensions.replaceFragment -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.features.home.RoomListDisplayMode -import im.vector.riotx.features.home.room.list.RoomListFragment -import im.vector.riotx.features.home.room.list.RoomListParams +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.extensions.replaceFragment +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.features.home.RoomListDisplayMode +import im.vector.app.features.home.room.list.RoomListFragment +import im.vector.app.features.home.room.list.RoomListParams import kotlinx.android.synthetic.main.activity_filtered_rooms.* class FilteredRoomsActivity : VectorBaseActivity() { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/AlphabeticalRoomComparator.kt b/vector/src/main/java/im/vector/app/features/home/room/list/AlphabeticalRoomComparator.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/home/room/list/AlphabeticalRoomComparator.kt rename to vector/src/main/java/im/vector/app/features/home/room/list/AlphabeticalRoomComparator.kt index 22984b18d8..8b422f7f21 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/AlphabeticalRoomComparator.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/AlphabeticalRoomComparator.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.list +package im.vector.app.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/riotx/features/home/room/list/BreadcrumbsRoomComparator.kt b/vector/src/main/java/im/vector/app/features/home/room/list/BreadcrumbsRoomComparator.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/home/room/list/BreadcrumbsRoomComparator.kt rename to vector/src/main/java/im/vector/app/features/home/room/list/BreadcrumbsRoomComparator.kt index 3b858b39fb..877cf6fa1c 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/BreadcrumbsRoomComparator.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/BreadcrumbsRoomComparator.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.list +package im.vector.app.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/riotx/features/home/room/list/ChronologicalRoomComparator.kt b/vector/src/main/java/im/vector/app/features/home/room/list/ChronologicalRoomComparator.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/home/room/list/ChronologicalRoomComparator.kt rename to vector/src/main/java/im/vector/app/features/home/room/list/ChronologicalRoomComparator.kt index 618d6c901b..ab7c963d20 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/ChronologicalRoomComparator.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/ChronologicalRoomComparator.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.list +package im.vector.app.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/riotx/features/home/room/list/RoomCategoryItem.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomCategoryItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt index c3b1dc27eb..9adddfd5d3 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomCategoryItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.list +package im.vector.app.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.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel -import im.vector.riotx.features.themes.ThemeUtils +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.features.themes.ThemeUtils @EpoxyModelClass(layout = R.layout.item_room_category) abstract class RoomCategoryItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomInvitationItem.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomInvitationItem.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomInvitationItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomInvitationItem.kt index 7338a46d8a..37ac3f346c 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomInvitationItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomInvitationItem.kt @@ -14,22 +14,22 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.list +package im.vector.app.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.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.extensions.setTextOrHide +import im.vector.app.core.platform.ButtonStateView +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.invite.InviteButtonStateBinder import im.vector.matrix.android.api.session.room.members.ChangeMembershipState import im.vector.matrix.android.api.util.MatrixItem -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 -import im.vector.riotx.features.invite.InviteButtonStateBinder @EpoxyModelClass(layout = R.layout.item_room_invitation) abstract class RoomInvitationItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListAction.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListAction.kt rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt index 44ae10c85d..12b6b65c25 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListAction.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.list +package im.vector.app.features.home.room.list +import im.vector.app.core.platform.VectorViewModelAction import im.vector.matrix.android.api.session.room.model.RoomSummary import im.vector.matrix.android.api.session.room.notification.RoomNotificationState -import im.vector.riotx.core.platform.VectorViewModelAction sealed class RoomListAction : VectorViewModelAction { data class SelectRoom(val roomSummary: RoomSummary) : RoomListAction() diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListAnimator.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListAnimator.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListAnimator.kt rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomListAnimator.kt index e6b920747d..ee6a15d5fd 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListAnimator.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListAnimator.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.list +package im.vector.app.features.home.room.list import androidx.recyclerview.widget.DefaultItemAnimator diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListDisplayModeFilter.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListDisplayModeFilter.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListDisplayModeFilter.kt rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomListDisplayModeFilter.kt index dd75deb8ee..5635fb4072 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListDisplayModeFilter.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListDisplayModeFilter.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.list +package im.vector.app.features.home.room.list +import im.vector.app.features.home.RoomListDisplayMode import im.vector.matrix.android.api.session.room.model.Membership import im.vector.matrix.android.api.session.room.model.RoomSummary -import im.vector.riotx.features.home.RoomListDisplayMode import io.reactivex.functions.Predicate class RoomListDisplayModeFilter(private val displayMode: RoomListDisplayMode) : Predicate { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListFragment.kt rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt index 2858097e24..3a5c29bc96 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.list +package im.vector.app.features.home.room.list import android.os.Bundle import android.os.Parcelable @@ -33,24 +33,24 @@ import com.airbnb.mvrx.Success import com.airbnb.mvrx.args import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState +import im.vector.app.R +import im.vector.app.core.epoxy.LayoutManagerStateRestorer +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.OnBackPressed +import im.vector.app.core.platform.StateView +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.features.home.RoomListDisplayMode +import im.vector.app.features.home.room.list.actions.RoomListActionsArgs +import im.vector.app.features.home.room.list.actions.RoomListQuickActionsBottomSheet +import im.vector.app.features.home.room.list.actions.RoomListQuickActionsSharedAction +import im.vector.app.features.home.room.list.actions.RoomListQuickActionsSharedActionViewModel +import im.vector.app.features.home.room.list.widget.FabMenuView +import im.vector.app.features.notifications.NotificationDrawerManager 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.matrix.android.api.session.room.notification.RoomNotificationState -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.LayoutManagerStateRestorer -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.exhaustive -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.RoomListDisplayMode -import im.vector.riotx.features.home.room.list.actions.RoomListActionsArgs -import im.vector.riotx.features.home.room.list.actions.RoomListQuickActionsBottomSheet -import im.vector.riotx.features.home.room.list.actions.RoomListQuickActionsSharedAction -import im.vector.riotx.features.home.room.list.actions.RoomListQuickActionsSharedActionViewModel -import im.vector.riotx.features.home.room.list.widget.FabMenuView -import im.vector.riotx.features.notifications.NotificationDrawerManager 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/riotx/features/home/room/list/RoomListModule.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListModule.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListModule.kt rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomListModule.kt index 411db4d679..5dcef663e6 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListModule.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListModule.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.list +package im.vector.app.features.home.room.list import dagger.Binds import dagger.Module diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListNameFilter.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListNameFilter.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListNameFilter.kt rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomListNameFilter.kt index 88956fbc05..fd13a7431a 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListNameFilter.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListNameFilter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.list +package im.vector.app.features.home.room.list import im.vector.matrix.android.api.session.room.model.RoomSummary import io.reactivex.functions.Predicate diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewEvents.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewEvents.kt rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewEvents.kt index ea7393b2fc..b1015608f0 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewEvents.kt @@ -15,10 +15,10 @@ * */ -package im.vector.riotx.features.home.room.list +package im.vector.app.features.home.room.list +import im.vector.app.core.platform.VectorViewEvents import im.vector.matrix.android.api.session.room.model.RoomSummary -import im.vector.riotx.core.platform.VectorViewEvents /** * Transient events for RoomList diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewModel.kt rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt index cfc76b61a8..e21d629b25 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt @@ -14,11 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.list +package im.vector.app.features.home.room.list import com.airbnb.mvrx.FragmentViewModelContext import com.airbnb.mvrx.MvRxViewModelFactory import com.airbnb.mvrx.ViewModelContext +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.core.utils.DataSource import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.NoOpMatrixCallback import im.vector.matrix.android.api.extensions.orFalse @@ -27,9 +30,6 @@ 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.matrix.rx.rx -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.core.utils.DataSource import io.reactivex.schedulers.Schedulers import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewModelFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewModelFactory.kt rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt index 5b823d6444..e5990060b4 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewModelFactory.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.list +package im.vector.app.features.home.room.list +import im.vector.app.features.home.HomeRoomListDataSource import im.vector.matrix.android.api.session.Session -import im.vector.riotx.features.home.HomeRoomListDataSource import javax.inject.Inject import javax.inject.Provider diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewState.kt rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt index 63f0cf2a1a..84caf02df8 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewState.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.list +package im.vector.app.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.app.R +import im.vector.app.features.home.RoomListDisplayMode import im.vector.matrix.android.api.session.room.members.ChangeMembershipState import im.vector.matrix.android.api.session.room.model.Membership import im.vector.matrix.android.api.session.room.model.RoomSummary -import im.vector.riotx.R -import im.vector.riotx.features.home.RoomListDisplayMode data class RoomListViewState( val displayMode: RoomListDisplayMode, diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryController.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryController.kt rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryController.kt index efa19d012b..3f40df2a61 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryController.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryController.kt @@ -14,20 +14,20 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.list +package im.vector.app.features.home.room.list import androidx.annotation.StringRes import com.airbnb.epoxy.EpoxyController +import im.vector.app.R +import im.vector.app.core.epoxy.helpFooterItem +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.resources.UserPreferencesProvider +import im.vector.app.features.home.RoomListDisplayMode +import im.vector.app.features.home.room.filtered.FilteredRoomFooterItem +import im.vector.app.features.home.room.filtered.filteredRoomFooterItem import im.vector.matrix.android.api.session.room.members.ChangeMembershipState import im.vector.matrix.android.api.session.room.model.Membership import im.vector.matrix.android.api.session.room.model.RoomSummary -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.helpFooterItem -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.core.resources.UserPreferencesProvider -import im.vector.riotx.features.home.RoomListDisplayMode -import im.vector.riotx.features.home.room.filtered.FilteredRoomFooterItem -import im.vector.riotx.features.home.room.filtered.filteredRoomFooterItem import javax.inject.Inject class RoomSummaryController @Inject constructor(private val stringProvider: StringProvider, diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryFormatter.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryFormatter.kt rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryFormatter.kt index 4824aa461d..51fd6a7941 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryFormatter.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryFormatter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.list +package im.vector.app.features.home.room.list object RoomSummaryFormatter { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItem.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItem.kt rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt index 0eebd12ff4..061f1adfe0 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.list +package im.vector.app.features.home.room.list import android.view.HapticFeedbackConstants import android.view.View @@ -27,14 +27,14 @@ import androidx.core.view.isVisible import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import com.amulyakhare.textdrawable.TextDrawable +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.extensions.setTextOrHide +import im.vector.app.features.crypto.util.toImageRes +import im.vector.app.features.home.AvatarRenderer import im.vector.matrix.android.api.crypto.RoomEncryptionTrustLevel import im.vector.matrix.android.api.util.MatrixItem -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.features.crypto.util.toImageRes -import im.vector.riotx.features.home.AvatarRenderer @EpoxyModelClass(layout = R.layout.item_room) abstract class RoomSummaryItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItemFactory.kt rename to vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt index cd2bb2d7d0..236881a6aa 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomSummaryItemFactory.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt @@ -14,23 +14,23 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.list +package im.vector.app.features.home.room.list import android.view.View +import im.vector.app.R +import im.vector.app.core.date.VectorDateFormatter +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.extensions.localDateTime +import im.vector.app.core.resources.DateProvider +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.utils.DebouncedClickListener +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.home.room.detail.timeline.format.DisplayableEventFormatter +import im.vector.app.features.home.room.typing.TypingHelper import im.vector.matrix.android.api.session.room.members.ChangeMembershipState 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.util.toMatrixItem -import im.vector.riotx.R -import im.vector.riotx.core.date.VectorDateFormatter -import im.vector.riotx.core.epoxy.VectorEpoxyModel -import im.vector.riotx.core.extensions.localDateTime -import im.vector.riotx.core.resources.DateProvider -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.format.DisplayableEventFormatter -import im.vector.riotx.features.home.room.typing.TypingHelper import javax.inject.Inject class RoomSummaryItemFactory @Inject constructor(private val displayableEventFormatter: DisplayableEventFormatter, diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/UnreadCounterBadgeView.kt b/vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/home/room/list/UnreadCounterBadgeView.kt rename to vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt index 490e05001a..b1d4d3e9b0 100755 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/UnreadCounterBadgeView.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.home.room.list +package im.vector.app.features.home.room.list import android.content.Context import android.util.AttributeSet import android.view.View import androidx.appcompat.widget.AppCompatTextView -import im.vector.riotx.R -import im.vector.riotx.features.themes.ThemeUtils +import im.vector.app.R +import im.vector.app.features.themes.ThemeUtils class UnreadCounterBadgeView : AppCompatTextView { diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt rename to vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt index 32dc038222..c33d964d22 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.list.actions +package im.vector.app.features.home.room.list.actions import android.os.Bundle import android.os.Parcelable @@ -22,12 +22,12 @@ import androidx.recyclerview.widget.RecyclerView import butterknife.BindView import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment -import im.vector.riotx.features.navigation.Navigator +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment +import im.vector.app.features.navigation.Navigator import kotlinx.android.parcel.Parcelize import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt rename to vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt index 66c8e87e2c..2aceac9846 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.home.room.list.actions +package im.vector.app.features.home.room.list.actions import android.view.View import com.airbnb.epoxy.TypedEpoxyController +import im.vector.app.core.epoxy.bottomsheet.bottomSheetActionItem +import im.vector.app.core.epoxy.bottomsheet.bottomSheetRoomPreviewItem +import im.vector.app.core.epoxy.dividerItem +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.home.AvatarRenderer import im.vector.matrix.android.api.session.room.notification.RoomNotificationState import im.vector.matrix.android.api.util.toMatrixItem -import im.vector.riotx.core.epoxy.bottomsheet.bottomSheetActionItem -import im.vector.riotx.core.epoxy.bottomsheet.bottomSheetRoomPreviewItem -import im.vector.riotx.core.epoxy.dividerItem -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.home.AvatarRenderer import javax.inject.Inject /** diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt rename to vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt index 5da15bf6a3..5ef705d5b0 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedAction.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.list.actions +package im.vector.app.features.home.room.list.actions import androidx.annotation.DrawableRes import androidx.annotation.StringRes -import im.vector.riotx.R -import im.vector.riotx.core.platform.VectorSharedAction +import im.vector.app.R +import im.vector.app.core.platform.VectorSharedAction sealed class RoomListQuickActionsSharedAction( @StringRes val titleRes: Int, diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsSharedActionViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedActionViewModel.kt similarity index 87% rename from vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsSharedActionViewModel.kt rename to vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedActionViewModel.kt index 2f7e8354bf..174e0fac5c 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsSharedActionViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsSharedActionViewModel.kt @@ -14,9 +14,9 @@ * limitations under the License. * */ -package im.vector.riotx.features.home.room.list.actions +package im.vector.app.features.home.room.list.actions -import im.vector.riotx.core.platform.VectorSharedActionViewModel +import im.vector.app.core.platform.VectorSharedActionViewModel import javax.inject.Inject /** diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsState.kt b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsState.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsState.kt rename to vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsState.kt index 6e134871a7..47fde423ec 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsState.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.list.actions +package im.vector.app.features.home.room.list.actions import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsViewModel.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsViewModel.kt rename to vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsViewModel.kt index e5c0e743b8..0562bb00fb 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsViewModel.kt @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.home.room.list.actions +package im.vector.app.features.home.room.list.actions import com.airbnb.mvrx.FragmentViewModelContext import com.airbnb.mvrx.MvRxViewModelFactory import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.core.platform.EmptyAction +import im.vector.app.core.platform.EmptyViewEvents +import im.vector.app.core.platform.VectorViewModel import im.vector.matrix.android.api.session.Session import im.vector.matrix.rx.rx import im.vector.matrix.rx.unwrap -import im.vector.riotx.core.platform.EmptyAction -import im.vector.riotx.core.platform.EmptyViewEvents -import im.vector.riotx.core.platform.VectorViewModel class RoomListQuickActionsViewModel @AssistedInject constructor(@Assisted initialState: RoomListQuickActionsState, private val session: Session diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/widget/FabMenuView.kt b/vector/src/main/java/im/vector/app/features/home/room/list/widget/FabMenuView.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/home/room/list/widget/FabMenuView.kt rename to vector/src/main/java/im/vector/app/features/home/room/list/widget/FabMenuView.kt index 28686c0a02..cf4a41f193 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/widget/FabMenuView.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/widget/FabMenuView.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.list.widget +package im.vector.app.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.riotx.R -import im.vector.riotx.features.themes.ThemeUtils +import im.vector.app.R +import im.vector.app.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/riotx/features/home/room/typing/TypingHelper.kt b/vector/src/main/java/im/vector/app/features/home/room/typing/TypingHelper.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/home/room/typing/TypingHelper.kt rename to vector/src/main/java/im/vector/app/features/home/room/typing/TypingHelper.kt index b47a0a471e..1d6bc70c06 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/typing/TypingHelper.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/typing/TypingHelper.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.typing +package im.vector.app.features.home.room.typing +import im.vector.app.R +import im.vector.app.core.resources.StringProvider import im.vector.matrix.android.api.session.room.sender.SenderInfo -import im.vector.riotx.R -import im.vector.riotx.core.resources.StringProvider import javax.inject.Inject class TypingHelper @Inject constructor(private val stringProvider: StringProvider) { diff --git a/vector/src/main/java/im/vector/riotx/features/homeserver/HomeServerCapabilitiesViewModel.kt b/vector/src/main/java/im/vector/app/features/homeserver/HomeServerCapabilitiesViewModel.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/homeserver/HomeServerCapabilitiesViewModel.kt rename to vector/src/main/java/im/vector/app/features/homeserver/HomeServerCapabilitiesViewModel.kt index 43c1eac172..f60a70729e 100644 --- a/vector/src/main/java/im/vector/riotx/features/homeserver/HomeServerCapabilitiesViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/homeserver/HomeServerCapabilitiesViewModel.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotx.features.homeserver +package im.vector.app.features.homeserver import com.airbnb.mvrx.MvRxViewModelFactory import com.airbnb.mvrx.ViewModelContext +import im.vector.app.core.di.HasScreenInjector +import im.vector.app.core.platform.EmptyAction +import im.vector.app.core.platform.EmptyViewEvents +import im.vector.app.core.platform.VectorViewModel import im.vector.matrix.android.api.session.homeserver.HomeServerCapabilities -import im.vector.riotx.core.di.HasScreenInjector -import im.vector.riotx.core.platform.EmptyAction -import im.vector.riotx.core.platform.EmptyViewEvents -import im.vector.riotx.core.platform.VectorViewModel class HomeServerCapabilitiesViewModel(initialState: HomeServerCapabilitiesViewState) : VectorViewModel(initialState) { diff --git a/vector/src/main/java/im/vector/riotx/features/homeserver/HomeServerCapabilitiesViewState.kt b/vector/src/main/java/im/vector/app/features/homeserver/HomeServerCapabilitiesViewState.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/homeserver/HomeServerCapabilitiesViewState.kt rename to vector/src/main/java/im/vector/app/features/homeserver/HomeServerCapabilitiesViewState.kt index 2b55569b10..20a2faeaad 100644 --- a/vector/src/main/java/im/vector/riotx/features/homeserver/HomeServerCapabilitiesViewState.kt +++ b/vector/src/main/java/im/vector/app/features/homeserver/HomeServerCapabilitiesViewState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.homeserver +package im.vector.app.features.homeserver import com.airbnb.mvrx.MvRxState import im.vector.matrix.android.api.session.homeserver.HomeServerCapabilities diff --git a/vector/src/main/java/im/vector/riotx/features/homeserver/ServerUrlsRepository.kt b/vector/src/main/java/im/vector/app/features/homeserver/ServerUrlsRepository.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/homeserver/ServerUrlsRepository.kt rename to vector/src/main/java/im/vector/app/features/homeserver/ServerUrlsRepository.kt index f485226935..683dea43b0 100644 --- a/vector/src/main/java/im/vector/riotx/features/homeserver/ServerUrlsRepository.kt +++ b/vector/src/main/java/im/vector/app/features/homeserver/ServerUrlsRepository.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotx.features.homeserver +package im.vector.app.features.homeserver import android.content.Context import androidx.core.content.edit import androidx.preference.PreferenceManager -import im.vector.riotx.R +import im.vector.app.R /** * Object to store and retrieve home and identity server urls diff --git a/vector/src/main/java/im/vector/riotx/features/html/CodeVisitor.kt b/vector/src/main/java/im/vector/app/features/html/CodeVisitor.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/html/CodeVisitor.kt rename to vector/src/main/java/im/vector/app/features/html/CodeVisitor.kt index ed8db94fc3..f1612c3717 100644 --- a/vector/src/main/java/im/vector/riotx/features/html/CodeVisitor.kt +++ b/vector/src/main/java/im/vector/app/features/html/CodeVisitor.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.html +package im.vector.app.features.html import org.commonmark.node.AbstractVisitor import org.commonmark.node.Code diff --git a/vector/src/main/java/im/vector/riotx/features/html/EventHtmlRenderer.kt b/vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/html/EventHtmlRenderer.kt rename to vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt index 8253669380..fa644f41b6 100644 --- a/vector/src/main/java/im/vector/riotx/features/html/EventHtmlRenderer.kt +++ b/vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package im.vector.riotx.features.html +package im.vector.app.features.html import android.content.Context -import im.vector.riotx.core.di.ActiveSessionHolder -import im.vector.riotx.core.glide.GlideApp -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.features.home.AvatarRenderer +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.glide.GlideApp +import im.vector.app.core.resources.ColorProvider +import im.vector.app.features.home.AvatarRenderer import io.noties.markwon.Markwon import io.noties.markwon.html.HtmlPlugin import io.noties.markwon.html.TagHandlerNoOp diff --git a/vector/src/main/java/im/vector/riotx/features/html/FontTagHandler.kt b/vector/src/main/java/im/vector/app/features/html/FontTagHandler.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/html/FontTagHandler.kt rename to vector/src/main/java/im/vector/app/features/html/FontTagHandler.kt index e5733dd849..362c8279e1 100644 --- a/vector/src/main/java/im/vector/riotx/features/html/FontTagHandler.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.html +package im.vector.app.features.html import android.graphics.Color import android.text.style.ForegroundColorSpan diff --git a/vector/src/main/java/im/vector/riotx/features/html/MxLinkTagHandler.kt b/vector/src/main/java/im/vector/app/features/html/MxLinkTagHandler.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/html/MxLinkTagHandler.kt rename to vector/src/main/java/im/vector/app/features/html/MxLinkTagHandler.kt index 76f7dfaabd..c9e8a67784 100644 --- a/vector/src/main/java/im/vector/riotx/features/html/MxLinkTagHandler.kt +++ b/vector/src/main/java/im/vector/app/features/html/MxLinkTagHandler.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotx.features.html +package im.vector.app.features.html import android.content.Context import android.text.style.URLSpan +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.glide.GlideRequests +import im.vector.app.features.home.AvatarRenderer import im.vector.matrix.android.api.permalinks.PermalinkData import im.vector.matrix.android.api.permalinks.PermalinkParser import im.vector.matrix.android.api.session.room.model.RoomSummary import im.vector.matrix.android.api.util.MatrixItem -import im.vector.riotx.core.di.ActiveSessionHolder -import im.vector.riotx.core.glide.GlideRequests -import im.vector.riotx.features.home.AvatarRenderer import io.noties.markwon.MarkwonVisitor import io.noties.markwon.SpannableBuilder import io.noties.markwon.html.HtmlTag diff --git a/vector/src/main/java/im/vector/riotx/features/html/MxReplyTagHandler.kt b/vector/src/main/java/im/vector/app/features/html/MxReplyTagHandler.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/html/MxReplyTagHandler.kt rename to vector/src/main/java/im/vector/app/features/html/MxReplyTagHandler.kt index f999e253c7..391c5f9477 100644 --- a/vector/src/main/java/im/vector/riotx/features/html/MxReplyTagHandler.kt +++ b/vector/src/main/java/im/vector/app/features/html/MxReplyTagHandler.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.html +package im.vector.app.features.html import io.noties.markwon.MarkwonVisitor import io.noties.markwon.SpannableBuilder diff --git a/vector/src/main/java/im/vector/riotx/features/html/PillImageSpan.kt b/vector/src/main/java/im/vector/app/features/html/PillImageSpan.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/html/PillImageSpan.kt rename to vector/src/main/java/im/vector/app/features/html/PillImageSpan.kt index 3d3dcbea94..35a2058764 100644 --- a/vector/src/main/java/im/vector/riotx/features/html/PillImageSpan.kt +++ b/vector/src/main/java/im/vector/app/features/html/PillImageSpan.kt @@ -16,7 +16,7 @@ @file:Suppress("DEPRECATION") -package im.vector.riotx.features.html +package im.vector.app.features.html import android.content.Context import android.graphics.Canvas @@ -28,11 +28,11 @@ import androidx.annotation.UiThread import com.bumptech.glide.request.target.SimpleTarget import com.bumptech.glide.request.transition.Transition import com.google.android.material.chip.ChipDrawable +import im.vector.app.R +import im.vector.app.core.glide.GlideRequests +import im.vector.app.features.home.AvatarRenderer import im.vector.matrix.android.api.session.room.send.MatrixItemSpan import im.vector.matrix.android.api.util.MatrixItem -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/riotx/features/html/SpanHandler.kt b/vector/src/main/java/im/vector/app/features/html/SpanHandler.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/html/SpanHandler.kt rename to vector/src/main/java/im/vector/app/features/html/SpanHandler.kt index cb6e4dc325..584d6602ef 100644 --- a/vector/src/main/java/im/vector/riotx/features/html/SpanHandler.kt +++ b/vector/src/main/java/im/vector/app/features/html/SpanHandler.kt @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.html +package im.vector.app.features.html -import im.vector.riotx.core.resources.ColorProvider +import im.vector.app.core.resources.ColorProvider import io.noties.markwon.MarkwonVisitor import io.noties.markwon.SpannableBuilder import io.noties.markwon.html.HtmlTag diff --git a/vector/src/main/java/im/vector/riotx/features/html/SpoilerSpan.kt b/vector/src/main/java/im/vector/app/features/html/SpoilerSpan.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/html/SpoilerSpan.kt rename to vector/src/main/java/im/vector/app/features/html/SpoilerSpan.kt index 5ba464cba4..86d8c7e94f 100644 --- a/vector/src/main/java/im/vector/riotx/features/html/SpoilerSpan.kt +++ b/vector/src/main/java/im/vector/app/features/html/SpoilerSpan.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.features.html +package im.vector.app.features.html import android.graphics.Color import android.text.TextPaint import android.text.style.ClickableSpan import android.view.View -import im.vector.riotx.R -import im.vector.riotx.core.resources.ColorProvider +import im.vector.app.R +import im.vector.app.core.resources.ColorProvider class SpoilerSpan(private val colorProvider: ColorProvider) : ClickableSpan() { diff --git a/vector/src/main/java/im/vector/riotx/features/html/VectorHtmlCompressor.kt b/vector/src/main/java/im/vector/app/features/html/VectorHtmlCompressor.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/html/VectorHtmlCompressor.kt rename to vector/src/main/java/im/vector/app/features/html/VectorHtmlCompressor.kt index 9f3cf96a7e..6a8d928ef2 100644 --- a/vector/src/main/java/im/vector/riotx/features/html/VectorHtmlCompressor.kt +++ b/vector/src/main/java/im/vector/app/features/html/VectorHtmlCompressor.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.html +package im.vector.app.features.html import com.googlecode.htmlcompressor.compressor.Compressor import com.googlecode.htmlcompressor.compressor.HtmlCompressor diff --git a/vector/src/main/java/im/vector/riotx/features/invite/InviteButtonStateBinder.kt b/vector/src/main/java/im/vector/app/features/invite/InviteButtonStateBinder.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/invite/InviteButtonStateBinder.kt rename to vector/src/main/java/im/vector/app/features/invite/InviteButtonStateBinder.kt index 88abf28888..2462ff81aa 100644 --- a/vector/src/main/java/im/vector/riotx/features/invite/InviteButtonStateBinder.kt +++ b/vector/src/main/java/im/vector/app/features/invite/InviteButtonStateBinder.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package im.vector.riotx.features.invite +package im.vector.app.features.invite import androidx.core.view.isInvisible +import im.vector.app.core.platform.ButtonStateView import im.vector.matrix.android.api.session.room.members.ChangeMembershipState -import im.vector.riotx.core.platform.ButtonStateView object InviteButtonStateBinder { diff --git a/vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomAction.kt b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomAction.kt similarity index 82% rename from vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomAction.kt rename to vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomAction.kt index 6c059c917f..cd9df8dc96 100644 --- a/vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomAction.kt +++ b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomAction.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.invite +package im.vector.app.features.invite -import im.vector.riotx.core.platform.VectorViewModelAction -import im.vector.riotx.features.userdirectory.PendingInvitee +import im.vector.app.core.platform.VectorViewModelAction +import im.vector.app.features.userdirectory.PendingInvitee sealed class InviteUsersToRoomAction : VectorViewModelAction { data class InviteSelectedUsers(val invitees: Set) : InviteUsersToRoomAction() diff --git a/vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomActivity.kt b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt similarity index 82% rename from vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomActivity.kt rename to vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt index af78457d96..fe311641db 100644 --- a/vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomActivity.kt +++ b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.invite +package im.vector.app.features.invite import android.content.Context import android.content.Intent @@ -24,28 +24,28 @@ import android.view.View import androidx.appcompat.app.AlertDialog import com.airbnb.mvrx.MvRx import com.airbnb.mvrx.viewModel +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.error.ErrorFormatter +import im.vector.app.core.extensions.addFragment +import im.vector.app.core.extensions.addFragmentToBackstack +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.SimpleFragmentActivity +import im.vector.app.core.platform.WaitingViewData +import im.vector.app.core.utils.PERMISSIONS_FOR_MEMBERS_SEARCH +import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_READ_CONTACTS +import im.vector.app.core.utils.allGranted +import im.vector.app.core.utils.checkPermissions +import im.vector.app.core.utils.toast +import im.vector.app.features.contactsbook.ContactsBookFragment +import im.vector.app.features.contactsbook.ContactsBookViewModel +import im.vector.app.features.userdirectory.KnownUsersFragment +import im.vector.app.features.userdirectory.KnownUsersFragmentArgs +import im.vector.app.features.userdirectory.UserDirectoryFragment +import im.vector.app.features.userdirectory.UserDirectorySharedAction +import im.vector.app.features.userdirectory.UserDirectorySharedActionViewModel +import im.vector.app.features.userdirectory.UserDirectoryViewModel import im.vector.matrix.android.api.failure.Failure -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.addFragment -import im.vector.riotx.core.extensions.addFragmentToBackstack -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.SimpleFragmentActivity -import im.vector.riotx.core.platform.WaitingViewData -import im.vector.riotx.core.utils.PERMISSIONS_FOR_MEMBERS_SEARCH -import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_READ_CONTACTS -import im.vector.riotx.core.utils.allGranted -import im.vector.riotx.core.utils.checkPermissions -import im.vector.riotx.core.utils.toast -import im.vector.riotx.features.contactsbook.ContactsBookFragment -import im.vector.riotx.features.contactsbook.ContactsBookViewModel -import im.vector.riotx.features.userdirectory.KnownUsersFragment -import im.vector.riotx.features.userdirectory.KnownUsersFragmentArgs -import im.vector.riotx.features.userdirectory.UserDirectoryFragment -import im.vector.riotx.features.userdirectory.UserDirectorySharedAction -import im.vector.riotx.features.userdirectory.UserDirectorySharedActionViewModel -import im.vector.riotx.features.userdirectory.UserDirectoryViewModel import kotlinx.android.parcel.Parcelize import kotlinx.android.synthetic.main.activity.* import java.net.HttpURLConnection diff --git a/vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomViewEvents.kt b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewEvents.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomViewEvents.kt rename to vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewEvents.kt index a76d4a4077..786fab58c3 100644 --- a/vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewEvents.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.invite +package im.vector.app.features.invite -import im.vector.riotx.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewEvents sealed class InviteUsersToRoomViewEvents : VectorViewEvents { object Loading : InviteUsersToRoomViewEvents() diff --git a/vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewModel.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomViewModel.kt rename to vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewModel.kt index 2769dc56bb..4187de67fa 100644 --- a/vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewModel.kt @@ -14,19 +14,19 @@ * limitations under the License. */ -package im.vector.riotx.features.invite +package im.vector.app.features.invite import com.airbnb.mvrx.ActivityViewModelContext import com.airbnb.mvrx.MvRxViewModelFactory import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.R +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.userdirectory.PendingInvitee import im.vector.matrix.android.api.session.Session import im.vector.matrix.rx.rx -import im.vector.riotx.R -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.userdirectory.PendingInvitee import io.reactivex.Observable class InviteUsersToRoomViewModel @AssistedInject constructor(@Assisted diff --git a/vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomViewState.kt b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewState.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomViewState.kt rename to vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewState.kt index e0c3ec24a3..cd688f097b 100644 --- a/vector/src/main/java/im/vector/riotx/features/invite/InviteUsersToRoomViewState.kt +++ b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.invite +package im.vector.app.features.invite import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState diff --git a/vector/src/main/java/im/vector/riotx/features/invite/VectorInviteView.kt b/vector/src/main/java/im/vector/app/features/invite/VectorInviteView.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/invite/VectorInviteView.kt rename to vector/src/main/java/im/vector/app/features/invite/VectorInviteView.kt index 42f440fc30..9d74d67afa 100644 --- a/vector/src/main/java/im/vector/riotx/features/invite/VectorInviteView.kt +++ b/vector/src/main/java/im/vector/app/features/invite/VectorInviteView.kt @@ -14,20 +14,20 @@ * limitations under the License. */ -package im.vector.riotx.features.invite +package im.vector.app.features.invite import android.content.Context import android.util.AttributeSet import android.view.View import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.view.updateLayoutParams +import im.vector.app.R +import im.vector.app.core.di.HasScreenInjector +import im.vector.app.core.platform.ButtonStateView +import im.vector.app.features.home.AvatarRenderer import im.vector.matrix.android.api.session.room.members.ChangeMembershipState import im.vector.matrix.android.api.session.user.model.User import im.vector.matrix.android.api.util.toMatrixItem -import im.vector.riotx.R -import im.vector.riotx.core.di.HasScreenInjector -import im.vector.riotx.core.platform.ButtonStateView -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/riotx/features/lifecycle/VectorActivityLifecycleCallbacks.kt b/vector/src/main/java/im/vector/app/features/lifecycle/VectorActivityLifecycleCallbacks.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/lifecycle/VectorActivityLifecycleCallbacks.kt rename to vector/src/main/java/im/vector/app/features/lifecycle/VectorActivityLifecycleCallbacks.kt index 668adc7edd..084dd6349a 100644 --- a/vector/src/main/java/im/vector/riotx/features/lifecycle/VectorActivityLifecycleCallbacks.kt +++ b/vector/src/main/java/im/vector/app/features/lifecycle/VectorActivityLifecycleCallbacks.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotx.features.lifecycle +package im.vector.app.features.lifecycle import android.app.Activity import android.app.Application import android.os.Bundle -import im.vector.riotx.features.popup.PopupAlertManager +import im.vector.app.features.popup.PopupAlertManager class VectorActivityLifecycleCallbacks constructor(private val popupAlertManager: PopupAlertManager) : Application.ActivityLifecycleCallbacks { override fun onActivityPaused(activity: Activity) { diff --git a/vector/src/main/java/im/vector/riotx/features/link/LinkHandlerActivity.kt b/vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/link/LinkHandlerActivity.kt rename to vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt index f1782018a0..88bf34c738 100644 --- a/vector/src/main/java/im/vector/riotx/features/link/LinkHandlerActivity.kt +++ b/vector/src/main/java/im/vector/app/features/link/LinkHandlerActivity.kt @@ -14,19 +14,19 @@ * limitations under the License. */ -package im.vector.riotx.features.link +package im.vector.app.features.link import android.content.Intent import android.net.Uri import androidx.appcompat.app.AlertDialog +import im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.error.ErrorFormatter +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.features.login.LoginActivity +import im.vector.app.features.login.LoginConfig import im.vector.matrix.android.api.MatrixCallback -import im.vector.riotx.R -import im.vector.riotx.core.di.ActiveSessionHolder -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.error.ErrorFormatter -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.features.login.LoginActivity -import im.vector.riotx.features.login.LoginConfig import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/login/AbstractLoginFragment.kt b/vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/login/AbstractLoginFragment.kt rename to vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt index 90be21b6be..1bc049829e 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/AbstractLoginFragment.kt +++ b/vector/src/main/java/im/vector/app/features/login/AbstractLoginFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.login +package im.vector.app.features.login import android.os.Build import android.os.Bundle @@ -24,13 +24,13 @@ import androidx.appcompat.app.AlertDialog import androidx.transition.TransitionInflater import com.airbnb.mvrx.activityViewModel import com.airbnb.mvrx.withState +import im.vector.app.R +import im.vector.app.core.dialogs.UnrecognizedCertificateDialog +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.OnBackPressed +import im.vector.app.core.platform.VectorBaseFragment import im.vector.matrix.android.api.failure.Failure import im.vector.matrix.android.api.failure.MatrixError -import im.vector.riotx.R -import im.vector.riotx.core.dialogs.UnrecognizedCertificateDialog -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.OnBackPressed -import im.vector.riotx.core.platform.VectorBaseFragment import javax.net.ssl.HttpsURLConnection /** diff --git a/vector/src/main/java/im/vector/riotx/features/login/Config.kt b/vector/src/main/java/im/vector/app/features/login/Config.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/login/Config.kt rename to vector/src/main/java/im/vector/app/features/login/Config.kt index 0f12947dcb..0789a3c421 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/Config.kt +++ b/vector/src/main/java/im/vector/app/features/login/Config.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.login +package im.vector.app.features.login const val EMS_LINK = "https://element.io/matrix-services" + "?utm_source=element-android" + diff --git a/vector/src/main/java/im/vector/riotx/features/login/HomeServerConnectionConfigFactory.kt b/vector/src/main/java/im/vector/app/features/login/HomeServerConnectionConfigFactory.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/login/HomeServerConnectionConfigFactory.kt rename to vector/src/main/java/im/vector/app/features/login/HomeServerConnectionConfigFactory.kt index 9f116b99f7..d7a7a83ae7 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/HomeServerConnectionConfigFactory.kt +++ b/vector/src/main/java/im/vector/app/features/login/HomeServerConnectionConfigFactory.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.login +package im.vector.app.features.login import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig import timber.log.Timber diff --git a/vector/src/main/java/im/vector/riotx/features/login/JavascriptResponse.kt b/vector/src/main/java/im/vector/app/features/login/JavascriptResponse.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/login/JavascriptResponse.kt rename to vector/src/main/java/im/vector/app/features/login/JavascriptResponse.kt index 4d88cf6097..f370fbd052 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/JavascriptResponse.kt +++ b/vector/src/main/java/im/vector/app/features/login/JavascriptResponse.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.login +package im.vector.app.features.login import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginAction.kt b/vector/src/main/java/im/vector/app/features/login/LoginAction.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/login/LoginAction.kt rename to vector/src/main/java/im/vector/app/features/login/LoginAction.kt index d083f6e9f7..8064b4c464 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/LoginAction.kt +++ b/vector/src/main/java/im/vector/app/features/login/LoginAction.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotx.features.login +package im.vector.app.features.login +import im.vector.app.core.platform.VectorViewModelAction import im.vector.matrix.android.api.auth.data.Credentials import im.vector.matrix.android.api.auth.registration.RegisterThreePid import im.vector.matrix.android.internal.network.ssl.Fingerprint -import im.vector.riotx.core.platform.VectorViewModelAction sealed class LoginAction : VectorViewModelAction { data class UpdateServerType(val serverType: ServerType) : LoginAction() diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginActivity.kt b/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/login/LoginActivity.kt rename to vector/src/main/java/im/vector/app/features/login/LoginActivity.kt index c3f010f6bc..15bda1e98f 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/LoginActivity.kt +++ b/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.login +package im.vector.app.features.login import android.content.Context import android.content.Intent @@ -29,22 +29,22 @@ import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentTransaction import com.airbnb.mvrx.viewModel import com.airbnb.mvrx.withState +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.extensions.POP_BACK_STACK_EXCLUSIVE +import im.vector.app.core.extensions.addFragment +import im.vector.app.core.extensions.addFragmentToBackstack +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.ToolbarConfigurable +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.features.home.HomeActivity +import im.vector.app.features.login.terms.LoginTermsFragment +import im.vector.app.features.login.terms.LoginTermsFragmentArgument +import im.vector.app.features.login.terms.toLocalizedLoginTerms +import im.vector.app.features.pin.UnlockedActivity import im.vector.matrix.android.api.auth.registration.FlowResult import im.vector.matrix.android.api.auth.registration.Stage import im.vector.matrix.android.api.extensions.tryThis -import im.vector.riotx.R -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.extensions.POP_BACK_STACK_EXCLUSIVE -import im.vector.riotx.core.extensions.addFragment -import im.vector.riotx.core.extensions.addFragmentToBackstack -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.ToolbarConfigurable -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.features.home.HomeActivity -import im.vector.riotx.features.login.terms.LoginTermsFragment -import im.vector.riotx.features.login.terms.LoginTermsFragmentArgument -import im.vector.riotx.features.login.terms.toLocalizedLoginTerms -import im.vector.riotx.features.pin.UnlockedActivity import kotlinx.android.synthetic.main.activity_login.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginCaptchaFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginCaptchaFragment.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/login/LoginCaptchaFragment.kt rename to vector/src/main/java/im/vector/app/features/login/LoginCaptchaFragment.kt index 9bd709d1bd..5ae65d4fc7 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/LoginCaptchaFragment.kt +++ b/vector/src/main/java/im/vector/app/features/login/LoginCaptchaFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.login +package im.vector.app.features.login import android.annotation.SuppressLint import android.content.DialogInterface @@ -31,9 +31,9 @@ import android.webkit.WebViewClient import androidx.appcompat.app.AlertDialog import androidx.core.view.isVisible import com.airbnb.mvrx.args +import im.vector.app.R +import im.vector.app.core.utils.AssetReader import im.vector.matrix.android.internal.di.MoshiProvider -import im.vector.riotx.R -import im.vector.riotx.core.utils.AssetReader import kotlinx.android.parcel.Parcelize import kotlinx.android.synthetic.main.fragment_login_captcha.* import timber.log.Timber diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginConfig.kt b/vector/src/main/java/im/vector/app/features/login/LoginConfig.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/login/LoginConfig.kt rename to vector/src/main/java/im/vector/app/features/login/LoginConfig.kt index 1613d1b041..701335af6b 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/LoginConfig.kt +++ b/vector/src/main/java/im/vector/app/features/login/LoginConfig.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.login +package im.vector.app.features.login import android.net.Uri import android.os.Parcelable diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt rename to vector/src/main/java/im/vector/app/features/login/LoginFragment.kt index 6f032120b7..29ce5bbd27 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt +++ b/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.login +package im.vector.app.features.login import android.os.Build import android.os.Bundle @@ -28,14 +28,14 @@ import com.airbnb.mvrx.Fail import com.airbnb.mvrx.Loading import com.airbnb.mvrx.Success import com.jakewharton.rxbinding3.widget.textChanges +import im.vector.app.R +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.extensions.hideKeyboard +import im.vector.app.core.extensions.showPassword +import im.vector.app.core.extensions.toReducedUrl import im.vector.matrix.android.api.failure.Failure import im.vector.matrix.android.api.failure.MatrixError import im.vector.matrix.android.api.failure.isInvalidPassword -import im.vector.riotx.R -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.extensions.hideKeyboard -import im.vector.riotx.core.extensions.showPassword -import im.vector.riotx.core.extensions.toReducedUrl import io.reactivex.Observable import io.reactivex.functions.BiFunction import io.reactivex.rxkotlin.subscribeBy diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginGenericTextInputFormFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginGenericTextInputFormFragment.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/login/LoginGenericTextInputFormFragment.kt rename to vector/src/main/java/im/vector/app/features/login/LoginGenericTextInputFormFragment.kt index 5203e60b26..85b2a786ce 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/LoginGenericTextInputFormFragment.kt +++ b/vector/src/main/java/im/vector/app/features/login/LoginGenericTextInputFormFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.login +package im.vector.app.features.login import android.os.Build import android.os.Bundle @@ -28,13 +28,13 @@ import com.airbnb.mvrx.args import com.google.i18n.phonenumbers.NumberParseException import com.google.i18n.phonenumbers.PhoneNumberUtil import com.jakewharton.rxbinding3.widget.textChanges +import im.vector.app.R +import im.vector.app.core.extensions.hideKeyboard +import im.vector.app.core.extensions.isEmail +import im.vector.app.core.extensions.setTextOrHide import im.vector.matrix.android.api.auth.registration.RegisterThreePid import im.vector.matrix.android.api.failure.Failure import im.vector.matrix.android.api.failure.is401 -import im.vector.riotx.R -import im.vector.riotx.core.extensions.hideKeyboard -import im.vector.riotx.core.extensions.isEmail -import im.vector.riotx.core.extensions.setTextOrHide import kotlinx.android.parcel.Parcelize import kotlinx.android.synthetic.main.fragment_login_generic_text_input_form.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginMode.kt b/vector/src/main/java/im/vector/app/features/login/LoginMode.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/login/LoginMode.kt rename to vector/src/main/java/im/vector/app/features/login/LoginMode.kt index ee39ac564b..9a930dcd86 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/LoginMode.kt +++ b/vector/src/main/java/im/vector/app/features/login/LoginMode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.login +package im.vector.app.features.login enum class LoginMode { Unknown, diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginResetPasswordFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordFragment.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/login/LoginResetPasswordFragment.kt rename to vector/src/main/java/im/vector/app/features/login/LoginResetPasswordFragment.kt index ba3c8e1123..9ca266c417 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/LoginResetPasswordFragment.kt +++ b/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.login +package im.vector.app.features.login import android.os.Bundle import android.view.View @@ -24,11 +24,11 @@ import com.airbnb.mvrx.Fail import com.airbnb.mvrx.Loading import com.airbnb.mvrx.Success import com.jakewharton.rxbinding3.widget.textChanges -import im.vector.riotx.R -import im.vector.riotx.core.extensions.hideKeyboard -import im.vector.riotx.core.extensions.isEmail -import im.vector.riotx.core.extensions.showPassword -import im.vector.riotx.core.extensions.toReducedUrl +import im.vector.app.R +import im.vector.app.core.extensions.hideKeyboard +import im.vector.app.core.extensions.isEmail +import im.vector.app.core.extensions.showPassword +import im.vector.app.core.extensions.toReducedUrl import io.reactivex.Observable import io.reactivex.functions.BiFunction import io.reactivex.rxkotlin.subscribeBy diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginResetPasswordMailConfirmationFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordMailConfirmationFragment.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/login/LoginResetPasswordMailConfirmationFragment.kt rename to vector/src/main/java/im/vector/app/features/login/LoginResetPasswordMailConfirmationFragment.kt index f340fb8f9f..5092df4ecf 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/LoginResetPasswordMailConfirmationFragment.kt +++ b/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordMailConfirmationFragment.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.features.login +package im.vector.app.features.login import androidx.appcompat.app.AlertDialog import butterknife.OnClick import com.airbnb.mvrx.Fail import com.airbnb.mvrx.Success +import im.vector.app.R import im.vector.matrix.android.api.failure.is401 -import im.vector.riotx.R import kotlinx.android.synthetic.main.fragment_login_reset_password_mail_confirmation.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginResetPasswordSuccessFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordSuccessFragment.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/login/LoginResetPasswordSuccessFragment.kt rename to vector/src/main/java/im/vector/app/features/login/LoginResetPasswordSuccessFragment.kt index fd3c5e6377..93c987f2db 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/LoginResetPasswordSuccessFragment.kt +++ b/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordSuccessFragment.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.login +package im.vector.app.features.login import butterknife.OnClick -import im.vector.riotx.R +import im.vector.app.R import javax.inject.Inject /** diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginServerSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginServerSelectionFragment.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/login/LoginServerSelectionFragment.kt rename to vector/src/main/java/im/vector/app/features/login/LoginServerSelectionFragment.kt index c533913718..f4595de634 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/LoginServerSelectionFragment.kt +++ b/vector/src/main/java/im/vector/app/features/login/LoginServerSelectionFragment.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package im.vector.riotx.features.login +package im.vector.app.features.login import android.os.Bundle import android.view.View import butterknife.OnClick -import im.vector.riotx.R -import im.vector.riotx.core.utils.openUrlInChromeCustomTab +import im.vector.app.R +import im.vector.app.core.utils.openUrlInChromeCustomTab import kotlinx.android.synthetic.main.fragment_login_server_selection.* import me.gujun.android.span.span import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginServerUrlFormFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/login/LoginServerUrlFormFragment.kt rename to vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt index b5c19d779a..4b9f528254 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/LoginServerUrlFormFragment.kt +++ b/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.login +package im.vector.app.features.login import android.annotation.SuppressLint import android.os.Bundle @@ -23,10 +23,10 @@ import android.view.inputmethod.EditorInfo import androidx.core.view.isVisible import butterknife.OnClick import com.jakewharton.rxbinding3.widget.textChanges -import im.vector.riotx.R -import im.vector.riotx.core.extensions.hideKeyboard -import im.vector.riotx.core.utils.ensureProtocol -import im.vector.riotx.core.utils.openUrlInChromeCustomTab +import im.vector.app.R +import im.vector.app.core.extensions.hideKeyboard +import im.vector.app.core.utils.ensureProtocol +import im.vector.app.core.utils.openUrlInChromeCustomTab import kotlinx.android.synthetic.main.fragment_login_server_url_form.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginSignUpSignInSelectionFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSelectionFragment.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/login/LoginSignUpSignInSelectionFragment.kt rename to vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSelectionFragment.kt index 7b0ba7b1f9..fa2f6b9df8 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/LoginSignUpSignInSelectionFragment.kt +++ b/vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSelectionFragment.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotx.features.login +package im.vector.app.features.login import androidx.core.view.isVisible import butterknife.OnClick -import im.vector.riotx.R -import im.vector.riotx.core.extensions.toReducedUrl +import im.vector.app.R +import im.vector.app.core.extensions.toReducedUrl import kotlinx.android.synthetic.main.fragment_login_signup_signin_selection.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginSignUpSignInSsoFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSsoFragment.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/login/LoginSignUpSignInSsoFragment.kt rename to vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSsoFragment.kt index 538e8be675..8d33ec2e27 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/LoginSignUpSignInSsoFragment.kt +++ b/vector/src/main/java/im/vector/app/features/login/LoginSignUpSignInSsoFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.login +package im.vector.app.features.login import android.content.ComponentName import android.net.Uri @@ -22,8 +22,8 @@ import androidx.browser.customtabs.CustomTabsClient import androidx.browser.customtabs.CustomTabsServiceConnection import androidx.browser.customtabs.CustomTabsSession import androidx.core.view.isVisible -import im.vector.riotx.R -import im.vector.riotx.core.utils.openUrlInChromeCustomTab +import im.vector.app.R +import im.vector.app.core.utils.openUrlInChromeCustomTab import kotlinx.android.synthetic.main.fragment_login_signup_signin_selection.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginSplashFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/login/LoginSplashFragment.kt rename to vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt index c860d02fec..fe0c36efc6 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/LoginSplashFragment.kt +++ b/vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.login +package im.vector.app.features.login import butterknife.OnClick -import im.vector.riotx.R +import im.vector.app.R import javax.inject.Inject /** diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginViewEvents.kt b/vector/src/main/java/im/vector/app/features/login/LoginViewEvents.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/login/LoginViewEvents.kt rename to vector/src/main/java/im/vector/app/features/login/LoginViewEvents.kt index fe5c00399b..ef16a08301 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/LoginViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/login/LoginViewEvents.kt @@ -15,10 +15,10 @@ * */ -package im.vector.riotx.features.login +package im.vector.app.features.login +import im.vector.app.core.platform.VectorViewEvents import im.vector.matrix.android.api.auth.registration.FlowResult -import im.vector.riotx.core.platform.VectorViewEvents /** * Transient events for Login diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/login/LoginViewModel.kt rename to vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt index bb04fef685..ab66b8fc3e 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/LoginViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.login +package im.vector.app.features.login import android.content.Context import android.net.Uri @@ -28,6 +28,14 @@ import com.airbnb.mvrx.Uninitialized import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.extensions.configureAndStart +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.utils.ensureTrailingSlash +import im.vector.app.features.signout.soft.SoftLogoutActivity import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.auth.AuthenticationService import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig @@ -42,14 +50,6 @@ import im.vector.matrix.android.api.auth.wellknown.WellknownResult import im.vector.matrix.android.api.failure.Failure import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.util.Cancelable -import im.vector.riotx.R -import im.vector.riotx.core.di.ActiveSessionHolder -import im.vector.riotx.core.extensions.configureAndStart -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.core.utils.ensureTrailingSlash -import im.vector.riotx.features.signout.soft.SoftLogoutActivity import timber.log.Timber import java.util.concurrent.CancellationException diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginViewState.kt b/vector/src/main/java/im/vector/app/features/login/LoginViewState.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/login/LoginViewState.kt rename to vector/src/main/java/im/vector/app/features/login/LoginViewState.kt index 26e552ed1f..198b0868a6 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/LoginViewState.kt +++ b/vector/src/main/java/im/vector/app/features/login/LoginViewState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.login +package im.vector.app.features.login import com.airbnb.mvrx.Async import com.airbnb.mvrx.Loading @@ -22,9 +22,9 @@ import com.airbnb.mvrx.MvRxState import com.airbnb.mvrx.PersistState import com.airbnb.mvrx.Success import com.airbnb.mvrx.Uninitialized +import im.vector.app.core.extensions.appendParamToUrl import im.vector.matrix.android.api.auth.SSO_REDIRECT_PATH import im.vector.matrix.android.api.auth.SSO_REDIRECT_URL_PARAM -import im.vector.riotx.core.extensions.appendParamToUrl data class LoginViewState( val asyncLoginAction: Async = Uninitialized, diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginWaitForEmailFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginWaitForEmailFragment.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/login/LoginWaitForEmailFragment.kt rename to vector/src/main/java/im/vector/app/features/login/LoginWaitForEmailFragment.kt index c4507876d7..6e19bfc4d3 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/LoginWaitForEmailFragment.kt +++ b/vector/src/main/java/im/vector/app/features/login/LoginWaitForEmailFragment.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.features.login +package im.vector.app.features.login import android.os.Bundle import android.os.Parcelable import android.view.View import com.airbnb.mvrx.args +import im.vector.app.R import im.vector.matrix.android.api.failure.is401 -import im.vector.riotx.R import kotlinx.android.parcel.Parcelize import kotlinx.android.synthetic.main.fragment_login_wait_for_email.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginWebFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginWebFragment.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/login/LoginWebFragment.kt rename to vector/src/main/java/im/vector/app/features/login/LoginWebFragment.kt index 62431647c0..e8acf78a00 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/LoginWebFragment.kt +++ b/vector/src/main/java/im/vector/app/features/login/LoginWebFragment.kt @@ -16,7 +16,7 @@ @file:Suppress("DEPRECATION") -package im.vector.riotx.features.login +package im.vector.app.features.login import android.annotation.SuppressLint import android.content.DialogInterface @@ -31,15 +31,15 @@ import android.webkit.WebView import android.webkit.WebViewClient import androidx.appcompat.app.AlertDialog import com.airbnb.mvrx.activityViewModel +import im.vector.app.R +import im.vector.app.core.extensions.appendParamToUrl +import im.vector.app.core.utils.AssetReader +import im.vector.app.features.signout.soft.SoftLogoutAction +import im.vector.app.features.signout.soft.SoftLogoutViewModel import im.vector.matrix.android.api.auth.LOGIN_FALLBACK_PATH import im.vector.matrix.android.api.auth.REGISTER_FALLBACK_PATH import im.vector.matrix.android.api.auth.data.Credentials import im.vector.matrix.android.internal.di.MoshiProvider -import im.vector.riotx.R -import im.vector.riotx.core.extensions.appendParamToUrl -import im.vector.riotx.core.utils.AssetReader -import im.vector.riotx.features.signout.soft.SoftLogoutAction -import im.vector.riotx.features.signout.soft.SoftLogoutViewModel import kotlinx.android.synthetic.main.fragment_login_web.* import timber.log.Timber import java.net.URLDecoder diff --git a/vector/src/main/java/im/vector/riotx/features/login/ReAuthHelper.kt b/vector/src/main/java/im/vector/app/features/login/ReAuthHelper.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/login/ReAuthHelper.kt rename to vector/src/main/java/im/vector/app/features/login/ReAuthHelper.kt index 78979930bd..f379048568 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/ReAuthHelper.kt +++ b/vector/src/main/java/im/vector/app/features/login/ReAuthHelper.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.login +package im.vector.app.features.login -import im.vector.riotx.core.utils.TemporaryStore +import im.vector.app.core.utils.TemporaryStore import javax.inject.Inject import javax.inject.Singleton diff --git a/vector/src/main/java/im/vector/riotx/features/login/ServerType.kt b/vector/src/main/java/im/vector/app/features/login/ServerType.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/login/ServerType.kt rename to vector/src/main/java/im/vector/app/features/login/ServerType.kt index 058a052059..e0a6ba8b40 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/ServerType.kt +++ b/vector/src/main/java/im/vector/app/features/login/ServerType.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.login +package im.vector.app.features.login enum class ServerType { Unknown, diff --git a/vector/src/main/java/im/vector/riotx/features/login/SignMode.kt b/vector/src/main/java/im/vector/app/features/login/SignMode.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/login/SignMode.kt rename to vector/src/main/java/im/vector/app/features/login/SignMode.kt index ad06f1f4a9..9933b92f27 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/SignMode.kt +++ b/vector/src/main/java/im/vector/app/features/login/SignMode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.login +package im.vector.app.features.login enum class SignMode { Unknown, diff --git a/vector/src/main/java/im/vector/riotx/features/login/SupportedStage.kt b/vector/src/main/java/im/vector/app/features/login/SupportedStage.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/login/SupportedStage.kt rename to vector/src/main/java/im/vector/app/features/login/SupportedStage.kt index ce234caeb0..56f37a5383 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/SupportedStage.kt +++ b/vector/src/main/java/im/vector/app/features/login/SupportedStage.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.login +package im.vector.app.features.login import im.vector.matrix.android.api.auth.registration.Stage diff --git a/vector/src/main/java/im/vector/riotx/features/login/terms/LocalizedFlowDataLoginTermsChecked.kt b/vector/src/main/java/im/vector/app/features/login/terms/LocalizedFlowDataLoginTermsChecked.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/login/terms/LocalizedFlowDataLoginTermsChecked.kt rename to vector/src/main/java/im/vector/app/features/login/terms/LocalizedFlowDataLoginTermsChecked.kt index 6659d65dd6..afb655eb26 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/terms/LocalizedFlowDataLoginTermsChecked.kt +++ b/vector/src/main/java/im/vector/app/features/login/terms/LocalizedFlowDataLoginTermsChecked.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.login.terms +package im.vector.app.features.login.terms import im.vector.matrix.android.internal.auth.registration.LocalizedFlowDataLoginTerms diff --git a/vector/src/main/java/im/vector/riotx/features/login/terms/LoginTermsFragment.kt b/vector/src/main/java/im/vector/app/features/login/terms/LoginTermsFragment.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/login/terms/LoginTermsFragment.kt rename to vector/src/main/java/im/vector/app/features/login/terms/LoginTermsFragment.kt index 49abc9ba81..7968b9e60b 100755 --- a/vector/src/main/java/im/vector/riotx/features/login/terms/LoginTermsFragment.kt +++ b/vector/src/main/java/im/vector/app/features/login/terms/LoginTermsFragment.kt @@ -14,22 +14,22 @@ * limitations under the License. */ -package im.vector.riotx.features.login.terms +package im.vector.app.features.login.terms import android.os.Bundle import android.os.Parcelable import android.view.View import butterknife.OnClick import com.airbnb.mvrx.args +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.extensions.toReducedUrl +import im.vector.app.core.utils.openUrlInChromeCustomTab +import im.vector.app.features.login.AbstractLoginFragment +import im.vector.app.features.login.LoginAction +import im.vector.app.features.login.LoginViewState import im.vector.matrix.android.internal.auth.registration.LocalizedFlowDataLoginTerms -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.extensions.toReducedUrl -import im.vector.riotx.core.utils.openUrlInChromeCustomTab -import im.vector.riotx.features.login.AbstractLoginFragment -import im.vector.riotx.features.login.LoginAction -import im.vector.riotx.features.login.LoginViewState import kotlinx.android.parcel.Parcelize import kotlinx.android.synthetic.main.fragment_login_terms.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/login/terms/LoginTermsViewState.kt b/vector/src/main/java/im/vector/app/features/login/terms/LoginTermsViewState.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/login/terms/LoginTermsViewState.kt rename to vector/src/main/java/im/vector/app/features/login/terms/LoginTermsViewState.kt index 77293fbef6..a230914451 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/terms/LoginTermsViewState.kt +++ b/vector/src/main/java/im/vector/app/features/login/terms/LoginTermsViewState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.login.terms +package im.vector.app.features.login.terms import com.airbnb.mvrx.MvRxState import im.vector.matrix.android.internal.auth.registration.LocalizedFlowDataLoginTerms diff --git a/vector/src/main/java/im/vector/riotx/features/login/terms/PolicyController.kt b/vector/src/main/java/im/vector/app/features/login/terms/PolicyController.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/login/terms/PolicyController.kt rename to vector/src/main/java/im/vector/app/features/login/terms/PolicyController.kt index 42ed87a280..91b0ba39ed 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/terms/PolicyController.kt +++ b/vector/src/main/java/im/vector/app/features/login/terms/PolicyController.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.login.terms +package im.vector.app.features.login.terms import android.view.View import com.airbnb.epoxy.TypedEpoxyController diff --git a/vector/src/main/java/im/vector/riotx/features/login/terms/PolicyItem.kt b/vector/src/main/java/im/vector/app/features/login/terms/PolicyItem.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/login/terms/PolicyItem.kt rename to vector/src/main/java/im/vector/app/features/login/terms/PolicyItem.kt index 50e92488a1..b15893b239 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/terms/PolicyItem.kt +++ b/vector/src/main/java/im/vector/app/features/login/terms/PolicyItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.login.terms +package im.vector.app.features.login.terms import android.view.View import android.widget.CheckBox @@ -23,8 +23,8 @@ import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelWithHolder -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder @EpoxyModelClass(layout = R.layout.item_policy) abstract class PolicyItem : EpoxyModelWithHolder() { diff --git a/vector/src/main/java/im/vector/riotx/features/login/terms/UrlAndName.kt b/vector/src/main/java/im/vector/app/features/login/terms/UrlAndName.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/login/terms/UrlAndName.kt rename to vector/src/main/java/im/vector/app/features/login/terms/UrlAndName.kt index 1ccb7cac49..f298aeca37 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/terms/UrlAndName.kt +++ b/vector/src/main/java/im/vector/app/features/login/terms/UrlAndName.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.login.terms +package im.vector.app.features.login.terms data class UrlAndName( val url: String, diff --git a/vector/src/main/java/im/vector/riotx/features/login/terms/converter.kt b/vector/src/main/java/im/vector/app/features/login/terms/converter.kt similarity index 99% rename from vector/src/main/java/im/vector/riotx/features/login/terms/converter.kt rename to vector/src/main/java/im/vector/app/features/login/terms/converter.kt index d28d12eee8..16c9052e08 100644 --- a/vector/src/main/java/im/vector/riotx/features/login/terms/converter.kt +++ b/vector/src/main/java/im/vector/app/features/login/terms/converter.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.login.terms +package im.vector.app.features.login.terms import im.vector.matrix.android.api.auth.registration.TermPolicies import im.vector.matrix.android.internal.auth.registration.LocalizedFlowDataLoginTerms diff --git a/vector/src/main/java/im/vector/riotx/features/media/AttachmentOverlayView.kt b/vector/src/main/java/im/vector/app/features/media/AttachmentOverlayView.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/media/AttachmentOverlayView.kt rename to vector/src/main/java/im/vector/app/features/media/AttachmentOverlayView.kt index 46524f3bfd..db0b6811da 100644 --- a/vector/src/main/java/im/vector/riotx/features/media/AttachmentOverlayView.kt +++ b/vector/src/main/java/im/vector/app/features/media/AttachmentOverlayView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.media +package im.vector.app.features.media import android.content.Context import android.graphics.Color @@ -25,9 +25,9 @@ import android.widget.SeekBar import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.Group +import im.vector.app.R import im.vector.lib.attachmentviewer.AttachmentEventListener import im.vector.lib.attachmentviewer.AttachmentEvents -import im.vector.riotx.R class AttachmentOverlayView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 diff --git a/vector/src/main/java/im/vector/riotx/features/media/BaseAttachmentProvider.kt b/vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt similarity index 99% rename from vector/src/main/java/im/vector/riotx/features/media/BaseAttachmentProvider.kt rename to vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt index d843b4aad2..fcd4accd2f 100644 --- a/vector/src/main/java/im/vector/riotx/features/media/BaseAttachmentProvider.kt +++ b/vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.media +package im.vector.app.features.media import android.content.Context import android.graphics.drawable.Drawable diff --git a/vector/src/main/java/im/vector/riotx/features/media/BigImageViewerActivity.kt b/vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/media/BigImageViewerActivity.kt rename to vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt index e3ff5e1513..9d0a931a32 100644 --- a/vector/src/main/java/im/vector/riotx/features/media/BigImageViewerActivity.kt +++ b/vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.media +package im.vector.app.features.media import android.app.Activity import android.content.Context @@ -27,18 +27,18 @@ import android.widget.Toast import androidx.appcompat.app.AlertDialog import androidx.core.net.toUri import com.yalantis.ucrop.UCrop +import im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO +import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA +import im.vector.app.core.utils.allGranted +import im.vector.app.core.utils.checkPermissions import im.vector.lib.multipicker.MultiPicker import im.vector.lib.multipicker.entity.MultiPickerImageType -import im.vector.riotx.R -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.core.resources.ColorProvider -import im.vector.riotx.core.resources.StringProvider -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.allGranted -import im.vector.riotx.core.utils.checkPermissions import kotlinx.android.synthetic.main.activity_big_image_viewer.* import java.io.File import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/media/DataAttachmentRoomProvider.kt b/vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/media/DataAttachmentRoomProvider.kt rename to vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt index 439dffb2ff..525f348900 100644 --- a/vector/src/main/java/im/vector/riotx/features/media/DataAttachmentRoomProvider.kt +++ b/vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt @@ -14,18 +14,18 @@ * limitations under the License. */ -package im.vector.riotx.features.media +package im.vector.app.features.media import android.content.Context import android.view.View import androidx.core.view.isVisible +import im.vector.app.core.date.VectorDateFormatter +import im.vector.app.core.extensions.localDateTime import im.vector.lib.attachmentviewer.AttachmentInfo import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.session.events.model.isVideoMessage import im.vector.matrix.android.api.session.file.FileService import im.vector.matrix.android.api.session.room.Room -import im.vector.riotx.core.date.VectorDateFormatter -import im.vector.riotx.core.extensions.localDateTime import java.io.File class DataAttachmentRoomProvider( diff --git a/vector/src/main/java/im/vector/riotx/features/media/DefaultImageLoaderCallback.kt b/vector/src/main/java/im/vector/app/features/media/DefaultImageLoaderCallback.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/media/DefaultImageLoaderCallback.kt rename to vector/src/main/java/im/vector/app/features/media/DefaultImageLoaderCallback.kt index 0cc74f3fee..ec77121b62 100644 --- a/vector/src/main/java/im/vector/riotx/features/media/DefaultImageLoaderCallback.kt +++ b/vector/src/main/java/im/vector/app/features/media/DefaultImageLoaderCallback.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.media +package im.vector.app.features.media import com.github.piasy.biv.loader.ImageLoader import java.io.File diff --git a/vector/src/main/java/im/vector/riotx/features/media/ImageContentRenderer.kt b/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/media/ImageContentRenderer.kt rename to vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt index 926cef0668..ad491e2505 100644 --- a/vector/src/main/java/im/vector/riotx/features/media/ImageContentRenderer.kt +++ b/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.media +package im.vector.app.features.media import android.graphics.drawable.Drawable import android.net.Uri @@ -29,15 +29,15 @@ import com.bumptech.glide.request.target.CustomViewTarget import com.bumptech.glide.request.target.Target import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView.ORIENTATION_USE_EXIF import com.github.piasy.biv.view.BigImageView +import im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.glide.GlideApp +import im.vector.app.core.glide.GlideRequest +import im.vector.app.core.ui.model.Size +import im.vector.app.core.utils.DimensionConverter +import im.vector.app.core.utils.isLocalFile import im.vector.matrix.android.api.session.content.ContentUrlResolver import im.vector.matrix.android.internal.crypto.attachments.ElementToDecrypt -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.ui.model.Size -import im.vector.riotx.core.utils.DimensionConverter -import im.vector.riotx.core.utils.isLocalFile import kotlinx.android.parcel.Parcelize import timber.log.Timber import java.io.File diff --git a/vector/src/main/java/im/vector/riotx/features/media/ImageMediaViewerActivity.kt b/vector/src/main/java/im/vector/app/features/media/ImageMediaViewerActivity.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/media/ImageMediaViewerActivity.kt rename to vector/src/main/java/im/vector/app/features/media/ImageMediaViewerActivity.kt index 8a6c2f7545..697dfed644 100644 --- a/vector/src/main/java/im/vector/riotx/features/media/ImageMediaViewerActivity.kt +++ b/vector/src/main/java/im/vector/app/features/media/ImageMediaViewerActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.media +package im.vector.app.features.media import android.content.Context import android.content.Intent @@ -38,15 +38,15 @@ import com.bumptech.glide.request.RequestListener import com.bumptech.glide.request.target.Target import com.github.piasy.biv.indicator.progresspie.ProgressPieIndicator import com.github.piasy.biv.view.GlideImageViewFactory +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.glide.GlideApp +import im.vector.app.core.intent.getMimeTypeFromUri +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.core.utils.shareMedia import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.file.FileService -import im.vector.riotx.R -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.glide.GlideApp -import im.vector.riotx.core.intent.getMimeTypeFromUri -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.core.utils.shareMedia import kotlinx.android.synthetic.main.activity_image_media_viewer.* import timber.log.Timber import java.io.File @@ -65,7 +65,7 @@ class ImageMediaViewerActivity : VectorBaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(im.vector.riotx.R.layout.activity_image_media_viewer) + setContentView(im.vector.app.R.layout.activity_image_media_viewer) if (intent.hasExtra(EXTRA_MEDIA_DATA)) { mediaData = intent.getParcelableExtra(EXTRA_MEDIA_DATA)!! diff --git a/vector/src/main/java/im/vector/riotx/features/media/RoomEventsAttachmentProvider.kt b/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/media/RoomEventsAttachmentProvider.kt rename to vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt index d4a81314fb..ed6d34d90b 100644 --- a/vector/src/main/java/im/vector/riotx/features/media/RoomEventsAttachmentProvider.kt +++ b/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt @@ -14,11 +14,13 @@ * limitations under the License. */ -package im.vector.riotx.features.media +package im.vector.app.features.media import android.content.Context import android.view.View import androidx.core.view.isVisible +import im.vector.app.core.date.VectorDateFormatter +import im.vector.app.core.extensions.localDateTime import im.vector.lib.attachmentviewer.AttachmentInfo import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.session.Session @@ -33,8 +35,6 @@ import im.vector.matrix.android.api.session.room.model.message.MessageWithAttach import im.vector.matrix.android.api.session.room.model.message.getFileUrl import im.vector.matrix.android.api.session.room.timeline.TimelineEvent import im.vector.matrix.android.internal.crypto.attachments.toElementToDecrypt -import im.vector.riotx.core.date.VectorDateFormatter -import im.vector.riotx.core.extensions.localDateTime import java.io.File import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/media/UCropHelper.kt b/vector/src/main/java/im/vector/app/features/media/UCropHelper.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/media/UCropHelper.kt rename to vector/src/main/java/im/vector/app/features/media/UCropHelper.kt index 5e3ca5f483..8c8c8f22f1 100644 --- a/vector/src/main/java/im/vector/riotx/features/media/UCropHelper.kt +++ b/vector/src/main/java/im/vector/app/features/media/UCropHelper.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.media +package im.vector.app.features.media import android.content.Context import android.graphics.Color @@ -22,8 +22,8 @@ import android.net.Uri import androidx.core.content.ContextCompat import com.yalantis.ucrop.UCrop import com.yalantis.ucrop.UCropActivity -import im.vector.riotx.R -import im.vector.riotx.features.themes.ThemeUtils +import im.vector.app.R +import im.vector.app.features.themes.ThemeUtils fun createUCropWithDefaultSettings(context: Context, source: Uri, destination: Uri, toolbarTitle: String?): UCrop { return UCrop.of(source, destination) diff --git a/vector/src/main/java/im/vector/riotx/features/media/VectorAttachmentViewerActivity.kt b/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/media/VectorAttachmentViewerActivity.kt rename to vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt index 9e13e2a028..74f4c7148f 100644 --- a/vector/src/main/java/im/vector/riotx/features/media/VectorAttachmentViewerActivity.kt +++ b/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.media +package im.vector.app.features.media import android.content.Context import android.content.Intent @@ -30,18 +30,18 @@ import androidx.core.view.isInvisible import androidx.core.view.isVisible import androidx.lifecycle.Lifecycle import androidx.transition.Transition +import im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.di.DaggerScreenComponent +import im.vector.app.core.di.HasVectorInjector +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.di.VectorComponent +import im.vector.app.core.intent.getMimeTypeFromUri +import im.vector.app.core.utils.shareMedia +import im.vector.app.features.themes.ActivityOtherThemes +import im.vector.app.features.themes.ThemeUtils import im.vector.lib.attachmentviewer.AttachmentCommands import im.vector.lib.attachmentviewer.AttachmentViewerActivity -import im.vector.riotx.R -import im.vector.riotx.core.di.ActiveSessionHolder -import im.vector.riotx.core.di.DaggerScreenComponent -import im.vector.riotx.core.di.HasVectorInjector -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.di.VectorComponent -import im.vector.riotx.core.intent.getMimeTypeFromUri -import im.vector.riotx.core.utils.shareMedia -import im.vector.riotx.features.themes.ActivityOtherThemes -import im.vector.riotx.features.themes.ThemeUtils import kotlinx.android.parcel.Parcelize import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/media/VideoContentRenderer.kt b/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/media/VideoContentRenderer.kt rename to vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt index e6dec88349..451a7ed306 100644 --- a/vector/src/main/java/im/vector/riotx/features/media/VideoContentRenderer.kt +++ b/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt @@ -14,19 +14,19 @@ * limitations under the License. */ -package im.vector.riotx.features.media +package im.vector.app.features.media import android.widget.ImageView import android.widget.ProgressBar import android.widget.TextView import android.widget.VideoView import androidx.core.view.isVisible +import im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.error.ErrorFormatter import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.session.file.FileService import im.vector.matrix.android.internal.crypto.attachments.ElementToDecrypt -import im.vector.riotx.R -import im.vector.riotx.core.di.ActiveSessionHolder -import im.vector.riotx.core.error.ErrorFormatter import kotlinx.android.parcel.Parcelize import timber.log.Timber import java.io.File diff --git a/vector/src/main/java/im/vector/riotx/features/media/VideoMediaViewerActivity.kt b/vector/src/main/java/im/vector/app/features/media/VideoMediaViewerActivity.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/media/VideoMediaViewerActivity.kt rename to vector/src/main/java/im/vector/app/features/media/VideoMediaViewerActivity.kt index d9df861a25..a7ca7a3de1 100644 --- a/vector/src/main/java/im/vector/riotx/features/media/VideoMediaViewerActivity.kt +++ b/vector/src/main/java/im/vector/app/features/media/VideoMediaViewerActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.media +package im.vector.app.features.media import android.content.Context import android.content.Intent @@ -22,14 +22,14 @@ import android.os.Bundle import android.view.MenuItem import androidx.appcompat.widget.Toolbar import androidx.core.net.toUri +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.intent.getMimeTypeFromUri +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.core.utils.shareMedia import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.file.FileService -import im.vector.riotx.R -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.intent.getMimeTypeFromUri -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.core.utils.shareMedia import kotlinx.android.synthetic.main.activity_video_media_viewer.* import java.io.File import javax.inject.Inject @@ -48,7 +48,7 @@ class VideoMediaViewerActivity : VectorBaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(im.vector.riotx.R.layout.activity_video_media_viewer) + setContentView(im.vector.app.R.layout.activity_video_media_viewer) if (intent.hasExtra(EXTRA_MEDIA_DATA)) { mediaData = intent.getParcelableExtra(EXTRA_MEDIA_DATA)!! diff --git a/vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt similarity index 85% rename from vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt rename to vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt index d9b96ad01b..d824cc69b1 100644 --- a/vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt +++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.navigation +package im.vector.app.features.navigation import android.app.Activity import android.content.Context @@ -26,47 +26,47 @@ import androidx.core.app.TaskStackBuilder import androidx.core.util.Pair import androidx.core.view.ViewCompat import androidx.fragment.app.Fragment +import im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.error.fatalError +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.core.utils.toast +import im.vector.app.features.createdirect.CreateDirectRoomActivity +import im.vector.app.features.crypto.keysbackup.settings.KeysBackupManageActivity +import im.vector.app.features.crypto.keysbackup.setup.KeysBackupSetupActivity +import im.vector.app.features.crypto.recover.BootstrapBottomSheet +import im.vector.app.features.crypto.verification.SupportedVerificationMethodsProvider +import im.vector.app.features.crypto.verification.VerificationBottomSheet +import im.vector.app.features.debug.DebugMenuActivity +import im.vector.app.features.home.room.detail.RoomDetailActivity +import im.vector.app.features.home.room.detail.RoomDetailArgs +import im.vector.app.features.home.room.detail.widget.WidgetRequestCodes +import im.vector.app.features.home.room.filtered.FilteredRoomsActivity +import im.vector.app.features.invite.InviteUsersToRoomActivity +import im.vector.app.features.media.AttachmentData +import im.vector.app.features.media.BigImageViewerActivity +import im.vector.app.features.media.VectorAttachmentViewerActivity +import im.vector.app.features.pin.PinActivity +import im.vector.app.features.pin.PinArgs +import im.vector.app.features.pin.PinMode +import im.vector.app.features.roomdirectory.RoomDirectoryActivity +import im.vector.app.features.roomdirectory.createroom.CreateRoomActivity +import im.vector.app.features.roomdirectory.roompreview.RoomPreviewActivity +import im.vector.app.features.roommemberprofile.RoomMemberProfileActivity +import im.vector.app.features.roommemberprofile.RoomMemberProfileArgs +import im.vector.app.features.roomprofile.RoomProfileActivity +import im.vector.app.features.settings.VectorPreferences +import im.vector.app.features.settings.VectorSettingsActivity +import im.vector.app.features.share.SharedData +import im.vector.app.features.terms.ReviewTermsActivity +import im.vector.app.features.widgets.WidgetActivity +import im.vector.app.features.widgets.WidgetArgsBuilder import im.vector.matrix.android.api.session.crypto.verification.IncomingSasVerificationTransaction import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoom import im.vector.matrix.android.api.session.room.model.thirdparty.RoomDirectoryData import im.vector.matrix.android.api.session.terms.TermsService import im.vector.matrix.android.api.session.widgets.model.Widget import im.vector.matrix.android.api.util.MatrixItem -import im.vector.riotx.R -import im.vector.riotx.core.di.ActiveSessionHolder -import im.vector.riotx.core.error.fatalError -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.core.utils.toast -import im.vector.riotx.features.createdirect.CreateDirectRoomActivity -import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupManageActivity -import im.vector.riotx.features.crypto.keysbackup.setup.KeysBackupSetupActivity -import im.vector.riotx.features.crypto.recover.BootstrapBottomSheet -import im.vector.riotx.features.crypto.verification.SupportedVerificationMethodsProvider -import im.vector.riotx.features.crypto.verification.VerificationBottomSheet -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.home.room.detail.widget.WidgetRequestCodes -import im.vector.riotx.features.home.room.filtered.FilteredRoomsActivity -import im.vector.riotx.features.invite.InviteUsersToRoomActivity -import im.vector.riotx.features.media.AttachmentData -import im.vector.riotx.features.media.BigImageViewerActivity -import im.vector.riotx.features.media.VectorAttachmentViewerActivity -import im.vector.riotx.features.pin.PinActivity -import im.vector.riotx.features.pin.PinArgs -import im.vector.riotx.features.pin.PinMode -import im.vector.riotx.features.roomdirectory.RoomDirectoryActivity -import im.vector.riotx.features.roomdirectory.createroom.CreateRoomActivity -import im.vector.riotx.features.roomdirectory.roompreview.RoomPreviewActivity -import im.vector.riotx.features.roommemberprofile.RoomMemberProfileActivity -import im.vector.riotx.features.roommemberprofile.RoomMemberProfileArgs -import im.vector.riotx.features.roomprofile.RoomProfileActivity -import im.vector.riotx.features.settings.VectorPreferences -import im.vector.riotx.features.settings.VectorSettingsActivity -import im.vector.riotx.features.share.SharedData -import im.vector.riotx.features.terms.ReviewTermsActivity -import im.vector.riotx.features.widgets.WidgetActivity -import im.vector.riotx.features.widgets.WidgetArgsBuilder import javax.inject.Inject import javax.inject.Singleton diff --git a/vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt rename to vector/src/main/java/im/vector/app/features/navigation/Navigator.kt index b5733285db..85d0a7de8d 100644 --- a/vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt +++ b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt @@ -14,25 +14,25 @@ * limitations under the License. */ -package im.vector.riotx.features.navigation +package im.vector.app.features.navigation import android.app.Activity import android.content.Context import android.view.View import androidx.core.util.Pair import androidx.fragment.app.Fragment +import im.vector.app.features.home.room.detail.widget.WidgetRequestCodes +import im.vector.app.features.media.AttachmentData +import im.vector.app.features.pin.PinActivity +import im.vector.app.features.pin.PinMode +import im.vector.app.features.settings.VectorSettingsActivity +import im.vector.app.features.share.SharedData +import im.vector.app.features.terms.ReviewTermsActivity import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoom import im.vector.matrix.android.api.session.room.model.thirdparty.RoomDirectoryData import im.vector.matrix.android.api.session.terms.TermsService import im.vector.matrix.android.api.session.widgets.model.Widget import im.vector.matrix.android.api.util.MatrixItem -import im.vector.riotx.features.home.room.detail.widget.WidgetRequestCodes -import im.vector.riotx.features.media.AttachmentData -import im.vector.riotx.features.pin.PinActivity -import im.vector.riotx.features.pin.PinMode -import im.vector.riotx.features.settings.VectorSettingsActivity -import im.vector.riotx.features.share.SharedData -import im.vector.riotx.features.terms.ReviewTermsActivity interface Navigator { diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/BitmapLoader.kt b/vector/src/main/java/im/vector/app/features/notifications/BitmapLoader.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/notifications/BitmapLoader.kt rename to vector/src/main/java/im/vector/app/features/notifications/BitmapLoader.kt index fbef196c53..d1c4624cdc 100644 --- a/vector/src/main/java/im/vector/riotx/features/notifications/BitmapLoader.kt +++ b/vector/src/main/java/im/vector/app/features/notifications/BitmapLoader.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.notifications +package im.vector.app.features.notifications import android.content.Context import android.graphics.Bitmap diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/IconLoader.kt b/vector/src/main/java/im/vector/app/features/notifications/IconLoader.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/notifications/IconLoader.kt rename to vector/src/main/java/im/vector/app/features/notifications/IconLoader.kt index dccae42279..3e68744c88 100644 --- a/vector/src/main/java/im/vector/riotx/features/notifications/IconLoader.kt +++ b/vector/src/main/java/im/vector/app/features/notifications/IconLoader.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.notifications +package im.vector.app.features.notifications import android.content.Context import android.os.Build diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/InviteNotifiableEvent.kt b/vector/src/main/java/im/vector/app/features/notifications/InviteNotifiableEvent.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/notifications/InviteNotifiableEvent.kt rename to vector/src/main/java/im/vector/app/features/notifications/InviteNotifiableEvent.kt index 0cfbeffec8..61fd5c677a 100644 --- a/vector/src/main/java/im/vector/riotx/features/notifications/InviteNotifiableEvent.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.notifications +package im.vector.app.features.notifications import androidx.core.app.NotificationCompat diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEvent.kt b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEvent.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEvent.kt rename to vector/src/main/java/im/vector/app/features/notifications/NotifiableEvent.kt index ddf48c7154..2be5650904 100644 --- a/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEvent.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.notifications +package im.vector.app.features.notifications import java.io.Serializable diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEventResolver.kt b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEventResolver.kt rename to vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt index a2dc8d33f0..ebdd144d23 100644 --- a/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableEventResolver.kt +++ b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt @@ -13,9 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.notifications +package im.vector.app.features.notifications import androidx.core.app.NotificationCompat +import im.vector.app.BuildConfig +import im.vector.app.R +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.home.room.detail.timeline.format.DisplayableEventFormatter +import im.vector.app.features.home.room.detail.timeline.format.NoticeEventFormatter import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.content.ContentUrlResolver import im.vector.matrix.android.api.session.crypto.MXCryptoError @@ -27,11 +32,6 @@ import im.vector.matrix.android.api.session.room.model.RoomMemberContent import im.vector.matrix.android.api.session.room.timeline.TimelineEvent import im.vector.matrix.android.api.session.room.timeline.getEditedEventId import im.vector.matrix.android.internal.crypto.algorithms.olm.OlmDecryptionResult -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.DisplayableEventFormatter -import im.vector.riotx.features.home.room.detail.timeline.format.NoticeEventFormatter import timber.log.Timber import java.util.UUID import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableMessageEvent.kt b/vector/src/main/java/im/vector/app/features/notifications/NotifiableMessageEvent.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/notifications/NotifiableMessageEvent.kt rename to vector/src/main/java/im/vector/app/features/notifications/NotifiableMessageEvent.kt index ab48b5f3b4..887d421ed6 100644 --- a/vector/src/main/java/im/vector/riotx/features/notifications/NotifiableMessageEvent.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.notifications +package im.vector.app.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/riotx/features/notifications/NotificationAction.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationAction.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/notifications/NotificationAction.kt rename to vector/src/main/java/im/vector/app/features/notifications/NotificationAction.kt index 6322ecf998..5d569e8be3 100644 --- a/vector/src/main/java/im/vector/riotx/features/notifications/NotificationAction.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.notifications +package im.vector.app.features.notifications import im.vector.matrix.android.api.pushrules.Action diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/NotificationBroadcastReceiver.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/notifications/NotificationBroadcastReceiver.kt rename to vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt index 04b267fb3a..78500c4b4e 100644 --- a/vector/src/main/java/im/vector/riotx/features/notifications/NotificationBroadcastReceiver.kt +++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt @@ -14,19 +14,19 @@ * limitations under the License. */ -package im.vector.riotx.features.notifications +package im.vector.app.features.notifications import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import androidx.core.app.RemoteInput +import im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.extensions.vectorComponent import im.vector.matrix.android.api.NoOpMatrixCallback import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.room.Room import im.vector.matrix.android.api.session.room.read.ReadService -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.UUID import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/NotificationDrawerManager.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/notifications/NotificationDrawerManager.kt rename to vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt index f7085a000e..a485ba7bea 100644 --- a/vector/src/main/java/im/vector/riotx/features/notifications/NotificationDrawerManager.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.notifications +package im.vector.app.features.notifications import android.content.Context import android.graphics.Bitmap @@ -22,13 +22,13 @@ import android.os.HandlerThread import androidx.annotation.WorkerThread import androidx.core.app.NotificationCompat import androidx.core.app.Person +import im.vector.app.ActiveSessionDataSource +import im.vector.app.BuildConfig +import im.vector.app.R +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.settings.VectorPreferences import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.content.ContentUrlResolver -import im.vector.riotx.ActiveSessionDataSource -import im.vector.riotx.BuildConfig -import im.vector.riotx.R -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.settings.VectorPreferences import me.gujun.android.span.span import timber.log.Timber import java.io.File diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/NotificationUtils.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/notifications/NotificationUtils.kt rename to vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt index 0889293539..c42b7ea635 100755 --- a/vector/src/main/java/im/vector/riotx/features/notifications/NotificationUtils.kt +++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt @@ -16,7 +16,7 @@ @file:Suppress("UNUSED_PARAMETER") -package im.vector.riotx.features.notifications +package im.vector.app.features.notifications import android.annotation.SuppressLint import android.annotation.TargetApi @@ -37,17 +37,17 @@ import androidx.core.app.TaskStackBuilder import androidx.core.content.ContextCompat import androidx.core.graphics.drawable.IconCompat import androidx.fragment.app.Fragment -import im.vector.riotx.BuildConfig -import im.vector.riotx.R -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.core.utils.startNotificationChannelSettingsIntent -import im.vector.riotx.features.call.VectorCallActivity -import im.vector.riotx.features.call.service.CallHeadsUpActionReceiver -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.pin.PinLocker -import im.vector.riotx.features.settings.VectorPreferences +import im.vector.app.BuildConfig +import im.vector.app.R +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.utils.startNotificationChannelSettingsIntent +import im.vector.app.features.call.VectorCallActivity +import im.vector.app.features.call.service.CallHeadsUpActionReceiver +import im.vector.app.features.home.HomeActivity +import im.vector.app.features.home.room.detail.RoomDetailActivity +import im.vector.app.features.home.room.detail.RoomDetailArgs +import im.vector.app.features.pin.PinLocker +import im.vector.app.features.settings.VectorPreferences import timber.log.Timber import javax.inject.Inject import javax.inject.Singleton diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/OutdatedEventDetector.kt b/vector/src/main/java/im/vector/app/features/notifications/OutdatedEventDetector.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/notifications/OutdatedEventDetector.kt rename to vector/src/main/java/im/vector/app/features/notifications/OutdatedEventDetector.kt index d2b939bc99..c6ef616afe 100644 --- a/vector/src/main/java/im/vector/riotx/features/notifications/OutdatedEventDetector.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.notifications +package im.vector.app.features.notifications -import im.vector.riotx.ActiveSessionDataSource +import im.vector.app.ActiveSessionDataSource import javax.inject.Inject class OutdatedEventDetector @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/PushRuleTriggerListener.kt b/vector/src/main/java/im/vector/app/features/notifications/PushRuleTriggerListener.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/notifications/PushRuleTriggerListener.kt rename to vector/src/main/java/im/vector/app/features/notifications/PushRuleTriggerListener.kt index adef246151..14133f09d5 100644 --- a/vector/src/main/java/im/vector/riotx/features/notifications/PushRuleTriggerListener.kt +++ b/vector/src/main/java/im/vector/app/features/notifications/PushRuleTriggerListener.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.notifications +package im.vector.app.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/riotx/features/notifications/RoomEventGroupInfo.kt b/vector/src/main/java/im/vector/app/features/notifications/RoomEventGroupInfo.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/notifications/RoomEventGroupInfo.kt rename to vector/src/main/java/im/vector/app/features/notifications/RoomEventGroupInfo.kt index c0852abbd4..b9363864e7 100644 --- a/vector/src/main/java/im/vector/riotx/features/notifications/RoomEventGroupInfo.kt +++ b/vector/src/main/java/im/vector/app/features/notifications/RoomEventGroupInfo.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.notifications +package im.vector.app.features.notifications /** * Data class to hold information about a group of notifications for a room diff --git a/vector/src/main/java/im/vector/riotx/features/notifications/SimpleNotifiableEvent.kt b/vector/src/main/java/im/vector/app/features/notifications/SimpleNotifiableEvent.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/notifications/SimpleNotifiableEvent.kt rename to vector/src/main/java/im/vector/app/features/notifications/SimpleNotifiableEvent.kt index e81307e433..2f74737ba2 100644 --- a/vector/src/main/java/im/vector/riotx/features/notifications/SimpleNotifiableEvent.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.notifications +package im.vector.app.features.notifications import androidx.core.app.NotificationCompat diff --git a/vector/src/main/java/im/vector/riotx/features/permalink/PermalinkHandler.kt b/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/permalink/PermalinkHandler.kt rename to vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt index bcf981fc92..1b10f60b8a 100644 --- a/vector/src/main/java/im/vector/riotx/features/permalink/PermalinkHandler.kt +++ b/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package im.vector.riotx.features.permalink +package im.vector.app.features.permalink import android.content.Context import android.net.Uri +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.features.navigation.Navigator import im.vector.matrix.android.api.permalinks.PermalinkData import im.vector.matrix.android.api.permalinks.PermalinkParser import im.vector.matrix.android.api.util.Optional import im.vector.matrix.rx.rx -import im.vector.riotx.core.di.ActiveSessionHolder -import im.vector.riotx.features.navigation.Navigator import io.reactivex.Single import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers diff --git a/vector/src/main/java/im/vector/riotx/features/permalink/PermalinkHandlerActivity.kt b/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandlerActivity.kt similarity index 84% rename from vector/src/main/java/im/vector/riotx/features/permalink/PermalinkHandlerActivity.kt rename to vector/src/main/java/im/vector/app/features/permalink/PermalinkHandlerActivity.kt index 5339a2c6f9..e005dd06c5 100644 --- a/vector/src/main/java/im/vector/riotx/features/permalink/PermalinkHandlerActivity.kt +++ b/vector/src/main/java/im/vector/app/features/permalink/PermalinkHandlerActivity.kt @@ -14,18 +14,18 @@ * limitations under the License. */ -package im.vector.riotx.features.permalink +package im.vector.app.features.permalink import android.content.Intent import android.os.Bundle -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.replaceFragment -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.core.utils.toast -import im.vector.riotx.features.home.LoadingFragment -import im.vector.riotx.features.login.LoginActivity +import im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.extensions.replaceFragment +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.core.utils.toast +import im.vector.app.features.home.LoadingFragment +import im.vector.app.features.login.LoginActivity import io.reactivex.android.schedulers.AndroidSchedulers import java.util.concurrent.TimeUnit import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/pin/PinActivity.kt b/vector/src/main/java/im/vector/app/features/pin/PinActivity.kt similarity index 87% rename from vector/src/main/java/im/vector/riotx/features/pin/PinActivity.kt rename to vector/src/main/java/im/vector/app/features/pin/PinActivity.kt index e9b6191ec4..a2930c6129 100644 --- a/vector/src/main/java/im/vector/riotx/features/pin/PinActivity.kt +++ b/vector/src/main/java/im/vector/app/features/pin/PinActivity.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package im.vector.riotx.features.pin +package im.vector.app.features.pin import android.content.Context import android.content.Intent import androidx.appcompat.widget.Toolbar import com.airbnb.mvrx.MvRx -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 im.vector.app.R +import im.vector.app.core.extensions.addFragment +import im.vector.app.core.platform.ToolbarConfigurable +import im.vector.app.core.platform.VectorBaseActivity class PinActivity : VectorBaseActivity(), ToolbarConfigurable, UnlockedActivity { diff --git a/vector/src/main/java/im/vector/riotx/features/pin/PinCodeStore.kt b/vector/src/main/java/im/vector/app/features/pin/PinCodeStore.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/pin/PinCodeStore.kt rename to vector/src/main/java/im/vector/app/features/pin/PinCodeStore.kt index d86f4d6f95..8bfe18b552 100644 --- a/vector/src/main/java/im/vector/riotx/features/pin/PinCodeStore.kt +++ b/vector/src/main/java/im/vector/app/features/pin/PinCodeStore.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.pin +package im.vector.app.features.pin import android.content.SharedPreferences import androidx.core.content.edit diff --git a/vector/src/main/java/im/vector/riotx/features/pin/PinFragment.kt b/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/pin/PinFragment.kt rename to vector/src/main/java/im/vector/app/features/pin/PinFragment.kt index 58f3dbc2c1..8976415dec 100644 --- a/vector/src/main/java/im/vector/riotx/features/pin/PinFragment.kt +++ b/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.pin +package im.vector.app.features.pin import android.app.Activity import android.os.Bundle @@ -26,11 +26,11 @@ import androidx.lifecycle.lifecycleScope import com.airbnb.mvrx.args import com.beautycoder.pflockscreen.PFFLockScreenConfiguration import com.beautycoder.pflockscreen.fragments.PFLockScreenFragment -import im.vector.riotx.R -import im.vector.riotx.core.extensions.replaceFragment -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.features.MainActivity -import im.vector.riotx.features.MainActivityArgs +import im.vector.app.R +import im.vector.app.core.extensions.replaceFragment +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.features.MainActivity +import im.vector.app.features.MainActivityArgs import kotlinx.android.parcel.Parcelize import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/pin/PinLocker.kt b/vector/src/main/java/im/vector/app/features/pin/PinLocker.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/pin/PinLocker.kt rename to vector/src/main/java/im/vector/app/features/pin/PinLocker.kt index 441977138c..aa7202a7ae 100644 --- a/vector/src/main/java/im/vector/riotx/features/pin/PinLocker.kt +++ b/vector/src/main/java/im/vector/app/features/pin/PinLocker.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.pin +package im.vector.app.features.pin import android.os.SystemClock import androidx.lifecycle.Lifecycle diff --git a/vector/src/main/java/im/vector/riotx/features/pin/PinMode.kt b/vector/src/main/java/im/vector/app/features/pin/PinMode.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/pin/PinMode.kt rename to vector/src/main/java/im/vector/app/features/pin/PinMode.kt index 952a0e3e94..732b55fd58 100644 --- a/vector/src/main/java/im/vector/riotx/features/pin/PinMode.kt +++ b/vector/src/main/java/im/vector/app/features/pin/PinMode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.pin +package im.vector.app.features.pin enum class PinMode { CREATE, diff --git a/vector/src/main/java/im/vector/riotx/features/pin/UnlockedActivity.kt b/vector/src/main/java/im/vector/app/features/pin/UnlockedActivity.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/pin/UnlockedActivity.kt rename to vector/src/main/java/im/vector/app/features/pin/UnlockedActivity.kt index 4177496154..afe0432559 100644 --- a/vector/src/main/java/im/vector/riotx/features/pin/UnlockedActivity.kt +++ b/vector/src/main/java/im/vector/app/features/pin/UnlockedActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.pin +package im.vector.app.features.pin /** * Tag class for activities that should not be protected by PIN code. diff --git a/vector/src/main/java/im/vector/riotx/features/popup/PopupAlertManager.kt b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/popup/PopupAlertManager.kt rename to vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt index 25a0e6ad7d..c52b586eb4 100644 --- a/vector/src/main/java/im/vector/riotx/features/popup/PopupAlertManager.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.popup +package im.vector.app.features.popup import android.annotation.SuppressLint import android.app.Activity @@ -25,11 +25,11 @@ import android.widget.ImageView import com.tapadoo.alerter.Alerter import com.tapadoo.alerter.OnHideAlertListener import dagger.Lazy -import im.vector.riotx.R -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.features.home.AvatarRenderer -import im.vector.riotx.features.pin.PinActivity -import im.vector.riotx.features.themes.ThemeUtils +import im.vector.app.R +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.pin.PinActivity +import im.vector.app.features.themes.ThemeUtils import timber.log.Timber import java.lang.ref.WeakReference import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/popup/VectorAlert.kt b/vector/src/main/java/im/vector/app/features/popup/VectorAlert.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/popup/VectorAlert.kt rename to vector/src/main/java/im/vector/app/features/popup/VectorAlert.kt index 259df1c7e0..6233d8a6c5 100644 --- a/vector/src/main/java/im/vector/riotx/features/popup/VectorAlert.kt +++ b/vector/src/main/java/im/vector/app/features/popup/VectorAlert.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.popup +package im.vector.app.features.popup import android.app.Activity import androidx.annotation.ColorInt diff --git a/vector/src/main/java/im/vector/riotx/features/powerlevel/PowerLevelsObservableFactory.kt b/vector/src/main/java/im/vector/app/features/powerlevel/PowerLevelsObservableFactory.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/powerlevel/PowerLevelsObservableFactory.kt rename to vector/src/main/java/im/vector/app/features/powerlevel/PowerLevelsObservableFactory.kt index ee4c20baca..bb22a59bcf 100644 --- a/vector/src/main/java/im/vector/riotx/features/powerlevel/PowerLevelsObservableFactory.kt +++ b/vector/src/main/java/im/vector/app/features/powerlevel/PowerLevelsObservableFactory.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.powerlevel +package im.vector.app.features.powerlevel import im.vector.matrix.android.api.query.QueryStringValue import im.vector.matrix.android.api.session.events.model.EventType diff --git a/vector/src/main/java/im/vector/riotx/features/qrcode/QrCodeScannerActivity.kt b/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerActivity.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/qrcode/QrCodeScannerActivity.kt rename to vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerActivity.kt index f9c92ba3ad..616da791d3 100644 --- a/vector/src/main/java/im/vector/riotx/features/qrcode/QrCodeScannerActivity.kt +++ b/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.qrcode +package im.vector.app.features.qrcode import android.app.Activity import android.content.Intent @@ -23,10 +23,10 @@ import androidx.fragment.app.Fragment import com.google.zxing.BarcodeFormat import com.google.zxing.Result import com.google.zxing.ResultMetadataType -import im.vector.riotx.R -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.extensions.replaceFragment -import im.vector.riotx.core.platform.VectorBaseActivity +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.extensions.replaceFragment +import im.vector.app.core.platform.VectorBaseActivity class QrCodeScannerActivity : VectorBaseActivity() { diff --git a/vector/src/main/java/im/vector/riotx/features/qrcode/QrCodeScannerFragment.kt b/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerFragment.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/qrcode/QrCodeScannerFragment.kt rename to vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerFragment.kt index 2c6e9ed3d5..6371e3c29b 100644 --- a/vector/src/main/java/im/vector/riotx/features/qrcode/QrCodeScannerFragment.kt +++ b/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerFragment.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package im.vector.riotx.features.qrcode +package im.vector.app.features.qrcode import com.google.zxing.Result -import im.vector.riotx.R -import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.app.R +import im.vector.app.core.platform.VectorBaseFragment import kotlinx.android.synthetic.main.fragment_qr_code_scanner.* import me.dm7.barcodescanner.zxing.ZXingScannerView import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/rageshake/BugReportActivity.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/rageshake/BugReportActivity.kt rename to vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt index f943186e2e..e26736de7e 100755 --- a/vector/src/main/java/im/vector/riotx/features/rageshake/BugReportActivity.kt +++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.rageshake +package im.vector.app.features.rageshake import android.view.Menu import android.view.MenuItem @@ -22,9 +22,9 @@ import android.widget.Toast import androidx.core.view.isVisible import butterknife.OnCheckedChanged import butterknife.OnTextChanged -import im.vector.riotx.R -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.platform.VectorBaseActivity +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.platform.VectorBaseActivity import kotlinx.android.synthetic.main.activity_bug_report.* import timber.log.Timber diff --git a/vector/src/main/java/im/vector/riotx/features/rageshake/BugReporter.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/rageshake/BugReporter.kt rename to vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt index 9bb2eb9424..d30630d1cd 100755 --- a/vector/src/main/java/im/vector/riotx/features/rageshake/BugReporter.kt +++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt @@ -16,7 +16,7 @@ * limitations under the License. */ -package im.vector.riotx.features.rageshake +package im.vector.app.features.rageshake import android.annotation.SuppressLint import android.content.Context @@ -28,17 +28,17 @@ import android.os.Build import android.view.View import androidx.fragment.app.DialogFragment import androidx.fragment.app.FragmentActivity +import im.vector.app.BuildConfig +import im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.extensions.getAllChildFragments +import im.vector.app.core.extensions.toOnOff +import im.vector.app.features.settings.VectorLocale +import im.vector.app.features.settings.VectorPreferences +import im.vector.app.features.settings.locale.SystemLocaleProvider +import im.vector.app.features.themes.ThemeUtils +import im.vector.app.features.version.VersionProvider import im.vector.matrix.android.api.Matrix -import im.vector.riotx.BuildConfig -import im.vector.riotx.R -import im.vector.riotx.core.di.ActiveSessionHolder -import im.vector.riotx.core.extensions.getAllChildFragments -import im.vector.riotx.core.extensions.toOnOff -import im.vector.riotx.features.settings.VectorLocale -import im.vector.riotx.features.settings.VectorPreferences -import im.vector.riotx.features.settings.locale.SystemLocaleProvider -import im.vector.riotx.features.themes.ThemeUtils -import im.vector.riotx.features.version.VersionProvider import okhttp3.Call import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.OkHttpClient diff --git a/vector/src/main/java/im/vector/riotx/features/rageshake/BugReporterMultipartBody.java b/vector/src/main/java/im/vector/app/features/rageshake/BugReporterMultipartBody.java similarity index 99% rename from vector/src/main/java/im/vector/riotx/features/rageshake/BugReporterMultipartBody.java rename to vector/src/main/java/im/vector/app/features/rageshake/BugReporterMultipartBody.java index 5b40b82733..878b9f7171 100755 --- a/vector/src/main/java/im/vector/riotx/features/rageshake/BugReporterMultipartBody.java +++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReporterMultipartBody.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package im.vector.riotx.features.rageshake; +package im.vector.app.features.rageshake; import java.io.IOException; import java.util.ArrayList; diff --git a/vector/src/main/java/im/vector/riotx/features/rageshake/RageShake.kt b/vector/src/main/java/im/vector/app/features/rageshake/RageShake.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/rageshake/RageShake.kt rename to vector/src/main/java/im/vector/app/features/rageshake/RageShake.kt index effed19c59..763fde101a 100644 --- a/vector/src/main/java/im/vector/riotx/features/rageshake/RageShake.kt +++ b/vector/src/main/java/im/vector/app/features/rageshake/RageShake.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.rageshake +package im.vector.app.features.rageshake import android.content.Context import android.hardware.Sensor @@ -22,11 +22,11 @@ import android.hardware.SensorManager import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity import com.squareup.seismic.ShakeDetector -import im.vector.riotx.R -import im.vector.riotx.core.hardware.vibrate -import im.vector.riotx.features.navigation.Navigator -import im.vector.riotx.features.settings.VectorPreferences -import im.vector.riotx.features.settings.VectorSettingsActivity +import im.vector.app.R +import im.vector.app.core.hardware.vibrate +import im.vector.app.features.navigation.Navigator +import im.vector.app.features.settings.VectorPreferences +import im.vector.app.features.settings.VectorSettingsActivity import javax.inject.Inject class RageShake @Inject constructor(private val activity: AppCompatActivity, diff --git a/vector/src/main/java/im/vector/riotx/features/rageshake/VectorFileLogger.kt b/vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/rageshake/VectorFileLogger.kt rename to vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt index d4ad4efb6f..777b6cd1ae 100644 --- a/vector/src/main/java/im/vector/riotx/features/rageshake/VectorFileLogger.kt +++ b/vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package im.vector.riotx.features.rageshake +package im.vector.app.features.rageshake import android.content.Context import android.util.Log -import im.vector.riotx.features.settings.VectorPreferences +import im.vector.app.features.settings.VectorPreferences import timber.log.Timber import java.io.File import java.io.PrintWriter diff --git a/vector/src/main/java/im/vector/riotx/features/rageshake/VectorUncaughtExceptionHandler.kt b/vector/src/main/java/im/vector/app/features/rageshake/VectorUncaughtExceptionHandler.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/rageshake/VectorUncaughtExceptionHandler.kt rename to vector/src/main/java/im/vector/app/features/rageshake/VectorUncaughtExceptionHandler.kt index 1673cd7032..9a4aad70f8 100644 --- a/vector/src/main/java/im/vector/riotx/features/rageshake/VectorUncaughtExceptionHandler.kt +++ b/vector/src/main/java/im/vector/app/features/rageshake/VectorUncaughtExceptionHandler.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotx.features.rageshake +package im.vector.app.features.rageshake import android.content.Context import android.os.Build import androidx.core.content.edit import androidx.preference.PreferenceManager +import im.vector.app.core.resources.VersionCodeProvider +import im.vector.app.features.version.VersionProvider import im.vector.matrix.android.api.Matrix -import im.vector.riotx.core.resources.VersionCodeProvider -import im.vector.riotx.features.version.VersionProvider import timber.log.Timber import java.io.PrintWriter import java.io.StringWriter diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiChooserFragment.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiChooserFragment.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/reactions/EmojiChooserFragment.kt rename to vector/src/main/java/im/vector/app/features/reactions/EmojiChooserFragment.kt index 1dc9f34924..447525f72f 100644 --- a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiChooserFragment.kt +++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiChooserFragment.kt @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.reactions +package im.vector.app.features.reactions import android.os.Bundle import android.view.View import androidx.lifecycle.observe -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.platform.VectorBaseFragment import kotlinx.android.synthetic.main.emoji_chooser_fragment.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiChooserViewModel.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiChooserViewModel.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/reactions/EmojiChooserViewModel.kt rename to vector/src/main/java/im/vector/app/features/reactions/EmojiChooserViewModel.kt index 9a0317f454..df2085e41b 100644 --- a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiChooserViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiChooserViewModel.kt @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.reactions +package im.vector.app.features.reactions import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import im.vector.riotx.core.utils.LiveEvent +import im.vector.app.core.utils.LiveEvent import javax.inject.Inject class EmojiChooserViewModel @Inject constructor() : ViewModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiDrawView.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiDrawView.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/reactions/EmojiDrawView.kt rename to vector/src/main/java/im/vector/app/features/reactions/EmojiDrawView.kt index b85b2576d0..1866ac4bba 100644 --- a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiDrawView.kt +++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiDrawView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.reactions +package im.vector.app.features.reactions import android.content.Context import android.graphics.Canvas diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiReactionPickerActivity.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/reactions/EmojiReactionPickerActivity.kt rename to vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt index 562ad6f5b2..4fe74c2bcc 100644 --- a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiReactionPickerActivity.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.reactions +package im.vector.app.features.reactions import android.app.Activity import android.content.Context @@ -30,12 +30,12 @@ import androidx.lifecycle.Observer import com.airbnb.mvrx.viewModel import com.google.android.material.tabs.TabLayout import com.jakewharton.rxbinding3.widget.queryTextChanges -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 im.vector.riotx.features.reactions.data.EmojiDataSource +import im.vector.app.EmojiCompatFontProvider +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.extensions.observeEvent +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.features.reactions.data.EmojiDataSource import io.reactivex.android.schedulers.AndroidSchedulers import kotlinx.android.synthetic.main.activity_emoji_reaction_picker.* import timber.log.Timber diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiRecyclerAdapter.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiRecyclerAdapter.kt similarity index 99% rename from vector/src/main/java/im/vector/riotx/features/reactions/EmojiRecyclerAdapter.kt rename to vector/src/main/java/im/vector/app/features/reactions/EmojiRecyclerAdapter.kt index efccb9c917..fcf1ab9b9c 100644 --- a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiRecyclerAdapter.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.reactions +package im.vector.app.features.reactions import android.os.Build import android.os.Trace @@ -29,8 +29,8 @@ import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.transition.AutoTransition import androidx.transition.TransitionManager -import im.vector.riotx.R -import im.vector.riotx.features.reactions.data.EmojiDataSource +import im.vector.app.R +import im.vector.app.features.reactions.data.EmojiDataSource import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchAction.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchAction.kt similarity index 87% rename from vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchAction.kt rename to vector/src/main/java/im/vector/app/features/reactions/EmojiSearchAction.kt index badc6ea1e4..148390d06d 100644 --- a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchAction.kt +++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchAction.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.reactions +package im.vector.app.features.reactions -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction sealed class EmojiSearchAction : VectorViewModelAction { data class UpdateQuery(val queryString: String) : EmojiSearchAction() diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultController.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultController.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultController.kt rename to vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultController.kt index 208d9d7a56..8c510f568a 100644 --- a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultController.kt +++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultController.kt @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.reactions +package im.vector.app.features.reactions import android.graphics.Typeface import androidx.recyclerview.widget.RecyclerView import com.airbnb.epoxy.TypedEpoxyController -import im.vector.riotx.EmojiCompatFontProvider -import im.vector.riotx.R -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.core.ui.list.genericFooterItem +import im.vector.app.EmojiCompatFontProvider +import im.vector.app.R +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.ui.list.genericFooterItem import javax.inject.Inject class EmojiSearchResultController @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultFragment.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultFragment.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultFragment.kt rename to vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultFragment.kt index a62b2d39cb..685f0dd64e 100644 --- a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultFragment.kt +++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultFragment.kt @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.reactions +package im.vector.app.features.reactions import android.os.Bundle import android.view.View import com.airbnb.mvrx.activityViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.utils.LiveEvent +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.utils.LiveEvent import kotlinx.android.synthetic.main.fragment_generic_recycler.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultItem.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultItem.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultItem.kt rename to vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultItem.kt index 55bf29e25f..6db4a6bf58 100644 --- a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultItem.kt +++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultItem.kt @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.reactions +package im.vector.app.features.reactions import android.graphics.Typeface import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelWithHolder -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.extensions.setTextOrHide -import im.vector.riotx.features.reactions.data.EmojiItem +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.extensions.setTextOrHide +import im.vector.app.features.reactions.data.EmojiItem @EpoxyModelClass(layout = R.layout.item_emoji_result) abstract class EmojiSearchResultItem : EpoxyModelWithHolder() { diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultViewModel.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultViewModel.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultViewModel.kt rename to vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultViewModel.kt index 9856693d22..98b729603a 100644 --- a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiSearchResultViewModel.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.reactions +package im.vector.app.features.reactions import com.airbnb.mvrx.ActivityViewModelContext import com.airbnb.mvrx.MvRxState @@ -21,10 +21,10 @@ import com.airbnb.mvrx.MvRxViewModelFactory import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject -import im.vector.riotx.core.platform.EmptyViewEvents -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.features.reactions.data.EmojiDataSource -import im.vector.riotx.features.reactions.data.EmojiItem +import im.vector.app.core.platform.EmptyViewEvents +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.features.reactions.data.EmojiDataSource +import im.vector.app.features.reactions.data.EmojiItem data class EmojiSearchResultViewState( val query: String = "", diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/ReactionClickListener.kt b/vector/src/main/java/im/vector/app/features/reactions/ReactionClickListener.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/reactions/ReactionClickListener.kt rename to vector/src/main/java/im/vector/app/features/reactions/ReactionClickListener.kt index ad98868b63..74313e7859 100644 --- a/vector/src/main/java/im/vector/riotx/features/reactions/ReactionClickListener.kt +++ b/vector/src/main/java/im/vector/app/features/reactions/ReactionClickListener.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.reactions +package im.vector.app.features.reactions interface ReactionClickListener { fun onReactionSelected(reaction: String) diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/data/EmojiCategory.kt b/vector/src/main/java/im/vector/app/features/reactions/data/EmojiCategory.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/reactions/data/EmojiCategory.kt rename to vector/src/main/java/im/vector/app/features/reactions/data/EmojiCategory.kt index a6c238a4c4..7016963a62 100644 --- a/vector/src/main/java/im/vector/riotx/features/reactions/data/EmojiCategory.kt +++ b/vector/src/main/java/im/vector/app/features/reactions/data/EmojiCategory.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.reactions.data +package im.vector.app.features.reactions.data import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/data/EmojiData.kt b/vector/src/main/java/im/vector/app/features/reactions/data/EmojiData.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/reactions/data/EmojiData.kt rename to vector/src/main/java/im/vector/app/features/reactions/data/EmojiData.kt index f2094bfc7b..cc751ffab7 100644 --- a/vector/src/main/java/im/vector/riotx/features/reactions/data/EmojiData.kt +++ b/vector/src/main/java/im/vector/app/features/reactions/data/EmojiData.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.reactions.data +package im.vector.app.features.reactions.data import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/data/EmojiDataSource.kt b/vector/src/main/java/im/vector/app/features/reactions/data/EmojiDataSource.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/reactions/data/EmojiDataSource.kt rename to vector/src/main/java/im/vector/app/features/reactions/data/EmojiDataSource.kt index 4acb8ed79e..ce17459bb3 100644 --- a/vector/src/main/java/im/vector/riotx/features/reactions/data/EmojiDataSource.kt +++ b/vector/src/main/java/im/vector/app/features/reactions/data/EmojiDataSource.kt @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.reactions.data +package im.vector.app.features.reactions.data import android.content.res.Resources import com.squareup.moshi.Moshi -import im.vector.riotx.R +import im.vector.app.R import javax.inject.Inject import javax.inject.Singleton diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/data/EmojiItem.kt b/vector/src/main/java/im/vector/app/features/reactions/data/EmojiItem.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/reactions/data/EmojiItem.kt rename to vector/src/main/java/im/vector/app/features/reactions/data/EmojiItem.kt index 57083e8467..5a532c78f1 100644 --- a/vector/src/main/java/im/vector/riotx/features/reactions/data/EmojiItem.kt +++ b/vector/src/main/java/im/vector/app/features/reactions/data/EmojiItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.reactions.data +package im.vector.app.features.reactions.data import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/widget/CircleView.kt b/vector/src/main/java/im/vector/app/features/reactions/widget/CircleView.kt similarity index 99% rename from vector/src/main/java/im/vector/riotx/features/reactions/widget/CircleView.kt rename to vector/src/main/java/im/vector/app/features/reactions/widget/CircleView.kt index 1555c72119..e44ce8ee10 100644 --- a/vector/src/main/java/im/vector/riotx/features/reactions/widget/CircleView.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.reactions.widget +package im.vector.app.features.reactions.widget import android.animation.ArgbEvaluator import android.content.Context diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/widget/DotsView.kt b/vector/src/main/java/im/vector/app/features/reactions/widget/DotsView.kt similarity index 99% rename from vector/src/main/java/im/vector/riotx/features/reactions/widget/DotsView.kt rename to vector/src/main/java/im/vector/app/features/reactions/widget/DotsView.kt index a0dc4a4ae5..5430bc60fd 100644 --- a/vector/src/main/java/im/vector/riotx/features/reactions/widget/DotsView.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.reactions.widget +package im.vector.app.features.reactions.widget import android.animation.ArgbEvaluator import android.content.Context diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/widget/ReactionButton.kt b/vector/src/main/java/im/vector/app/features/reactions/widget/ReactionButton.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/reactions/widget/ReactionButton.kt rename to vector/src/main/java/im/vector/app/features/reactions/widget/ReactionButton.kt index 140edaf03a..364ac999c1 100644 --- a/vector/src/main/java/im/vector/riotx/features/reactions/widget/ReactionButton.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.reactions.widget +package im.vector.app.features.reactions.widget import android.animation.Animator import android.animation.AnimatorListenerAdapter @@ -35,10 +35,10 @@ import androidx.annotation.ColorInt import androidx.annotation.ColorRes import androidx.core.content.ContextCompat import androidx.core.content.withStyledAttributes -import im.vector.riotx.EmojiCompatWrapper -import im.vector.riotx.R -import im.vector.riotx.core.di.HasScreenInjector -import im.vector.riotx.core.utils.TextUtils +import im.vector.app.EmojiCompatWrapper +import im.vector.app.R +import im.vector.app.core.di.HasScreenInjector +import im.vector.app.core.utils.TextUtils import javax.inject.Inject /** diff --git a/vector/src/main/java/im/vector/riotx/features/room/RequireActiveMembershipAction.kt b/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipAction.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/room/RequireActiveMembershipAction.kt rename to vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipAction.kt index b3a1fa6976..b7fe412f7b 100644 --- a/vector/src/main/java/im/vector/riotx/features/room/RequireActiveMembershipAction.kt +++ b/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipAction.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.room +package im.vector.app.features.room -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction sealed class RequireActiveMembershipAction : VectorViewModelAction { data class ChangeRoom(val roomId: String) : RequireActiveMembershipAction() diff --git a/vector/src/main/java/im/vector/riotx/features/room/RequireActiveMembershipViewEvents.kt b/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewEvents.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/room/RequireActiveMembershipViewEvents.kt rename to vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewEvents.kt index d3c3e39cfa..62c3f45558 100644 --- a/vector/src/main/java/im/vector/riotx/features/room/RequireActiveMembershipViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewEvents.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.room +package im.vector.app.features.room -import im.vector.riotx.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewEvents sealed class RequireActiveMembershipViewEvents : VectorViewEvents { data class RoomLeft(val leftMessage: String?) : RequireActiveMembershipViewEvents() diff --git a/vector/src/main/java/im/vector/riotx/features/room/RequireActiveMembershipViewModel.kt b/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewModel.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/room/RequireActiveMembershipViewModel.kt rename to vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewModel.kt index e242135218..9938f29b80 100644 --- a/vector/src/main/java/im/vector/riotx/features/room/RequireActiveMembershipViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.room +package im.vector.app.features.room import com.airbnb.mvrx.ActivityViewModelContext import com.airbnb.mvrx.FragmentViewModelContext @@ -23,6 +23,10 @@ import com.airbnb.mvrx.ViewModelContext import com.jakewharton.rxrelay2.BehaviorRelay import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.R +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.core.resources.StringProvider import im.vector.matrix.android.api.query.QueryStringValue import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.events.model.EventType @@ -32,10 +36,6 @@ import im.vector.matrix.android.api.session.room.model.RoomSummary import im.vector.matrix.android.api.util.Optional import im.vector.matrix.rx.rx import im.vector.matrix.rx.unwrap -import im.vector.riotx.R -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.core.resources.StringProvider import io.reactivex.Observable import io.reactivex.schedulers.Schedulers diff --git a/vector/src/main/java/im/vector/riotx/features/room/RequireActiveMembershipViewState.kt b/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewState.kt similarity index 84% rename from vector/src/main/java/im/vector/riotx/features/room/RequireActiveMembershipViewState.kt rename to vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewState.kt index ccf0270efc..2ca68b5e8b 100644 --- a/vector/src/main/java/im/vector/riotx/features/room/RequireActiveMembershipViewState.kt +++ b/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewState.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package im.vector.riotx.features.room +package im.vector.app.features.room import com.airbnb.mvrx.MvRxState -import im.vector.riotx.features.roommemberprofile.RoomMemberProfileArgs -import im.vector.riotx.features.roomprofile.RoomProfileArgs +import im.vector.app.features.roommemberprofile.RoomMemberProfileArgs +import im.vector.app.features.roomprofile.RoomProfileArgs data class RequireActiveMembershipViewState( val roomId: String? = null diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/JoinState.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/JoinState.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/JoinState.kt rename to vector/src/main/java/im/vector/app/features/roomdirectory/JoinState.kt index 546412b2a6..dfcbb470cd 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/JoinState.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/JoinState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.roomdirectory +package im.vector.app.features.roomdirectory /** * Join state of a room diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomItem.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomItem.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomItem.kt rename to vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomItem.kt index aa533857e0..4776e9545c 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomItem.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomItem.kt @@ -14,20 +14,20 @@ * limitations under the License. */ -package im.vector.riotx.features.roomdirectory +package im.vector.app.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.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.extensions.setTextOrHide +import im.vector.app.core.platform.ButtonStateView +import im.vector.app.features.home.AvatarRenderer import im.vector.matrix.android.api.util.MatrixItem -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/riotx/features/roomdirectory/PublicRoomsController.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsController.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsController.kt rename to vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsController.kt index 04ddccdd8a..e79d3820ad 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsController.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsController.kt @@ -14,23 +14,23 @@ * limitations under the License. */ -package im.vector.riotx.features.roomdirectory +package im.vector.app.features.roomdirectory import com.airbnb.epoxy.TypedEpoxyController import com.airbnb.epoxy.VisibilityState import com.airbnb.mvrx.Fail import com.airbnb.mvrx.Incomplete import com.airbnb.mvrx.Success +import im.vector.app.R +import im.vector.app.core.epoxy.errorWithRetryItem +import im.vector.app.core.epoxy.loadingItem +import im.vector.app.core.epoxy.noResultItem +import im.vector.app.core.error.ErrorFormatter +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.home.AvatarRenderer import im.vector.matrix.android.api.session.room.members.ChangeMembershipState import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoom import im.vector.matrix.android.api.util.toMatrixItem -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/riotx/features/roomdirectory/PublicRoomsFragment.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsFragment.kt rename to vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt index dcccd33cf6..34fcf9877d 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.roomdirectory +package im.vector.app.features.roomdirectory import android.os.Bundle import android.view.MenuItem @@ -23,13 +23,13 @@ import com.airbnb.mvrx.activityViewModel import com.airbnb.mvrx.withState import com.google.android.material.snackbar.Snackbar import com.jakewharton.rxbinding3.appcompat.queryTextChanges +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.extensions.trackItemsVisibilityChange +import im.vector.app.core.platform.VectorBaseFragment import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoom -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.extensions.trackItemsVisibilityChange -import im.vector.riotx.core.platform.VectorBaseFragment 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/riotx/features/roomdirectory/PublicRoomsViewState.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsViewState.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsViewState.kt rename to vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsViewState.kt index 67b17ea34e..b527aae46f 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/PublicRoomsViewState.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/PublicRoomsViewState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.roomdirectory +package im.vector.app.features.roomdirectory import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryAction.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryAction.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryAction.kt rename to vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryAction.kt index 8b32726370..f4d37fbfb9 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryAction.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryAction.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.roomdirectory +package im.vector.app.features.roomdirectory +import im.vector.app.core.platform.VectorViewModelAction import im.vector.matrix.android.api.session.room.model.thirdparty.RoomDirectoryData -import im.vector.riotx.core.platform.VectorViewModelAction sealed class RoomDirectoryAction : VectorViewModelAction { data class SetRoomDirectoryData(val roomDirectoryData: RoomDirectoryData) : RoomDirectoryAction() diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryActivity.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryActivity.kt similarity index 84% rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryActivity.kt rename to vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryActivity.kt index e5ae0d4f54..6be810d0be 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryActivity.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryActivity.kt @@ -14,21 +14,21 @@ * limitations under the License. */ -package im.vector.riotx.features.roomdirectory +package im.vector.app.features.roomdirectory import android.content.Context import android.content.Intent import android.os.Bundle import com.airbnb.mvrx.viewModel -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.platform.VectorBaseActivity -import im.vector.riotx.features.roomdirectory.createroom.CreateRoomAction -import im.vector.riotx.features.roomdirectory.createroom.CreateRoomFragment -import im.vector.riotx.features.roomdirectory.createroom.CreateRoomViewModel -import im.vector.riotx.features.roomdirectory.picker.RoomDirectoryPickerFragment +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.extensions.addFragment +import im.vector.app.core.extensions.addFragmentToBackstack +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.features.roomdirectory.createroom.CreateRoomAction +import im.vector.app.features.roomdirectory.createroom.CreateRoomFragment +import im.vector.app.features.roomdirectory.createroom.CreateRoomViewModel +import im.vector.app.features.roomdirectory.picker.RoomDirectoryPickerFragment import javax.inject.Inject class RoomDirectoryActivity : VectorBaseActivity() { diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectorySharedAction.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectorySharedAction.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectorySharedAction.kt rename to vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectorySharedAction.kt index b257f82595..9911ce6686 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectorySharedAction.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectorySharedAction.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.roomdirectory +package im.vector.app.features.roomdirectory -import im.vector.riotx.core.platform.VectorSharedAction +import im.vector.app.core.platform.VectorSharedAction /** * Supported navigation actions for [RoomDirectoryActivity] diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectorySharedActionViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectorySharedActionViewModel.kt similarity index 87% rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectorySharedActionViewModel.kt rename to vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectorySharedActionViewModel.kt index 12ae9c1cb5..dc2ee75d64 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectorySharedActionViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectorySharedActionViewModel.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.roomdirectory +package im.vector.app.features.roomdirectory -import im.vector.riotx.core.platform.VectorSharedActionViewModel +import im.vector.app.core.platform.VectorSharedActionViewModel import javax.inject.Inject class RoomDirectorySharedActionViewModel @Inject constructor() : VectorSharedActionViewModel() diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryViewEvents.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewEvents.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryViewEvents.kt rename to vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewEvents.kt index 499e8d390d..60b1d11c4a 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewEvents.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.roomdirectory +package im.vector.app.features.roomdirectory -import im.vector.riotx.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewEvents /** * Transient events for room directory screen diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryViewModel.kt rename to vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt index 1b51ab1822..08d4407e65 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.roomdirectory +package im.vector.app.features.roomdirectory import com.airbnb.mvrx.ActivityViewModelContext import com.airbnb.mvrx.Fail @@ -25,6 +25,7 @@ import com.airbnb.mvrx.ViewModelContext import com.airbnb.mvrx.appendAt import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.core.platform.VectorViewModel import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.extensions.orFalse import im.vector.matrix.android.api.failure.Failure @@ -37,7 +38,6 @@ import im.vector.matrix.android.api.session.room.model.thirdparty.RoomDirectoryD import im.vector.matrix.android.api.session.room.roomSummaryQueryParams import im.vector.matrix.android.api.util.Cancelable import im.vector.matrix.rx.rx -import im.vector.riotx.core.platform.VectorViewModel import timber.log.Timber private const val PUBLIC_ROOMS_LIMIT = 20 diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomAction.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomAction.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomAction.kt rename to vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomAction.kt index 8986db180a..3b687395fd 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomAction.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomAction.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.roomdirectory.createroom +package im.vector.app.features.roomdirectory.createroom -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction sealed class CreateRoomAction : VectorViewModelAction { data class SetName(val name: String) : CreateRoomAction() diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomActivity.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt similarity index 85% rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomActivity.kt rename to vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt index 2831457224..e003c4905c 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomActivity.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt @@ -14,20 +14,20 @@ * limitations under the License. */ -package im.vector.riotx.features.roomdirectory.createroom +package im.vector.app.features.roomdirectory.createroom import android.content.Context import android.content.Intent import android.os.Bundle import androidx.appcompat.widget.Toolbar import com.airbnb.mvrx.viewModel -import im.vector.riotx.R -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.extensions.addFragment -import im.vector.riotx.core.platform.ToolbarConfigurable -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.features.roomdirectory.RoomDirectorySharedAction -import im.vector.riotx.features.roomdirectory.RoomDirectorySharedActionViewModel +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.extensions.addFragment +import im.vector.app.core.platform.ToolbarConfigurable +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.features.roomdirectory.RoomDirectorySharedAction +import im.vector.app.features.roomdirectory.RoomDirectorySharedActionViewModel import javax.inject.Inject /** diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomController.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomController.kt rename to vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt index fa7f7c9842..ba7c5ca083 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomController.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt @@ -14,20 +14,20 @@ * limitations under the License. */ -package im.vector.riotx.features.roomdirectory.createroom +package im.vector.app.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.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 im.vector.app.R +import im.vector.app.core.epoxy.errorWithRetryItem +import im.vector.app.core.epoxy.loadingItem +import im.vector.app.core.error.ErrorFormatter +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.form.formEditTextItem +import im.vector.app.features.form.formSwitchItem import javax.inject.Inject class CreateRoomController @Inject constructor(private val stringProvider: StringProvider, diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomFragment.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomFragment.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomFragment.kt rename to vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomFragment.kt index 7956f2fd9e..f3be178e64 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.roomdirectory.createroom +package im.vector.app.features.roomdirectory.createroom import android.os.Bundle import android.view.MenuItem @@ -22,12 +22,12 @@ import android.view.View import com.airbnb.mvrx.Success import com.airbnb.mvrx.activityViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.features.roomdirectory.RoomDirectorySharedAction -import im.vector.riotx.features.roomdirectory.RoomDirectorySharedActionViewModel +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.features.roomdirectory.RoomDirectorySharedAction +import im.vector.app.features.roomdirectory.RoomDirectorySharedActionViewModel 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/riotx/features/roomdirectory/createroom/CreateRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomViewModel.kt rename to vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt index e2d51dff83..e1f3a2444d 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.roomdirectory.createroom +package im.vector.app.features.roomdirectory.createroom import androidx.fragment.app.FragmentActivity import com.airbnb.mvrx.ActivityViewModelContext @@ -25,14 +25,14 @@ import com.airbnb.mvrx.Success import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.core.platform.EmptyViewEvents +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.features.roomdirectory.RoomDirectoryActivity import im.vector.matrix.android.api.MatrixCallback 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.riotx.core.platform.EmptyViewEvents -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.features.roomdirectory.RoomDirectoryActivity class CreateRoomViewModel @AssistedInject constructor(@Assisted initialState: CreateRoomViewState, private val session: Session diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomViewState.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewState.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomViewState.kt rename to vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewState.kt index 1758f77818..a49473b16e 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomViewState.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.roomdirectory.createroom +package im.vector.app.features.roomdirectory.createroom import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryItem.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryItem.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryItem.kt rename to vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryItem.kt index c0f77aad74..8f57acee47 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryItem.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.roomdirectory.picker +package im.vector.app.features.roomdirectory.picker import android.view.ViewGroup import android.widget.ImageView @@ -22,11 +22,11 @@ import android.widget.TextView import androidx.core.view.isInvisible import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -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 +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.extensions.setTextOrHide +import im.vector.app.core.glide.GlideApp @EpoxyModelClass(layout = R.layout.item_room_directory) abstract class RoomDirectoryItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryListCreator.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryListCreator.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryListCreator.kt rename to vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryListCreator.kt index 0b02101ecb..18f50d0034 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryListCreator.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryListCreator.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package im.vector.riotx.features.roomdirectory.picker +package im.vector.app.features.roomdirectory.picker +import im.vector.app.R +import im.vector.app.core.resources.StringArrayProvider 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.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/riotx/features/roomdirectory/picker/RoomDirectoryPickerAction.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerAction.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerAction.kt rename to vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerAction.kt index 157025bb0c..36f2cd4296 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerAction.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerAction.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.roomdirectory.picker +package im.vector.app.features.roomdirectory.picker -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction sealed class RoomDirectoryPickerAction : VectorViewModelAction { object Retry : RoomDirectoryPickerAction() diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerController.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerController.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerController.kt rename to vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerController.kt index 623d056141..c5f691b852 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerController.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerController.kt @@ -14,18 +14,18 @@ * limitations under the License. */ -package im.vector.riotx.features.roomdirectory.picker +package im.vector.app.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.app.R +import im.vector.app.core.epoxy.errorWithRetryItem +import im.vector.app.core.epoxy.loadingItem +import im.vector.app.core.error.ErrorFormatter +import im.vector.app.core.resources.StringProvider import im.vector.matrix.android.api.session.room.model.thirdparty.RoomDirectoryData -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/riotx/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt rename to vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt index 1d71035d99..f4e00b98d7 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.roomdirectory.picker +package im.vector.app.features.roomdirectory.picker import android.os.Bundle import android.view.MenuItem @@ -22,16 +22,16 @@ import android.view.View import com.airbnb.mvrx.activityViewModel import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.features.roomdirectory.RoomDirectoryAction +import im.vector.app.features.roomdirectory.RoomDirectorySharedAction +import im.vector.app.features.roomdirectory.RoomDirectorySharedActionViewModel +import im.vector.app.features.roomdirectory.RoomDirectoryViewModel import im.vector.matrix.android.api.session.room.model.thirdparty.RoomDirectoryData -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.features.roomdirectory.RoomDirectoryAction -import im.vector.riotx.features.roomdirectory.RoomDirectorySharedAction -import im.vector.riotx.features.roomdirectory.RoomDirectorySharedActionViewModel -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/riotx/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt rename to vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt index 54f93b5404..d919e650d1 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.roomdirectory.picker +package im.vector.app.features.roomdirectory.picker import com.airbnb.mvrx.Fail import com.airbnb.mvrx.FragmentViewModelContext @@ -23,11 +23,11 @@ import com.airbnb.mvrx.Success import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.core.platform.EmptyViewEvents +import im.vector.app.core.platform.VectorViewModel 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.riotx.core.platform.EmptyViewEvents -import im.vector.riotx.core.platform.VectorViewModel class RoomDirectoryPickerViewModel @AssistedInject constructor(@Assisted initialState: RoomDirectoryPickerViewState, private val session: Session) diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt rename to vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt index 85797a31e4..62d7caf03f 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerViewState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.roomdirectory.picker +package im.vector.app.features.roomdirectory.picker import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewAction.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewAction.kt similarity index 85% rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewAction.kt rename to vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewAction.kt index 426078fa3d..8e0d2db67e 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewAction.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewAction.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.roomdirectory.roompreview +package im.vector.app.features.roomdirectory.roompreview -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction sealed class RoomPreviewAction : VectorViewModelAction { object Join : RoomPreviewAction() diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewActivity.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewActivity.kt rename to vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt index 063cf3b8ff..0eb325b4c4 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewActivity.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewActivity.kt @@ -14,19 +14,19 @@ * limitations under the License. */ -package im.vector.riotx.features.roomdirectory.roompreview +package im.vector.app.features.roomdirectory.roompreview import android.content.Context import android.content.Intent import android.os.Parcelable import androidx.appcompat.widget.Toolbar +import im.vector.app.R +import im.vector.app.core.extensions.addFragment +import im.vector.app.core.platform.ToolbarConfigurable +import im.vector.app.core.platform.VectorBaseActivity import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoom import im.vector.matrix.android.api.session.room.model.thirdparty.RoomDirectoryData import im.vector.matrix.android.api.util.MatrixItem -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/riotx/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt rename to vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt index ee01e8f7fe..5d13d3d9fe 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewNoPreviewFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.roomdirectory.roompreview +package im.vector.app.features.roomdirectory.roompreview import android.os.Bundle import android.view.View @@ -23,12 +23,12 @@ import androidx.transition.TransitionManager import com.airbnb.mvrx.args import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -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 im.vector.app.R +import im.vector.app.core.extensions.setTextOrHide +import im.vector.app.core.platform.ButtonStateView +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.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/riotx/features/roomdirectory/roompreview/RoomPreviewViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewViewModel.kt rename to vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt index c5e79832fc..1c13f68eb9 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewModel.kt @@ -14,13 +14,17 @@ * limitations under the License. */ -package im.vector.riotx.features.roomdirectory.roompreview +package im.vector.app.features.roomdirectory.roompreview import com.airbnb.mvrx.FragmentViewModelContext import com.airbnb.mvrx.MvRxViewModelFactory import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.EmptyViewEvents +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.features.roomdirectory.JoinState import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.query.QueryStringValue import im.vector.matrix.android.api.session.Session @@ -28,10 +32,6 @@ import im.vector.matrix.android.api.session.room.members.ChangeMembershipState import im.vector.matrix.android.api.session.room.model.Membership import im.vector.matrix.android.api.session.room.roomSummaryQueryParams import im.vector.matrix.rx.rx -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.EmptyViewEvents -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.features.roomdirectory.JoinState import timber.log.Timber class RoomPreviewViewModel @AssistedInject constructor(@Assisted private val initialState: RoomPreviewViewState, diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewViewState.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewState.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewViewState.kt rename to vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewState.kt index 04806ccf27..f461225e2d 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/roompreview/RoomPreviewViewState.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/roompreview/RoomPreviewViewState.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.roomdirectory.roompreview +package im.vector.app.features.roomdirectory.roompreview import com.airbnb.mvrx.MvRxState -import im.vector.riotx.features.roomdirectory.JoinState +import im.vector.app.features.roomdirectory.JoinState data class RoomPreviewViewState( // The room id diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileAction.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileAction.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileAction.kt rename to vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileAction.kt index e60f268b22..7a171ca3e5 100644 --- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileAction.kt +++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileAction.kt @@ -15,9 +15,9 @@ * */ -package im.vector.riotx.features.roommemberprofile +package im.vector.app.features.roommemberprofile -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction sealed class RoomMemberProfileAction : VectorViewModelAction { object RetryFetchingInfo : RoomMemberProfileAction() diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileActivity.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileActivity.kt similarity index 84% rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileActivity.kt rename to vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileActivity.kt index 3323c29fee..954dd09024 100644 --- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileActivity.kt +++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileActivity.kt @@ -15,7 +15,7 @@ * */ -package im.vector.riotx.features.roommemberprofile +package im.vector.app.features.roommemberprofile import android.content.Context import android.content.Intent @@ -23,14 +23,14 @@ import android.widget.Toast import androidx.appcompat.widget.Toolbar import com.airbnb.mvrx.MvRx import com.airbnb.mvrx.viewModel -import im.vector.riotx.R -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.extensions.addFragment -import im.vector.riotx.core.platform.ToolbarConfigurable -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.features.room.RequireActiveMembershipViewEvents -import im.vector.riotx.features.room.RequireActiveMembershipViewModel -import im.vector.riotx.features.room.RequireActiveMembershipViewState +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.extensions.addFragment +import im.vector.app.core.platform.ToolbarConfigurable +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.features.room.RequireActiveMembershipViewEvents +import im.vector.app.features.room.RequireActiveMembershipViewModel +import im.vector.app.features.room.RequireActiveMembershipViewState import javax.inject.Inject class RoomMemberProfileActivity : diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileController.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileController.kt rename to vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt index a12d496e45..c6a3cf048a 100644 --- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileController.kt +++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt @@ -15,19 +15,19 @@ * */ -package im.vector.riotx.features.roommemberprofile +package im.vector.app.features.roommemberprofile import com.airbnb.epoxy.TypedEpoxyController +import im.vector.app.R +import im.vector.app.core.epoxy.profiles.buildProfileAction +import im.vector.app.core.epoxy.profiles.buildProfileSection +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.ui.list.genericFooterItem 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.powerlevels.PowerLevelsHelper import im.vector.matrix.android.api.session.room.powerlevels.Role -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.profiles.buildProfileAction -import im.vector.riotx.core.epoxy.profiles.buildProfileSection -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.core.ui.list.genericFooterItem import javax.inject.Inject class RoomMemberProfileController @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileFragment.kt rename to vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt index e9f4a736ef..32305bc73d 100644 --- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt @@ -15,7 +15,7 @@ * */ -package im.vector.riotx.features.roommemberprofile +package im.vector.app.features.roommemberprofile import android.os.Bundle import android.os.Parcelable @@ -29,23 +29,23 @@ import com.airbnb.mvrx.Success import com.airbnb.mvrx.args import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState +import im.vector.app.R +import im.vector.app.core.animations.AppBarStateChangeListener +import im.vector.app.core.animations.MatrixItemAppBarStateChangeListener +import im.vector.app.core.dialogs.ConfirmationDialogBuilder +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.extensions.setTextOrHide +import im.vector.app.core.platform.StateView +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.utils.startSharePlainTextIntent +import im.vector.app.features.crypto.verification.VerificationBottomSheet +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.roommemberprofile.devices.DeviceListBottomSheet +import im.vector.app.features.roommemberprofile.powerlevel.EditPowerLevelDialogs import im.vector.matrix.android.api.session.room.powerlevels.Role import im.vector.matrix.android.api.util.MatrixItem -import im.vector.riotx.R -import im.vector.riotx.core.animations.AppBarStateChangeListener -import im.vector.riotx.core.animations.MatrixItemAppBarStateChangeListener -import im.vector.riotx.core.dialogs.ConfirmationDialogBuilder -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.extensions.setTextOrHide -import im.vector.riotx.core.platform.StateView -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.utils.startSharePlainTextIntent -import im.vector.riotx.features.crypto.verification.VerificationBottomSheet -import im.vector.riotx.features.home.AvatarRenderer -import im.vector.riotx.features.roommemberprofile.devices.DeviceListBottomSheet -import im.vector.riotx.features.roommemberprofile.powerlevel.EditPowerLevelDialogs import kotlinx.android.parcel.Parcelize import kotlinx.android.synthetic.main.fragment_matrix_profile.* import kotlinx.android.synthetic.main.view_stub_room_member_profile_header.* diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileViewEvents.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewEvents.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileViewEvents.kt rename to vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewEvents.kt index 69c73007e0..9981d72e07 100644 --- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewEvents.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.roommemberprofile +package im.vector.app.features.roommemberprofile -import im.vector.riotx.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewEvents /** * Transient events for RoomMemberProfile diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileViewModel.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileViewModel.kt rename to vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt index 6fc1facbc3..c47b65d175 100644 --- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt @@ -15,7 +15,7 @@ * */ -package im.vector.riotx.features.roommemberprofile +package im.vector.app.features.roommemberprofile import androidx.lifecycle.viewModelScope import com.airbnb.mvrx.Fail @@ -47,10 +47,10 @@ import im.vector.matrix.android.api.util.toOptional import im.vector.matrix.android.internal.util.awaitCallback import im.vector.matrix.rx.rx import im.vector.matrix.rx.unwrap -import im.vector.riotx.R -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.powerlevel.PowerLevelsObservableFactory +import im.vector.app.R +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.powerlevel.PowerLevelsObservableFactory import io.reactivex.Observable import io.reactivex.functions.BiFunction import kotlinx.coroutines.Dispatchers diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileViewState.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewState.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileViewState.kt rename to vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewState.kt index 81423d2b9e..bfc2d9ceb3 100644 --- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileViewState.kt +++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewState.kt @@ -15,7 +15,7 @@ * */ -package im.vector.riotx.features.roommemberprofile +package im.vector.app.features.roommemberprofile import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListAction.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListAction.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListAction.kt rename to vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListAction.kt index 58a486c1b6..9cc3a2c6a6 100644 --- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListAction.kt +++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListAction.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.roommemberprofile.devices +package im.vector.app.features.roommemberprofile.devices +import im.vector.app.core.platform.VectorViewModelAction import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo -import im.vector.riotx.core.platform.VectorViewModelAction sealed class DeviceListAction : VectorViewModelAction { data class SelectDevice(val device: CryptoDeviceInfo) : DeviceListAction() diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListBottomSheet.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListBottomSheet.kt rename to vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt index 591b014c72..a8c6842c08 100644 --- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListBottomSheet.kt +++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt @@ -14,7 +14,7 @@ * limitations under the License. * */ -package im.vector.riotx.features.roommemberprofile.devices +package im.vector.app.features.roommemberprofile.devices import android.content.DialogInterface import android.os.Bundle @@ -23,12 +23,12 @@ import androidx.fragment.app.Fragment import com.airbnb.mvrx.MvRx import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.extensions.commitTransaction -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment -import im.vector.riotx.features.crypto.verification.VerificationBottomSheet +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.extensions.commitTransaction +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment +import im.vector.app.features.crypto.verification.VerificationBottomSheet import javax.inject.Inject import kotlin.reflect.KClass diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListBottomSheetViewEvents.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewEvents.kt similarity index 87% rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListBottomSheetViewEvents.kt rename to vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewEvents.kt index 39758671c8..7a2990775d 100644 --- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListBottomSheetViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewEvents.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.roommemberprofile.devices +package im.vector.app.features.roommemberprofile.devices -import im.vector.riotx.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewEvents /** * Transient events for device list screen diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt rename to vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt index 036c9269df..38cd7bb438 100644 --- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. * */ -package im.vector.riotx.features.roommemberprofile.devices +package im.vector.app.features.roommemberprofile.devices import com.airbnb.mvrx.Async import com.airbnb.mvrx.FragmentViewModelContext @@ -24,6 +24,9 @@ import com.airbnb.mvrx.MvRxViewModelFactory import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject +import im.vector.app.core.di.HasScreenInjector +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorViewModel import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.crypto.crosssigning.MXCrossSigningInfo import im.vector.matrix.android.api.session.crypto.verification.VerificationMethod @@ -31,9 +34,6 @@ import im.vector.matrix.android.api.util.MatrixItem import im.vector.matrix.android.api.util.toMatrixItem import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo import im.vector.matrix.rx.rx -import im.vector.riotx.core.di.HasScreenInjector -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorViewModel data class DeviceListViewState( val userItem: MatrixItem? = null, diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListEpoxyController.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListEpoxyController.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListEpoxyController.kt rename to vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListEpoxyController.kt index 87d156759d..c794a701cd 100644 --- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListEpoxyController.kt +++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListEpoxyController.kt @@ -14,7 +14,7 @@ * limitations under the License. * */ -package im.vector.riotx.features.roommemberprofile.devices +package im.vector.app.features.roommemberprofile.devices import android.view.View import com.airbnb.epoxy.TypedEpoxyController @@ -22,18 +22,18 @@ import com.airbnb.mvrx.Fail import com.airbnb.mvrx.Loading import com.airbnb.mvrx.Success import com.airbnb.mvrx.Uninitialized +import im.vector.app.R +import im.vector.app.core.epoxy.errorWithRetryItem +import im.vector.app.core.epoxy.loadingItem +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.ui.list.GenericItem +import im.vector.app.core.ui.list.genericFooterItem +import im.vector.app.core.ui.list.genericItem +import im.vector.app.core.ui.list.genericItemWithValue +import im.vector.app.core.utils.DimensionConverter +import im.vector.app.features.settings.VectorPreferences import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo -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.ColorProvider -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.core.ui.list.GenericItem -import im.vector.riotx.core.ui.list.genericFooterItem -import im.vector.riotx.core.ui.list.genericItem -import im.vector.riotx.core.ui.list.genericItemWithValue -import im.vector.riotx.core.utils.DimensionConverter -import im.vector.riotx.features.settings.VectorPreferences import me.gujun.android.span.span import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListFragment.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListFragment.kt similarity index 87% rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListFragment.kt rename to vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListFragment.kt index 5fdb776b12..d004887acf 100644 --- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceListFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListFragment.kt @@ -14,19 +14,19 @@ * limitations under the License. * */ -package im.vector.riotx.features.roommemberprofile.devices +package im.vector.app.features.roommemberprofile.devices import android.os.Bundle import androidx.recyclerview.widget.RecyclerView import butterknife.BindView import com.airbnb.mvrx.parentFragmentViewModel import com.airbnb.mvrx.withState +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.utils.DimensionConverter import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.utils.DimensionConverter import javax.inject.Inject class DeviceListFragment @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceTrustInfoActionFragment.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoActionFragment.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceTrustInfoActionFragment.kt rename to vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoActionFragment.kt index 2e943b0eff..143ade900e 100644 --- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceTrustInfoActionFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoActionFragment.kt @@ -14,19 +14,19 @@ * limitations under the License. * */ -package im.vector.riotx.features.roommemberprofile.devices +package im.vector.app.features.roommemberprofile.devices import android.os.Bundle import androidx.recyclerview.widget.RecyclerView import butterknife.BindView import com.airbnb.mvrx.parentFragmentViewModel import com.airbnb.mvrx.withState +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.utils.DimensionConverter import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.utils.DimensionConverter import javax.inject.Inject class DeviceTrustInfoActionFragment @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt rename to vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt index a9af166c1d..21005bfa42 100644 --- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt +++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt @@ -14,20 +14,20 @@ * limitations under the License. * */ -package im.vector.riotx.features.roommemberprofile.devices +package im.vector.app.features.roommemberprofile.devices import com.airbnb.epoxy.TypedEpoxyController +import im.vector.app.R +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.ui.list.GenericItem +import im.vector.app.core.ui.list.genericFooterItem +import im.vector.app.core.ui.list.genericItem +import im.vector.app.core.ui.list.genericItemWithValue +import im.vector.app.core.utils.DimensionConverter +import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem +import im.vector.app.features.settings.VectorPreferences import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo -import im.vector.riotx.R -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.core.ui.list.GenericItem -import im.vector.riotx.core.ui.list.genericFooterItem -import im.vector.riotx.core.ui.list.genericItem -import im.vector.riotx.core.ui.list.genericItemWithValue -import im.vector.riotx.core.utils.DimensionConverter -import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationActionItem -import im.vector.riotx.features.settings.VectorPreferences import me.gujun.android.span.span import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt rename to vector/src/main/java/im/vector/app/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt index 5672c621c7..587710b253 100644 --- a/vector/src/main/java/im/vector/riotx/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt +++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package im.vector.riotx.features.roommemberprofile.powerlevel +package im.vector.app.features.roommemberprofile.powerlevel import android.app.Activity import android.content.DialogInterface import android.view.KeyEvent import androidx.appcompat.app.AlertDialog import androidx.core.view.isVisible +import im.vector.app.R +import im.vector.app.core.extensions.hideKeyboard import im.vector.matrix.android.api.session.room.powerlevels.Role -import im.vector.riotx.R -import im.vector.riotx.core.extensions.hideKeyboard import kotlinx.android.synthetic.main.dialog_edit_power_level.view.* object EditPowerLevelDialogs { diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileAction.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt index 20498dbf84..efa737bcaa 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileAction.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt @@ -15,11 +15,11 @@ * */ -package im.vector.riotx.features.roomprofile +package im.vector.app.features.roomprofile import android.net.Uri import im.vector.matrix.android.api.session.room.notification.RoomNotificationState -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction sealed class RoomProfileAction: VectorViewModelAction { object LeaveRoom: RoomProfileAction() diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileActivity.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt similarity index 83% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileActivity.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt index c628ba6359..6bcb9f9c7f 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileActivity.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt @@ -15,7 +15,7 @@ * */ -package im.vector.riotx.features.roomprofile +package im.vector.app.features.roomprofile import android.content.Context import android.content.Intent @@ -23,19 +23,19 @@ import android.widget.Toast import androidx.appcompat.widget.Toolbar import com.airbnb.mvrx.MvRx import com.airbnb.mvrx.viewModel -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.platform.ToolbarConfigurable -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.features.room.RequireActiveMembershipViewEvents -import im.vector.riotx.features.room.RequireActiveMembershipViewModel -import im.vector.riotx.features.room.RequireActiveMembershipViewState -import im.vector.riotx.features.roomprofile.banned.RoomBannedMemberListFragment -import im.vector.riotx.features.roomprofile.members.RoomMemberListFragment -import im.vector.riotx.features.roomprofile.settings.RoomSettingsFragment -import im.vector.riotx.features.roomprofile.uploads.RoomUploadsFragment +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.extensions.addFragment +import im.vector.app.core.extensions.addFragmentToBackstack +import im.vector.app.core.platform.ToolbarConfigurable +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.features.room.RequireActiveMembershipViewEvents +import im.vector.app.features.room.RequireActiveMembershipViewModel +import im.vector.app.features.room.RequireActiveMembershipViewState +import im.vector.app.features.roomprofile.banned.RoomBannedMemberListFragment +import im.vector.app.features.roomprofile.members.RoomMemberListFragment +import im.vector.app.features.roomprofile.settings.RoomSettingsFragment +import im.vector.app.features.roomprofile.uploads.RoomUploadsFragment import javax.inject.Inject class RoomProfileActivity : diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileController.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt index 249247cd63..418b4a94e9 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileController.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt @@ -15,17 +15,17 @@ * */ -package im.vector.riotx.features.roomprofile +package im.vector.app.features.roomprofile import com.airbnb.epoxy.TypedEpoxyController import im.vector.matrix.android.api.crypto.RoomEncryptionTrustLevel -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.profiles.buildProfileAction -import im.vector.riotx.core.epoxy.profiles.buildProfileSection -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.core.ui.list.genericFooterItem -import im.vector.riotx.features.settings.VectorPreferences +import im.vector.app.R +import im.vector.app.core.epoxy.profiles.buildProfileAction +import im.vector.app.core.epoxy.profiles.buildProfileSection +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.ui.list.genericFooterItem +import im.vector.app.features.settings.VectorPreferences import javax.inject.Inject class RoomProfileController @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileFragment.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt index 06773ed924..c1c7037eab 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt @@ -15,7 +15,7 @@ * */ -package im.vector.riotx.features.roomprofile +package im.vector.app.features.roomprofile import android.app.Activity import android.content.Intent @@ -39,29 +39,29 @@ import im.vector.lib.multipicker.entity.MultiPickerImageType import im.vector.matrix.android.api.session.room.notification.RoomNotificationState import im.vector.matrix.android.api.util.MatrixItem import im.vector.matrix.android.api.util.toMatrixItem -import im.vector.riotx.R -import im.vector.riotx.core.animations.AppBarStateChangeListener -import im.vector.riotx.core.animations.MatrixItemAppBarStateChangeListener -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.extensions.setTextOrHide -import im.vector.riotx.core.intent.getFilenameFromUri -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.allGranted -import im.vector.riotx.core.utils.checkPermissions -import im.vector.riotx.core.utils.copyToClipboard -import im.vector.riotx.core.utils.startSharePlainTextIntent -import im.vector.riotx.features.crypto.util.toImageRes -import im.vector.riotx.features.home.AvatarRenderer -import im.vector.riotx.features.home.room.list.actions.RoomListActionsArgs -import im.vector.riotx.features.home.room.list.actions.RoomListQuickActionsBottomSheet -import im.vector.riotx.features.home.room.list.actions.RoomListQuickActionsSharedAction -import im.vector.riotx.features.home.room.list.actions.RoomListQuickActionsSharedActionViewModel -import im.vector.riotx.features.media.BigImageViewerActivity -import im.vector.riotx.features.media.createUCropWithDefaultSettings +import im.vector.app.R +import im.vector.app.core.animations.AppBarStateChangeListener +import im.vector.app.core.animations.MatrixItemAppBarStateChangeListener +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.extensions.setTextOrHide +import im.vector.app.core.intent.getFilenameFromUri +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO +import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA +import im.vector.app.core.utils.allGranted +import im.vector.app.core.utils.checkPermissions +import im.vector.app.core.utils.copyToClipboard +import im.vector.app.core.utils.startSharePlainTextIntent +import im.vector.app.features.crypto.util.toImageRes +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.home.room.list.actions.RoomListActionsArgs +import im.vector.app.features.home.room.list.actions.RoomListQuickActionsBottomSheet +import im.vector.app.features.home.room.list.actions.RoomListQuickActionsSharedAction +import im.vector.app.features.home.room.list.actions.RoomListQuickActionsSharedActionViewModel +import im.vector.app.features.media.BigImageViewerActivity +import im.vector.app.features.media.createUCropWithDefaultSettings import kotlinx.android.parcel.Parcelize import kotlinx.android.synthetic.main.fragment_matrix_profile.* import kotlinx.android.synthetic.main.view_stub_room_profile_header.* diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileSharedAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileSharedAction.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileSharedAction.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileSharedAction.kt index 76d87b3a93..0052ddee99 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileSharedAction.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileSharedAction.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile +package im.vector.app.features.roomprofile -import im.vector.riotx.core.platform.VectorSharedAction +import im.vector.app.core.platform.VectorSharedAction /** * Supported navigation actions for [RoomProfileActivity] diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileSharedActionViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileSharedActionViewModel.kt similarity index 87% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileSharedActionViewModel.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileSharedActionViewModel.kt index e1921b0c23..49e68ca0a5 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileSharedActionViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileSharedActionViewModel.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile +package im.vector.app.features.roomprofile -import im.vector.riotx.core.platform.VectorSharedActionViewModel +import im.vector.app.core.platform.VectorSharedActionViewModel import javax.inject.Inject class RoomProfileSharedActionViewModel @Inject constructor() : VectorSharedActionViewModel() diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileViewEvents.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewEvents.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileViewEvents.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewEvents.kt index c0c1f2eb24..1245016ada 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewEvents.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile +package im.vector.app.features.roomprofile -import im.vector.riotx.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewEvents /** * Transient events for RoomProfile diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileViewModel.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt index 5ad74f8663..2417ce7437 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt @@ -15,7 +15,7 @@ * */ -package im.vector.riotx.features.roomprofile +package im.vector.app.features.roomprofile import com.airbnb.mvrx.FragmentViewModelContext import com.airbnb.mvrx.MvRxViewModelFactory @@ -31,10 +31,10 @@ import im.vector.matrix.android.api.session.room.model.Membership import im.vector.matrix.android.api.session.room.powerlevels.PowerLevelsHelper import im.vector.matrix.rx.rx import im.vector.matrix.rx.unwrap -import im.vector.riotx.R -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.powerlevel.PowerLevelsObservableFactory +import im.vector.app.R +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.powerlevel.PowerLevelsObservableFactory import java.util.UUID class RoomProfileViewModel @AssistedInject constructor(@Assisted private val initialState: RoomProfileViewState, diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewState.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileViewState.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewState.kt index 3cab6f38f4..a72c54b708 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileViewState.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewState.kt @@ -15,7 +15,7 @@ * */ -package im.vector.riotx.features.roomprofile +package im.vector.app.features.roomprofile import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedListMemberAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedListMemberAction.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedListMemberAction.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedListMemberAction.kt index 081af556d7..8772913bf8 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedListMemberAction.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedListMemberAction.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.banned +package im.vector.app.features.roomprofile.banned import im.vector.matrix.android.api.session.room.model.RoomMemberSummary -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction sealed class RoomBannedListMemberAction : VectorViewModelAction { data class QueryInfo(val roomMemberSummary: RoomMemberSummary) : RoomBannedListMemberAction() diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedListMemberViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedListMemberViewModel.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedListMemberViewModel.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedListMemberViewModel.kt index 35f5589e9f..35cb5e3c3f 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedListMemberViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedListMemberViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.banned +package im.vector.app.features.roomprofile.banned import androidx.lifecycle.viewModelScope import com.airbnb.mvrx.FragmentViewModelContext @@ -34,10 +34,10 @@ import im.vector.matrix.android.api.session.room.powerlevels.PowerLevelsHelper import im.vector.matrix.android.internal.util.awaitCallback import im.vector.matrix.rx.rx import im.vector.matrix.rx.unwrap -import im.vector.riotx.R -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.powerlevel.PowerLevelsObservableFactory +import im.vector.app.R +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.powerlevel.PowerLevelsObservableFactory import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedMemberListController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListController.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedMemberListController.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListController.kt index 649a5eed4f..58b7ceff97 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedMemberListController.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListController.kt @@ -14,20 +14,20 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.banned +package im.vector.app.features.roomprofile.banned import com.airbnb.epoxy.TypedEpoxyController import im.vector.matrix.android.api.session.room.model.RoomMemberSummary import im.vector.matrix.android.api.util.toMatrixItem -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.dividerItem -import im.vector.riotx.core.epoxy.profiles.buildProfileSection -import im.vector.riotx.core.epoxy.profiles.profileMatrixItemWithProgress -import im.vector.riotx.core.extensions.join -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.core.ui.list.genericFooterItem -import im.vector.riotx.features.home.AvatarRenderer +import im.vector.app.R +import im.vector.app.core.epoxy.dividerItem +import im.vector.app.core.epoxy.profiles.buildProfileSection +import im.vector.app.core.epoxy.profiles.profileMatrixItemWithProgress +import im.vector.app.core.extensions.join +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.ui.list.genericFooterItem +import im.vector.app.features.home.AvatarRenderer import javax.inject.Inject class RoomBannedMemberListController @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedMemberListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedMemberListFragment.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt index a6ebcf1acf..0c4b2b5362 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedMemberListFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.banned +package im.vector.app.features.roomprofile.banned import android.os.Bundle import android.view.View @@ -24,13 +24,13 @@ import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState import im.vector.matrix.android.api.session.room.model.RoomMemberSummary import im.vector.matrix.android.api.util.toMatrixItem -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.utils.toast -import im.vector.riotx.features.home.AvatarRenderer -import im.vector.riotx.features.roomprofile.RoomProfileArgs +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.utils.toast +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.roomprofile.RoomProfileArgs import kotlinx.android.synthetic.main.fragment_room_setting_generic.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedMemberListViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewState.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedMemberListViewState.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewState.kt index 5b3d4e0826..0ce5bf28b4 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedMemberListViewState.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewState.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.banned +package im.vector.app.features.roomprofile.banned import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState import com.airbnb.mvrx.Uninitialized import im.vector.matrix.android.api.session.room.model.RoomMemberSummary import im.vector.matrix.android.api.session.room.model.RoomSummary -import im.vector.riotx.features.roomprofile.RoomProfileArgs +import im.vector.app.features.roomprofile.RoomProfileArgs data class RoomBannedMemberListViewState( val roomId: String, diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedViewEvents.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedViewEvents.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedViewEvents.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedViewEvents.kt index 69e422b022..374f7f8361 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/banned/RoomBannedViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedViewEvents.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.banned +package im.vector.app.features.roomprofile.banned import im.vector.matrix.android.api.session.room.model.RoomMemberSummary -import im.vector.riotx.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewEvents sealed class RoomBannedViewEvents : VectorViewEvents { data class ShowBannedInfo(val bannedByUserId: String, val banReason: String, val roomMemberSummary: RoomMemberSummary) : RoomBannedViewEvents() diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListAction.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListAction.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListAction.kt index d6a63197bd..c61dcb98f5 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListAction.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListAction.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.members +package im.vector.app.features.roomprofile.members -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction sealed class RoomMemberListAction : VectorViewModelAction { data class RevokeThreePidInvite(val stateKey: String) : RoomMemberListAction() diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListController.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt index 8cf93e8589..20481fb528 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListController.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.members +package im.vector.app.features.roomprofile.members import com.airbnb.epoxy.TypedEpoxyController import im.vector.matrix.android.api.session.events.model.Event @@ -23,14 +23,14 @@ import im.vector.matrix.android.api.session.room.model.RoomMemberSummary import im.vector.matrix.android.api.session.room.model.RoomThirdPartyInviteContent import im.vector.matrix.android.api.util.MatrixItem import im.vector.matrix.android.api.util.toMatrixItem -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.dividerItem -import im.vector.riotx.core.epoxy.profiles.buildProfileSection -import im.vector.riotx.core.epoxy.profiles.profileMatrixItem -import im.vector.riotx.core.extensions.join -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.home.AvatarRenderer +import im.vector.app.R +import im.vector.app.core.epoxy.dividerItem +import im.vector.app.core.epoxy.profiles.buildProfileSection +import im.vector.app.core.epoxy.profiles.profileMatrixItem +import im.vector.app.core.extensions.join +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.home.AvatarRenderer import javax.inject.Inject class RoomMemberListController @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListFragment.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt index 6fe1f7ad18..6874d22197 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.members +package im.vector.app.features.roomprofile.members import android.os.Bundle import android.view.Menu @@ -29,12 +29,12 @@ import im.vector.matrix.android.api.session.events.model.toModel import im.vector.matrix.android.api.session.room.model.RoomMemberSummary import im.vector.matrix.android.api.session.room.model.RoomThirdPartyInviteContent import im.vector.matrix.android.api.util.toMatrixItem -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.features.home.AvatarRenderer -import im.vector.riotx.features.roomprofile.RoomProfileArgs +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.roomprofile.RoomProfileArgs import kotlinx.android.synthetic.main.fragment_room_setting_generic.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListViewModel.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt index 23d5e61399..5bb811a2ce 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.members +package im.vector.app.features.roomprofile.members import androidx.lifecycle.viewModelScope import com.airbnb.mvrx.FragmentViewModelContext @@ -39,10 +39,10 @@ import im.vector.matrix.rx.asObservable import im.vector.matrix.rx.mapOptional import im.vector.matrix.rx.rx import im.vector.matrix.rx.unwrap -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.EmptyViewEvents -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.features.powerlevel.PowerLevelsObservableFactory +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.EmptyViewEvents +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.features.powerlevel.PowerLevelsObservableFactory import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.functions.BiFunction diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListViewState.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt index 55fb950a8e..976f947521 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberListViewState.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.members +package im.vector.app.features.roomprofile.members import androidx.annotation.StringRes import com.airbnb.mvrx.Async @@ -24,8 +24,8 @@ import im.vector.matrix.android.api.crypto.RoomEncryptionTrustLevel import im.vector.matrix.android.api.session.events.model.Event import im.vector.matrix.android.api.session.room.model.RoomMemberSummary import im.vector.matrix.android.api.session.room.model.RoomSummary -import im.vector.riotx.R -import im.vector.riotx.features.roomprofile.RoomProfileArgs +import im.vector.app.R +import im.vector.app.features.roomprofile.RoomProfileArgs data class RoomMemberListViewState( val roomId: String, diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberSummaryComparator.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryComparator.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberSummaryComparator.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryComparator.kt index cc1dd29d13..576ba98989 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/members/RoomMemberSummaryComparator.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryComparator.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.members +package im.vector.app.features.roomprofile.members import im.vector.matrix.android.api.session.room.model.RoomMemberSummary import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsAction.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsAction.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsAction.kt index 908b72606d..30e63690db 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsAction.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsAction.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.settings +package im.vector.app.features.roomprofile.settings import im.vector.matrix.android.api.session.room.model.RoomHistoryVisibility -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction sealed class RoomSettingsAction : VectorViewModelAction { data class SetRoomName(val newName: String) : RoomSettingsAction() diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsController.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt index e9d2e5ccb5..eb4d9b83ec 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsController.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt @@ -14,20 +14,20 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.settings +package im.vector.app.features.roomprofile.settings import com.airbnb.epoxy.TypedEpoxyController import im.vector.matrix.android.api.session.events.model.Event import im.vector.matrix.android.api.session.events.model.toModel import im.vector.matrix.android.api.session.room.model.RoomHistoryVisibilityContent import im.vector.matrix.android.api.session.room.model.RoomSummary -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.profiles.buildProfileAction -import im.vector.riotx.core.epoxy.profiles.buildProfileSection -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.form.formEditTextItem -import im.vector.riotx.features.home.room.detail.timeline.format.RoomHistoryVisibilityFormatter +import im.vector.app.R +import im.vector.app.core.epoxy.profiles.buildProfileAction +import im.vector.app.core.epoxy.profiles.buildProfileSection +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.form.formEditTextItem +import im.vector.app.features.home.room.detail.timeline.format.RoomHistoryVisibilityFormatter import javax.inject.Inject class RoomSettingsController @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsFragment.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt index 840ec9f00c..efcc1ce1ba 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.settings +package im.vector.app.features.roomprofile.settings import android.os.Bundle import android.view.Menu @@ -29,15 +29,15 @@ import im.vector.matrix.android.api.session.events.model.toModel import im.vector.matrix.android.api.session.room.model.RoomHistoryVisibility import im.vector.matrix.android.api.session.room.model.RoomHistoryVisibilityContent import im.vector.matrix.android.api.util.toMatrixItem -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.utils.toast -import im.vector.riotx.features.home.AvatarRenderer -import im.vector.riotx.features.home.room.detail.timeline.format.RoomHistoryVisibilityFormatter -import im.vector.riotx.features.roomprofile.RoomProfileArgs +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.utils.toast +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.home.room.detail.timeline.format.RoomHistoryVisibilityFormatter +import im.vector.app.features.roomprofile.RoomProfileArgs import kotlinx.android.synthetic.main.fragment_room_setting_generic.* import kotlinx.android.synthetic.main.merge_overlay_waiting_view.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsViewEvents.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewEvents.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsViewEvents.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewEvents.kt index c30a5ff9c9..952ca791c9 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewEvents.kt @@ -15,9 +15,9 @@ * */ -package im.vector.riotx.features.roomprofile.settings +package im.vector.app.features.roomprofile.settings -import im.vector.riotx.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewEvents /** * Transient events for room settings screen diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsViewModel.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt index 652c5cf4c5..7eaf3e0c4b 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.settings +package im.vector.app.features.roomprofile.settings import com.airbnb.mvrx.FragmentViewModelContext import com.airbnb.mvrx.MvRxViewModelFactory @@ -27,9 +27,9 @@ import im.vector.matrix.android.api.session.events.model.EventType import im.vector.matrix.android.api.session.room.powerlevels.PowerLevelsHelper import im.vector.matrix.rx.rx import im.vector.matrix.rx.unwrap -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.features.powerlevel.PowerLevelsObservableFactory +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.features.powerlevel.PowerLevelsObservableFactory import io.reactivex.Completable import io.reactivex.Observable diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsViewState.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt index c8d81f3ead..e03105ba0e 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/settings/RoomSettingsViewState.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.settings +package im.vector.app.features.roomprofile.settings import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState @@ -22,7 +22,7 @@ import com.airbnb.mvrx.Uninitialized import im.vector.matrix.android.api.session.events.model.Event import im.vector.matrix.android.api.session.room.model.RoomHistoryVisibility import im.vector.matrix.android.api.session.room.model.RoomSummary -import im.vector.riotx.features.roomprofile.RoomProfileArgs +import im.vector.app.features.roomprofile.RoomProfileArgs data class RoomSettingsViewState( val roomId: String, diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsAction.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsAction.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsAction.kt index 59571de122..0750a4ed7c 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsAction.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsAction.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.uploads +package im.vector.app.features.roomprofile.uploads import im.vector.matrix.android.api.session.room.uploads.UploadEvent -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction sealed class RoomUploadsAction : VectorViewModelAction { data class Download(val uploadEvent: UploadEvent) : RoomUploadsAction() diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt similarity index 85% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsFragment.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt index 47dab994b4..e848ef8da8 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.uploads +package im.vector.app.features.roomprofile.uploads import android.os.Bundle import android.view.View @@ -24,16 +24,16 @@ import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState import com.google.android.material.tabs.TabLayoutMediator import im.vector.matrix.android.api.util.toMatrixItem -import im.vector.riotx.R -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.intent.getMimeTypeFromUri -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.core.utils.saveMedia -import im.vector.riotx.core.utils.shareMedia -import im.vector.riotx.features.home.AvatarRenderer -import im.vector.riotx.features.notifications.NotificationUtils -import im.vector.riotx.features.roomprofile.RoomProfileArgs +import im.vector.app.R +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.intent.getMimeTypeFromUri +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.utils.saveMedia +import im.vector.app.core.utils.shareMedia +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.notifications.NotificationUtils +import im.vector.app.features.roomprofile.RoomProfileArgs import kotlinx.android.synthetic.main.fragment_room_uploads.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsPagerAdapter.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsPagerAdapter.kt similarity index 85% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsPagerAdapter.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsPagerAdapter.kt index 6866d5e2fa..fe1ac51d23 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsPagerAdapter.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsPagerAdapter.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.uploads +package im.vector.app.features.roomprofile.uploads import androidx.fragment.app.Fragment import androidx.viewpager2.adapter.FragmentStateAdapter -import im.vector.riotx.features.roomprofile.uploads.files.RoomUploadsFilesFragment -import im.vector.riotx.features.roomprofile.uploads.media.RoomUploadsMediaFragment +import im.vector.app.features.roomprofile.uploads.files.RoomUploadsFilesFragment +import im.vector.app.features.roomprofile.uploads.media.RoomUploadsMediaFragment class RoomUploadsPagerAdapter( private val fragment: Fragment diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsViewEvents.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewEvents.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsViewEvents.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewEvents.kt index cd0c34494d..946076ff6e 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewEvents.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.uploads +package im.vector.app.features.roomprofile.uploads -import im.vector.riotx.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewEvents import java.io.File sealed class RoomUploadsViewEvents : VectorViewEvents { diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsViewModel.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt index 7cc8b9b31d..b8f1f50d6b 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.uploads +package im.vector.app.features.roomprofile.uploads import androidx.lifecycle.viewModelScope import com.airbnb.mvrx.ActivityViewModelContext @@ -35,8 +35,8 @@ import im.vector.matrix.android.internal.crypto.attachments.toElementToDecrypt import im.vector.matrix.android.internal.util.awaitCallback import im.vector.matrix.rx.rx import im.vector.matrix.rx.unwrap -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorViewModel +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorViewModel import kotlinx.coroutines.launch import java.io.File diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewState.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsViewState.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewState.kt index 3e31a3cdd6..52d6d7ef29 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/RoomUploadsViewState.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewState.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.uploads +package im.vector.app.features.roomprofile.uploads 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.matrix.android.api.session.room.uploads.UploadEvent -import im.vector.riotx.features.roomprofile.RoomProfileArgs +import im.vector.app.features.roomprofile.RoomProfileArgs data class RoomUploadsViewState( val roomId: String = "", diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/files/RoomUploadsFilesFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/RoomUploadsFilesFragment.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/files/RoomUploadsFilesFragment.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/RoomUploadsFilesFragment.kt index bba7a40440..66f7d3aa23 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/files/RoomUploadsFilesFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/RoomUploadsFilesFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.uploads.files +package im.vector.app.features.roomprofile.uploads.files import android.os.Bundle import android.view.View @@ -25,14 +25,14 @@ import com.airbnb.mvrx.Success import com.airbnb.mvrx.parentFragmentViewModel import com.airbnb.mvrx.withState import im.vector.matrix.android.api.session.room.uploads.UploadEvent -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.extensions.trackItemsVisibilityChange -import im.vector.riotx.core.platform.StateView -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.features.roomprofile.uploads.RoomUploadsAction -import im.vector.riotx.features.roomprofile.uploads.RoomUploadsViewModel +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.extensions.trackItemsVisibilityChange +import im.vector.app.core.platform.StateView +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.features.roomprofile.uploads.RoomUploadsAction +import im.vector.app.features.roomprofile.uploads.RoomUploadsViewModel import kotlinx.android.synthetic.main.fragment_generic_state_view_recycler.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/files/UploadsFileController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileController.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/files/UploadsFileController.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileController.kt index 60f966e7d2..3947f82e0a 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/files/UploadsFileController.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileController.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.uploads.files +package im.vector.app.features.roomprofile.uploads.files import com.airbnb.epoxy.TypedEpoxyController import com.airbnb.epoxy.VisibilityState import im.vector.matrix.android.api.session.room.uploads.UploadEvent -import im.vector.riotx.R -import im.vector.riotx.core.date.VectorDateFormatter -import im.vector.riotx.core.epoxy.loadingItem -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.roomprofile.uploads.RoomUploadsViewState +import im.vector.app.R +import im.vector.app.core.date.VectorDateFormatter +import im.vector.app.core.epoxy.loadingItem +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.roomprofile.uploads.RoomUploadsViewState import javax.inject.Inject class UploadsFileController @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/files/UploadsFileItem.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileItem.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/files/UploadsFileItem.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileItem.kt index 927672dd70..6b75209224 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/files/UploadsFileItem.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/UploadsFileItem.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.uploads.files +package im.vector.app.features.roomprofile.uploads.files import android.view.View import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -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.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.extensions.setTextOrHide @EpoxyModelClass(layout = R.layout.item_uploads_file) abstract class UploadsFileItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/Config.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/Config.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/Config.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/Config.kt index 50d4feff55..d2a5075118 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/Config.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/Config.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.uploads.media +package im.vector.app.features.roomprofile.uploads.media // Min image size. Size will be adjusted at runtime const val IMAGE_SIZE_DP = 120 diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt index dda070bf48..db863ca40d 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.uploads.media +package im.vector.app.features.roomprofile.uploads.media import android.os.Bundle import android.util.DisplayMetrics @@ -33,19 +33,19 @@ import im.vector.matrix.android.api.session.room.model.message.MessageImageConte import im.vector.matrix.android.api.session.room.model.message.MessageVideoContent import im.vector.matrix.android.api.session.room.model.message.getFileUrl import im.vector.matrix.android.internal.crypto.attachments.toElementToDecrypt -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.trackItemsVisibilityChange -import im.vector.riotx.core.platform.StateView -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.utils.DimensionConverter -import im.vector.riotx.features.media.AttachmentData -import im.vector.riotx.features.media.ImageContentRenderer -import im.vector.riotx.features.media.VideoContentRenderer -import im.vector.riotx.features.roomprofile.uploads.RoomUploadsAction -import im.vector.riotx.features.roomprofile.uploads.RoomUploadsFragment -import im.vector.riotx.features.roomprofile.uploads.RoomUploadsViewModel -import im.vector.riotx.features.roomprofile.uploads.RoomUploadsViewState +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.trackItemsVisibilityChange +import im.vector.app.core.platform.StateView +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.utils.DimensionConverter +import im.vector.app.features.media.AttachmentData +import im.vector.app.features.media.ImageContentRenderer +import im.vector.app.features.media.VideoContentRenderer +import im.vector.app.features.roomprofile.uploads.RoomUploadsAction +import im.vector.app.features.roomprofile.uploads.RoomUploadsFragment +import im.vector.app.features.roomprofile.uploads.RoomUploadsViewModel +import im.vector.app.features.roomprofile.uploads.RoomUploadsViewState import kotlinx.android.synthetic.main.fragment_generic_state_view_recycler.* import kotlinx.android.synthetic.main.fragment_room_uploads.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/UploadsImageItem.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsImageItem.kt similarity index 85% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/UploadsImageItem.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsImageItem.kt index 3b83e99656..2294095623 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/UploadsImageItem.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsImageItem.kt @@ -14,18 +14,18 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.uploads.media +package im.vector.app.features.roomprofile.uploads.media import android.view.View import android.widget.ImageView import androidx.core.view.ViewCompat import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel -import im.vector.riotx.core.utils.DebouncedClickListener -import im.vector.riotx.features.media.ImageContentRenderer +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.utils.DebouncedClickListener +import im.vector.app.features.media.ImageContentRenderer @EpoxyModelClass(layout = R.layout.item_uploads_image) abstract class UploadsImageItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/UploadsMediaController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsMediaController.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/UploadsMediaController.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsMediaController.kt index 72e4cb6d06..a4968620ce 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/UploadsMediaController.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsMediaController.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.uploads.media +package im.vector.app.features.roomprofile.uploads.media import android.view.View import com.airbnb.epoxy.TypedEpoxyController @@ -25,13 +25,13 @@ import im.vector.matrix.android.api.session.room.model.message.MessageVideoConte import im.vector.matrix.android.api.session.room.model.message.getFileUrl import im.vector.matrix.android.api.session.room.uploads.UploadEvent import im.vector.matrix.android.internal.crypto.attachments.toElementToDecrypt -import im.vector.riotx.core.epoxy.squareLoadingItem -import im.vector.riotx.core.error.ErrorFormatter -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.core.utils.DimensionConverter -import im.vector.riotx.features.media.ImageContentRenderer -import im.vector.riotx.features.media.VideoContentRenderer -import im.vector.riotx.features.roomprofile.uploads.RoomUploadsViewState +import im.vector.app.core.epoxy.squareLoadingItem +import im.vector.app.core.error.ErrorFormatter +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.utils.DimensionConverter +import im.vector.app.features.media.ImageContentRenderer +import im.vector.app.features.media.VideoContentRenderer +import im.vector.app.features.roomprofile.uploads.RoomUploadsViewState import javax.inject.Inject class UploadsMediaController @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/UploadsVideoItem.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsVideoItem.kt similarity index 82% rename from vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/UploadsVideoItem.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsVideoItem.kt index f20f6ed5b1..3a042943c2 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomprofile/uploads/media/UploadsVideoItem.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsVideoItem.kt @@ -14,19 +14,19 @@ * limitations under the License. */ -package im.vector.riotx.features.roomprofile.uploads.media +package im.vector.app.features.roomprofile.uploads.media import android.view.View import android.widget.ImageView import androidx.core.view.ViewCompat import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel -import im.vector.riotx.core.utils.DebouncedClickListener -import im.vector.riotx.features.media.ImageContentRenderer -import im.vector.riotx.features.media.VideoContentRenderer +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.utils.DebouncedClickListener +import im.vector.app.features.media.ImageContentRenderer +import im.vector.app.features.media.VideoContentRenderer @EpoxyModelClass(layout = R.layout.item_uploads_video) abstract class UploadsVideoItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/session/SessionListener.kt b/vector/src/main/java/im/vector/app/features/session/SessionListener.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/session/SessionListener.kt rename to vector/src/main/java/im/vector/app/features/session/SessionListener.kt index 4aef387d7c..b7855ae432 100644 --- a/vector/src/main/java/im/vector/riotx/features/session/SessionListener.kt +++ b/vector/src/main/java/im/vector/app/features/session/SessionListener.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.features.session +package im.vector.app.features.session import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import im.vector.matrix.android.api.failure.GlobalError import im.vector.matrix.android.api.session.Session -import im.vector.riotx.core.extensions.postLiveEvent -import im.vector.riotx.core.utils.LiveEvent +import im.vector.app.core.extensions.postLiveEvent +import im.vector.app.core.utils.LiveEvent import javax.inject.Inject import javax.inject.Singleton diff --git a/vector/src/main/java/im/vector/riotx/features/settings/FontScale.kt b/vector/src/main/java/im/vector/app/features/settings/FontScale.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/settings/FontScale.kt rename to vector/src/main/java/im/vector/app/features/settings/FontScale.kt index 47c438695c..5fbb021e0a 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/FontScale.kt +++ b/vector/src/main/java/im/vector/app/features/settings/FontScale.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package im.vector.riotx.features.settings +package im.vector.app.features.settings import android.content.Context import androidx.annotation.StringRes import androidx.core.content.edit import androidx.preference.PreferenceManager -import im.vector.riotx.R +import im.vector.app.R /** * Object to manage the Font Scale choice of the user diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorLocale.kt b/vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/settings/VectorLocale.kt rename to vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt index 75ddbadd2e..57f80264d2 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/VectorLocale.kt +++ b/vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotx.features.settings +package im.vector.app.features.settings import android.content.Context import android.content.res.Configuration import android.os.Build import androidx.core.content.edit import androidx.preference.PreferenceManager -import im.vector.riotx.BuildConfig -import im.vector.riotx.R +import im.vector.app.BuildConfig +import im.vector.app.R import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import timber.log.Timber diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt similarity index 99% rename from vector/src/main/java/im/vector/riotx/features/settings/VectorPreferences.kt rename to vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt index 969fe0b347..8aa0f7a6f9 100755 --- a/vector/src/main/java/im/vector/riotx/features/settings/VectorPreferences.kt +++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.settings +package im.vector.app.features.settings import android.content.Context import android.media.RingtoneManager @@ -25,10 +25,10 @@ import androidx.core.content.edit import androidx.preference.PreferenceManager import com.squareup.seismic.ShakeDetector import im.vector.matrix.android.api.extensions.tryThis -import im.vector.riotx.BuildConfig -import im.vector.riotx.R -import im.vector.riotx.features.homeserver.ServerUrlsRepository -import im.vector.riotx.features.themes.ThemeUtils +import im.vector.app.BuildConfig +import im.vector.app.R +import im.vector.app.features.homeserver.ServerUrlsRepository +import im.vector.app.features.themes.ThemeUtils import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsActivity.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsActivity.kt rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt index b92ee316ee..ffac13d755 100755 --- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsActivity.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.settings +package im.vector.app.features.settings import android.content.Context import android.content.Intent @@ -22,11 +22,11 @@ import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat import im.vector.matrix.android.api.failure.GlobalError import im.vector.matrix.android.api.session.Session -import im.vector.riotx.R -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.extensions.replaceFragment -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.features.settings.devices.VectorSettingsDevicesFragment +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.extensions.replaceFragment +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.features.settings.devices.VectorSettingsDevicesFragment 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/riotx/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt index 95901de471..f58cfbee37 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.settings +package im.vector.app.features.settings import androidx.preference.Preference import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.pushrules.rest.PushRule import im.vector.matrix.android.api.pushrules.rest.PushRuleAndKind -import im.vector.riotx.R -import im.vector.riotx.core.preference.PushRulePreference -import im.vector.riotx.core.preference.VectorPreference -import im.vector.riotx.core.utils.toast +import im.vector.app.R +import im.vector.app.core.preference.PushRulePreference +import im.vector.app.core.preference.VectorPreference +import im.vector.app.core.utils.toast import javax.inject.Inject class VectorSettingsAdvancedNotificationPreferenceFragment @Inject constructor() diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsAdvancedSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsAdvancedSettingsFragment.kt rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt index 43adcf6335..919122efb8 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsAdvancedSettingsFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.features.settings +package im.vector.app.features.settings import androidx.preference.Preference import androidx.preference.SeekBarPreference -import im.vector.riotx.R -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.core.preference.VectorSwitchPreference -import im.vector.riotx.features.rageshake.RageShake +import im.vector.app.R +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.core.preference.VectorSwitchPreference +import im.vector.app.features.rageshake.RageShake class VectorSettingsAdvancedSettingsFragment : VectorSettingsBaseFragment() { diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsBaseFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsBaseFragment.kt rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt index c43a6ab40d..a2cc09f70b 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsBaseFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.settings +package im.vector.app.features.settings import android.content.Context import android.os.Bundle @@ -22,13 +22,13 @@ import android.view.View import androidx.annotation.CallSuper import androidx.preference.PreferenceFragmentCompat import im.vector.matrix.android.api.session.Session -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.error.ErrorFormatter -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.core.utils.toast +import im.vector.app.R +import im.vector.app.core.di.DaggerScreenComponent +import im.vector.app.core.di.HasScreenInjector +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.error.ErrorFormatter +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.core.utils.toast import timber.log.Timber abstract class VectorSettingsBaseFragment : PreferenceFragmentCompat(), HasScreenInjector { diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsFlairFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsFlairFragment.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsFlairFragment.kt rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsFlairFragment.kt index 11a448b4b7..ec65e7d004 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsFlairFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsFlairFragment.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package im.vector.riotx.features.settings +package im.vector.app.features.settings import androidx.preference.PreferenceCategory -import im.vector.riotx.R -import im.vector.riotx.core.preference.ProgressBarPreference +import im.vector.app.R +import im.vector.app.core.preference.ProgressBarPreference class VectorSettingsFlairFragment : VectorSettingsBaseFragment() { diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsFragmentInteractionListener.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsFragmentInteractionListener.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsFragmentInteractionListener.kt rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsFragmentInteractionListener.kt index 026e451fea..b815ce653d 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsFragmentInteractionListener.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.settings +package im.vector.app.features.settings interface VectorSettingsFragmentInteractionListener { diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt index 879d4a3d0f..ef266ab056 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt @@ -16,7 +16,7 @@ @file:Suppress("UNUSED_VARIABLE", "UNUSED_ANONYMOUS_PARAMETER", "UNUSED_PARAMETER") -package im.vector.riotx.features.settings +package im.vector.app.features.settings import android.app.Activity import android.content.Intent @@ -47,27 +47,27 @@ import im.vector.matrix.android.api.NoOpMatrixCallback import im.vector.matrix.android.api.failure.isInvalidPassword import im.vector.matrix.android.api.session.integrationmanager.IntegrationManagerConfig import im.vector.matrix.android.api.session.integrationmanager.IntegrationManagerService -import im.vector.riotx.R -import im.vector.riotx.core.extensions.hideKeyboard -import im.vector.riotx.core.extensions.showPassword -import im.vector.riotx.core.intent.getFilenameFromUri -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.preference.VectorSwitchPreference -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.TextUtils -import im.vector.riotx.core.utils.allGranted -import im.vector.riotx.core.utils.checkPermissions -import im.vector.riotx.core.utils.copyToClipboard -import im.vector.riotx.core.utils.getSizeOfFiles -import im.vector.riotx.core.utils.toast -import im.vector.riotx.features.MainActivity -import im.vector.riotx.features.MainActivityArgs -import im.vector.riotx.features.media.createUCropWithDefaultSettings -import im.vector.riotx.features.themes.ThemeUtils -import im.vector.riotx.features.workers.signout.SignOutUiWorker +import im.vector.app.R +import im.vector.app.core.extensions.hideKeyboard +import im.vector.app.core.extensions.showPassword +import im.vector.app.core.intent.getFilenameFromUri +import im.vector.app.core.platform.SimpleTextWatcher +import im.vector.app.core.preference.UserAvatarPreference +import im.vector.app.core.preference.VectorPreference +import im.vector.app.core.preference.VectorSwitchPreference +import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO +import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA +import im.vector.app.core.utils.TextUtils +import im.vector.app.core.utils.allGranted +import im.vector.app.core.utils.checkPermissions +import im.vector.app.core.utils.copyToClipboard +import im.vector.app.core.utils.getSizeOfFiles +import im.vector.app.core.utils.toast +import im.vector.app.features.MainActivity +import im.vector.app.features.MainActivityArgs +import im.vector.app.features.media.createUCropWithDefaultSettings +import im.vector.app.features.themes.ThemeUtils +import im.vector.app.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/riotx/features/settings/VectorSettingsHelpAboutFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsHelpAboutFragment.kt rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt index a8c2569c40..d4e76d7c1e 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsHelpAboutFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt @@ -14,20 +14,20 @@ * limitations under the License. */ -package im.vector.riotx.features.settings +package im.vector.app.features.settings import android.content.Intent import android.net.Uri import android.provider.Settings import androidx.preference.Preference import im.vector.matrix.android.api.Matrix -import im.vector.riotx.R -import im.vector.riotx.core.preference.VectorPreference -import im.vector.riotx.core.utils.copyToClipboard -import im.vector.riotx.core.utils.displayInWebView -import im.vector.riotx.core.utils.openUrlInChromeCustomTab -import im.vector.riotx.features.version.VersionProvider -import im.vector.riotx.openOssLicensesMenuActivity +import im.vector.app.R +import im.vector.app.core.preference.VectorPreference +import im.vector.app.core.utils.copyToClipboard +import im.vector.app.core.utils.displayInWebView +import im.vector.app.core.utils.openUrlInChromeCustomTab +import im.vector.app.features.version.VersionProvider +import im.vector.app.openOssLicensesMenuActivity import javax.inject.Inject class VectorSettingsHelpAboutFragment @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsLabsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsLabsFragment.kt rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt index 1ffd80a591..c8cf44778c 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsLabsFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.settings +package im.vector.app.features.settings -import im.vector.riotx.R -import im.vector.riotx.core.preference.VectorSwitchPreference +import im.vector.app.R +import im.vector.app.core.preference.VectorSwitchPreference import javax.inject.Inject class VectorSettingsLabsFragment @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationPreferenceFragment.kt rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt index 6f731711db..ad2226b1ca 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationPreferenceFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.settings +package im.vector.app.features.settings import android.app.Activity import android.content.Context @@ -28,13 +28,13 @@ import androidx.preference.SwitchPreference import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.pushrules.RuleIds import im.vector.matrix.android.api.pushrules.RuleKind -import im.vector.riotx.R -import im.vector.riotx.core.di.ActiveSessionHolder -import im.vector.riotx.core.preference.VectorPreference -import im.vector.riotx.core.preference.VectorSwitchPreference -import im.vector.riotx.core.pushers.PushersManager -import im.vector.riotx.features.notifications.NotificationUtils -import im.vector.riotx.push.fcm.FcmHelper +import im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.preference.VectorPreference +import im.vector.app.core.preference.VectorSwitchPreference +import im.vector.app.core.pushers.PushersManager +import im.vector.app.features.notifications.NotificationUtils +import im.vector.app.push.fcm.FcmHelper import javax.inject.Inject // Referenced in vector_settings_preferences_root.xml diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt index 3ac097abfe..f07d6471c9 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.settings +package im.vector.app.features.settings import android.app.Activity import android.content.Context @@ -28,14 +28,14 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.transition.TransitionManager import butterknife.BindView -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -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 im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.features.rageshake.BugReporter +import im.vector.app.features.settings.troubleshoot.NotificationTroubleshootTestManager +import im.vector.app.features.settings.troubleshoot.TroubleshootTest +import im.vector.app.push.fcm.NotificationTroubleshootTestManagerFactory import javax.inject.Inject class VectorSettingsNotificationsTroubleshootFragment @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsPreferencesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsPreferencesFragment.kt rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt index 5848caacdb..0d29137289 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsPreferencesFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.settings +package im.vector.app.features.settings import android.app.Activity import android.content.Context @@ -23,12 +23,12 @@ import android.widget.LinearLayout import androidx.appcompat.app.AlertDialog import androidx.preference.Preference import androidx.preference.SwitchPreference -import im.vector.riotx.R -import im.vector.riotx.core.extensions.restart -import im.vector.riotx.core.preference.VectorListPreference -import im.vector.riotx.core.preference.VectorPreference -import im.vector.riotx.features.configuration.VectorConfiguration -import im.vector.riotx.features.themes.ThemeUtils +import im.vector.app.R +import im.vector.app.core.extensions.restart +import im.vector.app.core.preference.VectorListPreference +import im.vector.app.core.preference.VectorPreference +import im.vector.app.features.configuration.VectorConfiguration +import im.vector.app.features.themes.ThemeUtils import javax.inject.Inject class VectorSettingsPreferencesFragment @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsRootFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsRootFragment.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsRootFragment.kt rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsRootFragment.kt index a50e0e9ad0..d2ec1a1543 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsRootFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsRootFragment.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.settings +package im.vector.app.features.settings -import im.vector.riotx.R +import im.vector.app.R import javax.inject.Inject class VectorSettingsRootFragment @Inject constructor() : VectorSettingsBaseFragment() { diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt index 2f6a4fdc88..0c913e81bb 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsSecurityPrivacyFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt @@ -15,7 +15,7 @@ * limitations under the License. */ -package im.vector.riotx.features.settings +package im.vector.app.features.settings import android.annotation.SuppressLint import android.app.Activity @@ -41,28 +41,28 @@ import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo import im.vector.matrix.android.internal.crypto.model.rest.DevicesListResponse import im.vector.matrix.rx.SecretsSynchronisationInfo import im.vector.matrix.rx.rx -import im.vector.riotx.R -import im.vector.riotx.core.di.ActiveSessionHolder -import im.vector.riotx.core.dialogs.ExportKeysDialog -import im.vector.riotx.core.extensions.queryExportKeys -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.VectorPreference -import im.vector.riotx.core.preference.VectorPreferenceCategory -import im.vector.riotx.core.utils.openFileSelection -import im.vector.riotx.core.utils.toast -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 im.vector.riotx.features.crypto.recover.BootstrapBottomSheet -import im.vector.riotx.features.navigation.Navigator -import im.vector.riotx.features.pin.PinActivity -import im.vector.riotx.features.pin.PinCodeStore -import im.vector.riotx.features.pin.PinLocker -import im.vector.riotx.features.pin.PinMode -import im.vector.riotx.features.themes.ThemeUtils +import im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.dialogs.ExportKeysDialog +import im.vector.app.core.extensions.queryExportKeys +import im.vector.app.core.intent.ExternalIntentData +import im.vector.app.core.intent.analyseIntent +import im.vector.app.core.intent.getFilenameFromUri +import im.vector.app.core.platform.SimpleTextWatcher +import im.vector.app.core.preference.VectorPreference +import im.vector.app.core.preference.VectorPreferenceCategory +import im.vector.app.core.utils.openFileSelection +import im.vector.app.core.utils.toast +import im.vector.app.features.crypto.keys.KeysExporter +import im.vector.app.features.crypto.keys.KeysImporter +import im.vector.app.features.crypto.keysbackup.settings.KeysBackupManageActivity +import im.vector.app.features.crypto.recover.BootstrapBottomSheet +import im.vector.app.features.navigation.Navigator +import im.vector.app.features.pin.PinActivity +import im.vector.app.features.pin.PinCodeStore +import im.vector.app.features.pin.PinLocker +import im.vector.app.features.pin.PinMode +import im.vector.app.features.themes.ThemeUtils import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable import me.gujun.android.span.span diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsUrls.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsUrls.kt rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt index 3bd24b6e08..c5088aac6d 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsUrls.kt +++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.settings +package im.vector.app.features.settings object VectorSettingsUrls { diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsVoiceVideoFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsVoiceVideoFragment.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsVoiceVideoFragment.kt rename to vector/src/main/java/im/vector/app/features/settings/VectorSettingsVoiceVideoFragment.kt index 740401a5e0..dba3c78220 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsVoiceVideoFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsVoiceVideoFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.settings +package im.vector.app.features.settings import android.app.Activity import android.content.Intent @@ -22,12 +22,12 @@ import android.media.RingtoneManager import android.net.Uri import androidx.preference.Preference import androidx.preference.SwitchPreference -import im.vector.riotx.R -import im.vector.riotx.core.preference.VectorPreference -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 +import im.vector.app.R +import im.vector.app.core.preference.VectorPreference +import im.vector.app.core.utils.getCallRingtoneName +import im.vector.app.core.utils.getCallRingtoneUri +import im.vector.app.core.utils.setCallRingtoneUri +import im.vector.app.core.utils.setUseRiotDefaultRingtone class VectorSettingsVoiceVideoFragment : VectorSettingsBaseFragment() { diff --git a/vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountFragment.kt b/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountFragment.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountFragment.kt rename to vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountFragment.kt index eb0adf1f17..e48ab337d6 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.account.deactivation +package im.vector.app.features.settings.account.deactivation import android.content.Context import android.os.Bundle @@ -22,14 +22,14 @@ import android.view.View import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState import com.jakewharton.rxbinding3.widget.textChanges -import im.vector.riotx.R -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.extensions.showPassword -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.features.MainActivity -import im.vector.riotx.features.MainActivityArgs -import im.vector.riotx.features.settings.VectorSettingsActivity +import im.vector.app.R +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.extensions.showPassword +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.features.MainActivity +import im.vector.app.features.MainActivityArgs +import im.vector.app.features.settings.VectorSettingsActivity import kotlinx.android.synthetic.main.fragment_deactivate_account.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountViewEvents.kt b/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewEvents.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountViewEvents.kt rename to vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewEvents.kt index 4e7f7252e2..46acb4aee4 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewEvents.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.account.deactivation +package im.vector.app.features.settings.account.deactivation -import im.vector.riotx.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewEvents /** * Transient events for deactivate account settings screen diff --git a/vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountViewModel.kt rename to vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt index adfc9ff5ae..28c5c3bb35 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/account/deactivation/DeactivateAccountViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.settings.account.deactivation +package im.vector.app.features.settings.account.deactivation import com.airbnb.mvrx.FragmentViewModelContext import com.airbnb.mvrx.MvRxState @@ -24,9 +24,9 @@ import com.squareup.inject.assisted.AssistedInject import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.failure.isInvalidPassword import im.vector.matrix.android.api.session.Session -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.core.platform.VectorViewModelAction data class DeactivateAccountViewState( val passwordShown: Boolean = false diff --git a/vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsAction.kt b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsAction.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsAction.kt rename to vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsAction.kt index fbc5ba05cc..1d7b4bf59b 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsAction.kt +++ b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsAction.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.crosssigning +package im.vector.app.features.settings.crosssigning -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction sealed class CrossSigningSettingsAction : VectorViewModelAction { object SetUpRecovery : CrossSigningSettingsAction() diff --git a/vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsController.kt b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsController.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsController.kt rename to vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsController.kt index 5f0fb912cf..e0eced9a73 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsController.kt +++ b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsController.kt @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.settings.crosssigning +package im.vector.app.features.settings.crosssigning import com.airbnb.epoxy.TypedEpoxyController -import im.vector.riotx.R -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.core.ui.list.genericItem -import im.vector.riotx.core.ui.list.genericItemWithValue -import im.vector.riotx.core.utils.DimensionConverter -import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationActionItem +import im.vector.app.R +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.ui.list.genericItem +import im.vector.app.core.ui.list.genericItemWithValue +import im.vector.app.core.utils.DimensionConverter +import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem import me.gujun.android.span.span import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsFragment.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsFragment.kt rename to vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsFragment.kt index 5778d05d1c..7935d282c5 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsFragment.kt @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.settings.crosssigning +package im.vector.app.features.settings.crosssigning import android.os.Bundle import android.view.View import androidx.appcompat.app.AlertDialog import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.core.platform.VectorBaseFragment import kotlinx.android.synthetic.main.fragment_generic_recycler.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsViewEvents.kt b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewEvents.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsViewEvents.kt rename to vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewEvents.kt index 584116239a..52f939636c 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewEvents.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.crosssigning +package im.vector.app.features.settings.crosssigning -import im.vector.riotx.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewEvents /** * Transient events for cross signing settings screen diff --git a/vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsViewModel.kt rename to vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt index 29c1ed3371..19dcd8055a 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.settings.crosssigning +package im.vector.app.features.settings.crosssigning import com.airbnb.mvrx.FragmentViewModelContext import com.airbnb.mvrx.MvRxViewModelFactory @@ -26,8 +26,8 @@ import im.vector.matrix.android.api.util.Optional import im.vector.matrix.android.internal.crypto.crosssigning.isVerified import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo import im.vector.matrix.rx.rx -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorViewModel +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorViewModel import io.reactivex.Observable import io.reactivex.functions.BiFunction diff --git a/vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsViewState.kt b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewState.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsViewState.kt rename to vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewState.kt index d48ee8923f..eff357af4f 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/crosssigning/CrossSigningSettingsViewState.kt +++ b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.crosssigning +package im.vector.app.features.settings.crosssigning import com.airbnb.mvrx.MvRxState import im.vector.matrix.android.api.session.crypto.crosssigning.MXCrossSigningInfo diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceItem.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceItem.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceItem.kt rename to vector/src/main/java/im/vector/app/features/settings/devices/DeviceItem.kt index 0f58360dbd..db0bfff6ca 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceItem.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.devices +package im.vector.app.features.settings.devices import android.graphics.Typeface import android.view.ViewGroup @@ -25,11 +25,11 @@ import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import im.vector.matrix.android.internal.crypto.crosssigning.DeviceTrustLevel import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.utils.DimensionConverter +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.utils.DimensionConverter import me.gujun.android.span.span import java.text.DateFormat import java.text.SimpleDateFormat diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceVerificationInfoBottomSheet.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceVerificationInfoBottomSheet.kt rename to vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt index 8e18472499..6a334898c0 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceVerificationInfoBottomSheet.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.settings.devices +package im.vector.app.features.settings.devices import android.os.Bundle import android.os.Parcelable @@ -24,11 +24,11 @@ import com.airbnb.mvrx.MvRx import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.parentFragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment import kotlinx.android.parcel.Parcelize import kotlinx.android.synthetic.main.bottom_sheet_generic_list_with_title.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt rename to vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt index 02209a4cb2..36dd04aee0 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewModel.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.settings.devices +package im.vector.app.features.settings.devices import com.airbnb.mvrx.Async import com.airbnb.mvrx.FragmentViewModelContext @@ -28,9 +28,9 @@ import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo import im.vector.matrix.rx.rx -import im.vector.riotx.core.platform.EmptyAction -import im.vector.riotx.core.platform.EmptyViewEvents -import im.vector.riotx.core.platform.VectorViewModel +import im.vector.app.core.platform.EmptyAction +import im.vector.app.core.platform.EmptyViewEvents +import im.vector.app.core.platform.VectorViewModel data class DeviceVerificationInfoBottomSheetViewState( val cryptoDeviceInfo: Async = Uninitialized, diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceVerificationInfoEpoxyController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoEpoxyController.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceVerificationInfoEpoxyController.kt rename to vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoEpoxyController.kt index ddec06b9a2..a734a88ac2 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/devices/DeviceVerificationInfoEpoxyController.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoEpoxyController.kt @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.settings.devices +package im.vector.app.features.settings.devices import com.airbnb.epoxy.TypedEpoxyController import im.vector.matrix.android.api.extensions.orFalse import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.dividerItem -import im.vector.riotx.core.epoxy.loadingItem -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.core.ui.list.GenericItem -import im.vector.riotx.core.ui.list.genericFooterItem -import im.vector.riotx.core.ui.list.genericItem -import im.vector.riotx.features.crypto.verification.epoxy.bottomSheetVerificationActionItem +import im.vector.app.R +import im.vector.app.core.epoxy.dividerItem +import im.vector.app.core.epoxy.loadingItem +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.ui.list.GenericItem +import im.vector.app.core.ui.list.genericFooterItem +import im.vector.app.core.ui.list.genericItem +import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesAction.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesAction.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesAction.kt rename to vector/src/main/java/im/vector/app/features/settings/devices/DevicesAction.kt index 854f5ea895..0af0ee0cd8 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesAction.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesAction.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.devices +package im.vector.app.features.settings.devices import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction sealed class DevicesAction : VectorViewModelAction { object Refresh : DevicesAction() diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesController.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesController.kt rename to vector/src/main/java/im/vector/app/features/settings/devices/DevicesController.kt index 1b08f23996..7f61a0b904 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesController.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesController.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.devices +package im.vector.app.features.settings.devices import com.airbnb.epoxy.EpoxyController import com.airbnb.mvrx.Fail @@ -23,15 +23,15 @@ import com.airbnb.mvrx.Success import com.airbnb.mvrx.Uninitialized import im.vector.matrix.android.internal.crypto.crosssigning.DeviceTrustLevel import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo -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.ColorProvider -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.core.ui.list.genericItemHeader -import im.vector.riotx.core.utils.DimensionConverter -import im.vector.riotx.features.settings.VectorPreferences +import im.vector.app.R +import im.vector.app.core.epoxy.errorWithRetryItem +import im.vector.app.core.epoxy.loadingItem +import im.vector.app.core.error.ErrorFormatter +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.ui.list.genericItemHeader +import im.vector.app.core.utils.DimensionConverter +import im.vector.app.features.settings.VectorPreferences import javax.inject.Inject class DevicesController @Inject constructor(private val errorFormatter: ErrorFormatter, diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesViewEvents.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewEvents.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesViewEvents.kt rename to vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewEvents.kt index 2cbdbe9485..e70d00f96c 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewEvents.kt @@ -15,12 +15,12 @@ * */ -package im.vector.riotx.features.settings.devices +package im.vector.app.features.settings.devices import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo -import im.vector.riotx.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewEvents /** * Transient events for Ignored users screen diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt similarity index 99% rename from vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesViewModel.kt rename to vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt index 8022b8988c..9f9a878f7f 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/devices/DevicesViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.devices +package im.vector.app.features.settings.devices import androidx.lifecycle.viewModelScope import com.airbnb.mvrx.Async @@ -42,7 +42,7 @@ import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo import im.vector.matrix.android.internal.util.awaitCallback import im.vector.matrix.rx.rx -import im.vector.riotx.core.platform.VectorViewModel +import im.vector.app.core.platform.VectorViewModel import io.reactivex.Observable import io.reactivex.functions.BiFunction import io.reactivex.subjects.PublishSubject diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devices/TrustUtils.kt b/vector/src/main/java/im/vector/app/features/settings/devices/TrustUtils.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/settings/devices/TrustUtils.kt rename to vector/src/main/java/im/vector/app/features/settings/devices/TrustUtils.kt index 7f987b327b..34c129b656 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/devices/TrustUtils.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devices/TrustUtils.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.devices +package im.vector.app.features.settings.devices import androidx.annotation.DrawableRes import im.vector.matrix.android.internal.crypto.crosssigning.DeviceTrustLevel -import im.vector.riotx.R +import im.vector.app.R object TrustUtils { diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devices/VectorSettingsDevicesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/settings/devices/VectorSettingsDevicesFragment.kt rename to vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt index 46ab694248..5e62e59e8e 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/devices/VectorSettingsDevicesFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.devices +package im.vector.app.features.settings.devices import android.os.Bundle import android.view.View @@ -26,15 +26,15 @@ import com.airbnb.mvrx.Loading import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo -import im.vector.riotx.R -import im.vector.riotx.core.dialogs.ManuallyVerifyDialog -import im.vector.riotx.core.dialogs.PromptPasswordDialog -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.features.crypto.verification.VerificationBottomSheet +import im.vector.app.R +import im.vector.app.core.dialogs.ManuallyVerifyDialog +import im.vector.app.core.dialogs.PromptPasswordDialog +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.features.crypto.verification.VerificationBottomSheet import kotlinx.android.synthetic.main.fragment_generic_recycler.* import kotlinx.android.synthetic.main.merge_overlay_waiting_view.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devtools/AccountDataEpoxyController.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataEpoxyController.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/settings/devtools/AccountDataEpoxyController.kt rename to vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataEpoxyController.kt index bc3a3eb13d..8b6f7986d6 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/devtools/AccountDataEpoxyController.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataEpoxyController.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.devtools +package im.vector.app.features.settings.devtools import android.view.View import com.airbnb.epoxy.TypedEpoxyController @@ -22,12 +22,12 @@ import com.airbnb.mvrx.Fail import com.airbnb.mvrx.Loading import com.airbnb.mvrx.Success import im.vector.matrix.android.api.session.accountdata.UserAccountDataEvent -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.loadingItem -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.core.ui.list.genericFooterItem -import im.vector.riotx.core.ui.list.genericItemWithValue -import im.vector.riotx.core.utils.DebouncedClickListener +import im.vector.app.R +import im.vector.app.core.epoxy.loadingItem +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.ui.list.genericFooterItem +import im.vector.app.core.ui.list.genericItemWithValue +import im.vector.app.core.utils.DebouncedClickListener import javax.inject.Inject class AccountDataEpoxyController @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devtools/AccountDataFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataFragment.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/settings/devtools/AccountDataFragment.kt rename to vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataFragment.kt index 4f9cf827cc..d6f97facdc 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/devtools/AccountDataFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.devtools +package im.vector.app.features.settings.devtools import android.os.Bundle import android.view.View @@ -22,13 +22,13 @@ import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState import im.vector.matrix.android.internal.di.MoshiProvider import im.vector.matrix.android.api.session.accountdata.UserAccountDataEvent -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.utils.createJSonViewerStyleProvider +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.utils.createJSonViewerStyleProvider import kotlinx.android.synthetic.main.fragment_generic_recycler.* import org.billcarsonfr.jsonviewer.JSonViewerDialog import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devtools/AccountDataViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataViewModel.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/settings/devtools/AccountDataViewModel.kt rename to vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataViewModel.kt index 825af6e397..cddc6323f9 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/devtools/AccountDataViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devtools/AccountDataViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.devtools +package im.vector.app.features.settings.devtools import com.airbnb.mvrx.Async import com.airbnb.mvrx.FragmentViewModelContext @@ -27,9 +27,9 @@ import com.squareup.inject.assisted.AssistedInject import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.accountdata.UserAccountDataEvent import im.vector.matrix.rx.rx -import im.vector.riotx.core.platform.EmptyAction -import im.vector.riotx.core.platform.EmptyViewEvents -import im.vector.riotx.core.platform.VectorViewModel +import im.vector.app.core.platform.EmptyAction +import im.vector.app.core.platform.EmptyViewEvents +import im.vector.app.core.platform.VectorViewModel data class AccountDataViewState( val accountData: Async> = Uninitialized diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devtools/GossipingEventsEpoxyController.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsEpoxyController.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/settings/devtools/GossipingEventsEpoxyController.kt rename to vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsEpoxyController.kt index 722115adf3..7664adec10 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/devtools/GossipingEventsEpoxyController.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsEpoxyController.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.devtools +package im.vector.app.features.settings.devtools import com.airbnb.epoxy.TypedEpoxyController import com.airbnb.mvrx.Fail @@ -30,17 +30,17 @@ import im.vector.matrix.android.internal.crypto.model.rest.ForwardedRoomKeyConte import im.vector.matrix.android.internal.crypto.model.rest.GossipingToDeviceObject import im.vector.matrix.android.internal.crypto.model.rest.RoomKeyShareRequest import im.vector.matrix.android.internal.crypto.model.rest.SecretShareRequest -import im.vector.riotx.R -import im.vector.riotx.core.date.VectorDateFormatter -import im.vector.riotx.core.epoxy.loadingItem -import im.vector.riotx.core.extensions.exhaustive -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.core.ui.list.GenericItem -import im.vector.riotx.core.ui.list.genericFooterItem -import im.vector.riotx.core.ui.list.genericItem -import im.vector.riotx.core.ui.list.genericItemHeader +import im.vector.app.R +import im.vector.app.core.date.VectorDateFormatter +import im.vector.app.core.epoxy.loadingItem +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.resources.DateProvider +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.ui.list.GenericItem +import im.vector.app.core.ui.list.genericFooterItem +import im.vector.app.core.ui.list.genericItem +import im.vector.app.core.ui.list.genericItemHeader import me.gujun.android.span.span import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devtools/GossipingEventsPaperTrailFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailFragment.kt similarity index 87% rename from vector/src/main/java/im/vector/riotx/features/settings/devtools/GossipingEventsPaperTrailFragment.kt rename to vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailFragment.kt index 9489fb8506..c79172c9ae 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/devtools/GossipingEventsPaperTrailFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailFragment.kt @@ -14,19 +14,19 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.devtools +package im.vector.app.features.settings.devtools import android.os.Bundle import android.view.View import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState import im.vector.matrix.android.api.session.events.model.Event -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.resources.ColorProvider -import im.vector.riotx.core.utils.createJSonViewerStyleProvider +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.resources.ColorProvider +import im.vector.app.core.utils.createJSonViewerStyleProvider import kotlinx.android.synthetic.main.fragment_generic_recycler.* import org.billcarsonfr.jsonviewer.JSonViewerDialog import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt rename to vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt index 1f667d6993..8d493860cf 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.devtools +package im.vector.app.features.settings.devtools import androidx.lifecycle.viewModelScope import com.airbnb.mvrx.Async @@ -29,9 +29,9 @@ import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.events.model.Event -import im.vector.riotx.core.platform.EmptyAction -import im.vector.riotx.core.platform.EmptyViewEvents -import im.vector.riotx.core.platform.VectorViewModel +import im.vector.app.core.platform.EmptyAction +import im.vector.app.core.platform.EmptyViewEvents +import im.vector.app.core.platform.VectorViewModel import kotlinx.coroutines.launch data class GossipingEventsPaperTrailState( diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devtools/IncomingKeyRequestListFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestListFragment.kt similarity index 85% rename from vector/src/main/java/im/vector/riotx/features/settings/devtools/IncomingKeyRequestListFragment.kt rename to vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestListFragment.kt index 7a5b08752e..c7b95ddf78 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/devtools/IncomingKeyRequestListFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestListFragment.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.devtools +package im.vector.app.features.settings.devtools import android.os.Bundle import android.view.View import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.resources.ColorProvider +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.resources.ColorProvider import kotlinx.android.synthetic.main.fragment_generic_recycler.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devtools/KeyRequestEpoxyController.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestEpoxyController.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/settings/devtools/KeyRequestEpoxyController.kt rename to vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestEpoxyController.kt index 7721b67118..5907b55b31 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/devtools/KeyRequestEpoxyController.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestEpoxyController.kt @@ -14,20 +14,20 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.devtools +package im.vector.app.features.settings.devtools 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.riotx.R -import im.vector.riotx.core.epoxy.loadingItem -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.core.ui.list.genericFooterItem -import im.vector.riotx.core.ui.list.genericItem -import im.vector.riotx.core.ui.list.genericItemHeader +import im.vector.app.R +import im.vector.app.core.epoxy.loadingItem +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.ui.list.genericFooterItem +import im.vector.app.core.ui.list.genericItem +import im.vector.app.core.ui.list.genericItemHeader import me.gujun.android.span.span import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devtools/KeyRequestListViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestListViewModel.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/settings/devtools/KeyRequestListViewModel.kt rename to vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestListViewModel.kt index db4b4f7d60..b0f095ea4e 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/devtools/KeyRequestListViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestListViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.devtools +package im.vector.app.features.settings.devtools import androidx.lifecycle.viewModelScope import com.airbnb.mvrx.Async @@ -29,9 +29,9 @@ import com.squareup.inject.assisted.AssistedInject import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.internal.crypto.IncomingRoomKeyRequest import im.vector.matrix.android.internal.crypto.OutgoingRoomKeyRequest -import im.vector.riotx.core.platform.EmptyAction -import im.vector.riotx.core.platform.EmptyViewEvents -import im.vector.riotx.core.platform.VectorViewModel +import im.vector.app.core.platform.EmptyAction +import im.vector.app.core.platform.EmptyViewEvents +import im.vector.app.core.platform.VectorViewModel import kotlinx.coroutines.launch data class KeyRequestListViewState( diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devtools/KeyRequestsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestsFragment.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/settings/devtools/KeyRequestsFragment.kt rename to vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestsFragment.kt index 76174558b5..08016c66ac 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/devtools/KeyRequestsFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestsFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.devtools +package im.vector.app.features.settings.devtools import android.os.Bundle import android.view.View @@ -23,9 +23,9 @@ import androidx.viewpager2.adapter.FragmentStateAdapter import androidx.viewpager2.widget.ViewPager2 import androidx.viewpager2.widget.ViewPager2.SCROLL_STATE_IDLE import com.google.android.material.tabs.TabLayoutMediator -import im.vector.riotx.R -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.app.R +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.core.platform.VectorBaseFragment import kotlinx.android.synthetic.main.fragment_devtool_keyrequests.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/settings/devtools/OutgoingKeyRequestListFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/OutgoingKeyRequestListFragment.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/settings/devtools/OutgoingKeyRequestListFragment.kt rename to vector/src/main/java/im/vector/app/features/settings/devtools/OutgoingKeyRequestListFragment.kt index 658497c23d..60e73fb74d 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/devtools/OutgoingKeyRequestListFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devtools/OutgoingKeyRequestListFragment.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.devtools +package im.vector.app.features.settings.devtools import android.os.Bundle import android.view.View import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.resources.ColorProvider +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.resources.ColorProvider import kotlinx.android.synthetic.main.fragment_generic_recycler.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/settings/ignored/IgnoredUsersController.kt b/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersController.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/settings/ignored/IgnoredUsersController.kt rename to vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersController.kt index 5f4158b542..986ad506f7 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/ignored/IgnoredUsersController.kt +++ b/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersController.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.ignored +package im.vector.app.features.settings.ignored import com.airbnb.epoxy.EpoxyController import im.vector.matrix.android.api.session.user.model.User import im.vector.matrix.android.api.util.toMatrixItem -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.noResultItem -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.home.AvatarRenderer +import im.vector.app.R +import im.vector.app.core.epoxy.noResultItem +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.home.AvatarRenderer import javax.inject.Inject class IgnoredUsersController @Inject constructor(private val stringProvider: StringProvider, diff --git a/vector/src/main/java/im/vector/riotx/features/settings/ignored/IgnoredUsersViewEvents.kt b/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewEvents.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/settings/ignored/IgnoredUsersViewEvents.kt rename to vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewEvents.kt index 3b98159d1a..2b2c3eb49d 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/ignored/IgnoredUsersViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewEvents.kt @@ -15,9 +15,9 @@ * */ -package im.vector.riotx.features.settings.ignored +package im.vector.app.features.settings.ignored -import im.vector.riotx.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewEvents /** * Transient events for Ignored users screen diff --git a/vector/src/main/java/im/vector/riotx/features/settings/ignored/IgnoredUsersViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewModel.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/settings/ignored/IgnoredUsersViewModel.kt rename to vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewModel.kt index e9c02618b0..362e393c5f 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/ignored/IgnoredUsersViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.ignored +package im.vector.app.features.settings.ignored import com.airbnb.mvrx.Async import com.airbnb.mvrx.Fail @@ -31,8 +31,8 @@ import im.vector.matrix.android.api.MatrixCallback 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.riotx.core.platform.VectorViewModel -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.core.platform.VectorViewModelAction data class IgnoredUsersViewState( val ignoredUsers: List = emptyList(), diff --git a/vector/src/main/java/im/vector/riotx/features/settings/ignored/UserItem.kt b/vector/src/main/java/im/vector/app/features/settings/ignored/UserItem.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/settings/ignored/UserItem.kt rename to vector/src/main/java/im/vector/app/features/settings/ignored/UserItem.kt index 7182dd0bda..0066fa423d 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/ignored/UserItem.kt +++ b/vector/src/main/java/im/vector/app/features/settings/ignored/UserItem.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.settings.ignored +package im.vector.app.features.settings.ignored import android.view.View import android.widget.ImageView @@ -21,11 +21,11 @@ import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import im.vector.matrix.android.api.util.MatrixItem -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.features.home.AvatarRenderer +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.extensions.setTextOrHide +import im.vector.app.features.home.AvatarRenderer /** * A list item for User. diff --git a/vector/src/main/java/im/vector/riotx/features/settings/ignored/VectorSettingsIgnoredUsersFragment.kt b/vector/src/main/java/im/vector/app/features/settings/ignored/VectorSettingsIgnoredUsersFragment.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/settings/ignored/VectorSettingsIgnoredUsersFragment.kt rename to vector/src/main/java/im/vector/app/features/settings/ignored/VectorSettingsIgnoredUsersFragment.kt index c211d14edc..2588eef59b 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/ignored/VectorSettingsIgnoredUsersFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/ignored/VectorSettingsIgnoredUsersFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.ignored +package im.vector.app.features.settings.ignored import android.os.Bundle import android.view.View @@ -24,12 +24,12 @@ import com.airbnb.mvrx.Async import com.airbnb.mvrx.Loading import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.core.platform.VectorBaseFragment import kotlinx.android.synthetic.main.fragment_generic_recycler.* import kotlinx.android.synthetic.main.merge_overlay_waiting_view.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/settings/locale/LocaleItem.kt b/vector/src/main/java/im/vector/app/features/settings/locale/LocaleItem.kt similarity index 81% rename from vector/src/main/java/im/vector/riotx/features/settings/locale/LocaleItem.kt rename to vector/src/main/java/im/vector/app/features/settings/locale/LocaleItem.kt index 18c5cb2aae..7462200197 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/locale/LocaleItem.kt +++ b/vector/src/main/java/im/vector/app/features/settings/locale/LocaleItem.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.locale +package im.vector.app.features.settings.locale import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.ClickListener -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel -import im.vector.riotx.core.epoxy.onClick -import im.vector.riotx.core.extensions.setTextOrHide +import im.vector.app.R +import im.vector.app.core.epoxy.ClickListener +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.epoxy.onClick +import im.vector.app.core.extensions.setTextOrHide @EpoxyModelClass(layout = R.layout.item_locale) abstract class LocaleItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerAction.kt b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerAction.kt similarity index 87% rename from vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerAction.kt rename to vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerAction.kt index 0bfc203159..4d55dfd2f7 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerAction.kt +++ b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerAction.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.locale +package im.vector.app.features.settings.locale -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction import java.util.Locale sealed class LocalePickerAction : VectorViewModelAction { diff --git a/vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerController.kt b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerController.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerController.kt rename to vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerController.kt index 5e6704818f..9654eb2190 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerController.kt +++ b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerController.kt @@ -14,18 +14,18 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.locale +package im.vector.app.features.settings.locale import com.airbnb.epoxy.TypedEpoxyController import com.airbnb.mvrx.Incomplete import com.airbnb.mvrx.Success -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.loadingItem -import im.vector.riotx.core.epoxy.noResultItem -import im.vector.riotx.core.epoxy.profiles.profileSectionItem -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.settings.VectorLocale -import im.vector.riotx.features.settings.VectorPreferences +import im.vector.app.R +import im.vector.app.core.epoxy.loadingItem +import im.vector.app.core.epoxy.noResultItem +import im.vector.app.core.epoxy.profiles.profileSectionItem +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.settings.VectorLocale +import im.vector.app.features.settings.VectorPreferences import java.util.Locale import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerFragment.kt b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerFragment.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerFragment.kt rename to vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerFragment.kt index 75d758aafa..e156528d3d 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerFragment.kt @@ -14,19 +14,19 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.locale +package im.vector.app.features.settings.locale import android.os.Bundle import android.view.View import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.extensions.restart -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.extensions.restart +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.core.platform.VectorBaseFragment import kotlinx.android.synthetic.main.fragment_locale_picker.* import java.util.Locale import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerViewEvents.kt b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewEvents.kt similarity index 87% rename from vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerViewEvents.kt rename to vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewEvents.kt index e007f5f036..1a2cdcfaec 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewEvents.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.locale +package im.vector.app.features.settings.locale -import im.vector.riotx.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewEvents sealed class LocalePickerViewEvents : VectorViewEvents { object RestartActivity : LocalePickerViewEvents() diff --git a/vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewModel.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerViewModel.kt rename to vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewModel.kt index e4cc64733c..fd20007c99 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.locale +package im.vector.app.features.settings.locale import androidx.lifecycle.viewModelScope import com.airbnb.mvrx.ActivityViewModelContext @@ -24,9 +24,9 @@ import com.airbnb.mvrx.Success import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.features.settings.VectorLocale +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.features.settings.VectorLocale import kotlinx.coroutines.launch class LocalePickerViewModel @AssistedInject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerViewState.kt b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewState.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerViewState.kt rename to vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewState.kt index 416350d827..64c95468f0 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/locale/LocalePickerViewState.kt +++ b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerViewState.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.locale +package im.vector.app.features.settings.locale import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState import com.airbnb.mvrx.Uninitialized -import im.vector.riotx.features.settings.VectorLocale +import im.vector.app.features.settings.VectorLocale import java.util.Locale data class LocalePickerViewState( diff --git a/vector/src/main/java/im/vector/riotx/features/settings/locale/SystemLocaleProvider.kt b/vector/src/main/java/im/vector/app/features/settings/locale/SystemLocaleProvider.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/settings/locale/SystemLocaleProvider.kt rename to vector/src/main/java/im/vector/app/features/settings/locale/SystemLocaleProvider.kt index d3265f3179..03d3b0623a 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/locale/SystemLocaleProvider.kt +++ b/vector/src/main/java/im/vector/app/features/settings/locale/SystemLocaleProvider.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.locale +package im.vector.app.features.settings.locale import android.content.Context import timber.log.Timber diff --git a/vector/src/main/java/im/vector/riotx/features/settings/push/PushGateWayController.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGateWayController.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/settings/push/PushGateWayController.kt rename to vector/src/main/java/im/vector/app/features/settings/push/PushGateWayController.kt index d8d23fbaf4..2d111e4424 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/push/PushGateWayController.kt +++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGateWayController.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.push +package im.vector.app.features.settings.push import com.airbnb.epoxy.TypedEpoxyController -import im.vector.riotx.R -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.core.ui.list.genericFooterItem +import im.vector.app.R +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.ui.list.genericFooterItem import javax.inject.Inject class PushGateWayController @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewayAction.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayAction.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewayAction.kt rename to vector/src/main/java/im/vector/app/features/settings/push/PushGatewayAction.kt index ab79d2e23b..566a068a7d 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewayAction.kt +++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayAction.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.push +package im.vector.app.features.settings.push -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction sealed class PushGatewayAction : VectorViewModelAction { object Refresh : PushGatewayAction() diff --git a/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewayItem.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewayItem.kt rename to vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt index 6873330271..b73b97bbf8 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewayItem.kt +++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.push +package im.vector.app.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.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder @EpoxyModelClass(layout = R.layout.item_pushgateway) abstract class PushGatewayItem : EpoxyModelWithHolder() { diff --git a/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewaysFragment.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysFragment.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewaysFragment.kt rename to vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysFragment.kt index 92f1c9ce72..e6e9ce3753 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewaysFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysFragment.kt @@ -14,18 +14,18 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.push +package im.vector.app.features.settings.push import android.os.Bundle import android.view.MenuItem import android.view.View import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.core.platform.VectorBaseFragment import kotlinx.android.synthetic.main.fragment_generic_recycler.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewaysViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewaysViewModel.kt rename to vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt index 8b1a551c13..f78bfacfc7 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewaysViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.push +package im.vector.app.features.settings.push import com.airbnb.mvrx.Async import com.airbnb.mvrx.FragmentViewModelContext @@ -27,9 +27,9 @@ 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.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.EmptyViewEvents -import im.vector.riotx.core.platform.VectorViewModel +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.EmptyViewEvents +import im.vector.app.core.platform.VectorViewModel data class PushGatewayViewState( val pushGateways: Async> = Uninitialized diff --git a/vector/src/main/java/im/vector/riotx/features/settings/push/PushRuleItem.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushRuleItem.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/settings/push/PushRuleItem.kt rename to vector/src/main/java/im/vector/app/features/settings/push/PushRuleItem.kt index b00159d1e2..b2a42f6151 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/push/PushRuleItem.kt +++ b/vector/src/main/java/im/vector/app/features/settings/push/PushRuleItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.settings.push +package im.vector.app.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.getActions import im.vector.matrix.android.api.pushrules.rest.PushRule -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.features.notifications.toNotificationAction +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.features.notifications.toNotificationAction @EpoxyModelClass(layout = R.layout.item_pushrule_raw) abstract class PushRuleItem : EpoxyModelWithHolder() { diff --git a/vector/src/main/java/im/vector/riotx/features/settings/push/PushRulesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushRulesFragment.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/settings/push/PushRulesFragment.kt rename to vector/src/main/java/im/vector/app/features/settings/push/PushRulesFragment.kt index bee9cf54d9..44cb5d8ea2 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/push/PushRulesFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/push/PushRulesFragment.kt @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.settings.push +package im.vector.app.features.settings.push import android.os.Bundle import android.view.View import com.airbnb.epoxy.TypedEpoxyController import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -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 im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.ui.list.genericFooterItem import kotlinx.android.synthetic.main.fragment_generic_recycler.* // Referenced in vector_settings_notifications.xml diff --git a/vector/src/main/java/im/vector/riotx/features/settings/push/PushRulesViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushRulesViewModel.kt similarity index 85% rename from vector/src/main/java/im/vector/riotx/features/settings/push/PushRulesViewModel.kt rename to vector/src/main/java/im/vector/app/features/settings/push/PushRulesViewModel.kt index 43854af666..15d5345daa 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/push/PushRulesViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/settings/push/PushRulesViewModel.kt @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.settings.push +package im.vector.app.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.riotx.core.di.HasScreenInjector -import im.vector.riotx.core.platform.EmptyAction -import im.vector.riotx.core.platform.EmptyViewEvents -import im.vector.riotx.core.platform.VectorViewModel +import im.vector.app.core.di.HasScreenInjector +import im.vector.app.core.platform.EmptyAction +import im.vector.app.core.platform.EmptyViewEvents +import im.vector.app.core.platform.VectorViewModel data class PushRulesViewState( val rules: List = emptyList() diff --git a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt rename to vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt index a650702bcb..b1f9b412f5 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.settings.troubleshoot +package im.vector.app.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.riotx.R -import im.vector.riotx.features.themes.ThemeUtils +import im.vector.app.R +import im.vector.app.features.themes.ThemeUtils class NotificationTroubleshootRecyclerViewAdapter(val tests: ArrayList) : RecyclerView.Adapter() { diff --git a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt rename to vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt index a0a54a8e82..92e8eecb4d 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.settings.troubleshoot +package im.vector.app.features.settings.troubleshoot import android.os.Handler import android.os.Looper diff --git a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestAccountSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestAccountSettings.kt rename to vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt index d89bd15e14..cc775073fd 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestAccountSettings.kt +++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.settings.troubleshoot +package im.vector.app.features.settings.troubleshoot import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.pushrules.RuleIds import im.vector.matrix.android.api.pushrules.RuleKind -import im.vector.riotx.R -import im.vector.riotx.core.di.ActiveSessionHolder -import im.vector.riotx.core.resources.StringProvider +import im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.resources.StringProvider import javax.inject.Inject /** diff --git a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestDeviceSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestDeviceSettings.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestDeviceSettings.kt rename to vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestDeviceSettings.kt index 8344211a2c..61c2fb120e 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestDeviceSettings.kt +++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestDeviceSettings.kt @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.settings.troubleshoot +package im.vector.app.features.settings.troubleshoot -import im.vector.riotx.R -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.settings.VectorPreferences +import im.vector.app.R +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.settings.VectorPreferences import javax.inject.Inject /** diff --git a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestPushRulesSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestPushRulesSettings.kt rename to vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt index bbdf8fa62c..f2810cd819 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestPushRulesSettings.kt +++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.settings.troubleshoot +package im.vector.app.features.settings.troubleshoot import im.vector.matrix.android.api.pushrules.RuleIds import im.vector.matrix.android.api.pushrules.getActions -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.toNotificationAction +import im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.notifications.toNotificationAction import javax.inject.Inject class TestPushRulesSettings @Inject constructor(private val activeSessionHolder: ActiveSessionHolder, diff --git a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestSystemSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestSystemSettings.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestSystemSettings.kt rename to vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestSystemSettings.kt index 1c01d3ee73..92eae017f9 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TestSystemSettings.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.settings.troubleshoot +package im.vector.app.features.settings.troubleshoot import androidx.appcompat.app.AppCompatActivity import androidx.core.app.NotificationManagerCompat -import im.vector.riotx.R -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.core.utils.startNotificationSettingsIntent +import im.vector.app.R +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.utils.startNotificationSettingsIntent import javax.inject.Inject /** diff --git a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TroubleshootTest.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TroubleshootTest.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TroubleshootTest.kt rename to vector/src/main/java/im/vector/app/features/settings/troubleshoot/TroubleshootTest.kt index 6d2c1b09dd..7abec31ae4 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/troubleshoot/TroubleshootTest.kt +++ b/vector/src/main/java/im/vector/app/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.riotx.features.settings.troubleshoot +package im.vector.app.features.settings.troubleshoot import androidx.annotation.StringRes import kotlin.properties.Delegates diff --git a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareAction.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareAction.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/share/IncomingShareAction.kt rename to vector/src/main/java/im/vector/app/features/share/IncomingShareAction.kt index 0379c4980f..2db32bc688 100644 --- a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareAction.kt +++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareAction.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.share +package im.vector.app.features.share import im.vector.matrix.android.api.session.room.model.RoomSummary -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction sealed class IncomingShareAction : VectorViewModelAction { data class SelectRoom(val roomSummary: RoomSummary, val enableMultiSelect: Boolean) : IncomingShareAction() diff --git a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareActivity.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareActivity.kt similarity index 82% rename from vector/src/main/java/im/vector/riotx/features/share/IncomingShareActivity.kt rename to vector/src/main/java/im/vector/app/features/share/IncomingShareActivity.kt index 5948ea089d..3977dfb990 100644 --- a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareActivity.kt +++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareActivity.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package im.vector.riotx.features.share +package im.vector.app.features.share import androidx.appcompat.widget.Toolbar -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 im.vector.app.R +import im.vector.app.core.extensions.addFragment +import im.vector.app.core.platform.ToolbarConfigurable +import im.vector.app.core.platform.VectorBaseActivity class IncomingShareActivity : VectorBaseActivity(), ToolbarConfigurable { diff --git a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareController.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareController.kt similarity index 87% rename from vector/src/main/java/im/vector/riotx/features/share/IncomingShareController.kt rename to vector/src/main/java/im/vector/app/features/share/IncomingShareController.kt index 4e7f585458..770861ef55 100644 --- a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareController.kt +++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareController.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package im.vector.riotx.features.share +package im.vector.app.features.share import com.airbnb.epoxy.TypedEpoxyController import com.airbnb.mvrx.Incomplete import im.vector.matrix.android.api.session.room.model.RoomSummary -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.loadingItem -import im.vector.riotx.core.epoxy.noResultItem -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.home.room.list.RoomSummaryItemFactory +import im.vector.app.R +import im.vector.app.core.epoxy.loadingItem +import im.vector.app.core.epoxy.noResultItem +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.home.room.list.RoomSummaryItemFactory import javax.inject.Inject class IncomingShareController @Inject constructor(private val roomSummaryItemFactory: RoomSummaryItemFactory, diff --git a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareFragment.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/share/IncomingShareFragment.kt rename to vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt index aa665b5653..23c7d71c9e 100644 --- a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareFragment.kt +++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.share +package im.vector.app.features.share import android.app.Activity import android.content.ClipDescription @@ -30,20 +30,20 @@ import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState import im.vector.matrix.android.api.session.content.ContentAttachmentData import im.vector.matrix.android.api.session.room.model.RoomSummary -import im.vector.riotx.R -import im.vector.riotx.core.di.ActiveSessionHolder -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.utils.PERMISSIONS_FOR_WRITING_FILES -import im.vector.riotx.core.utils.PERMISSION_REQUEST_CODE_PICK_ATTACHMENT -import im.vector.riotx.core.utils.allGranted -import im.vector.riotx.core.utils.checkPermissions -import im.vector.riotx.features.attachments.AttachmentsHelper -import im.vector.riotx.features.attachments.preview.AttachmentsPreviewActivity -import im.vector.riotx.features.attachments.preview.AttachmentsPreviewArgs -import im.vector.riotx.features.login.LoginActivity +import im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.utils.PERMISSIONS_FOR_WRITING_FILES +import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_PICK_ATTACHMENT +import im.vector.app.core.utils.allGranted +import im.vector.app.core.utils.checkPermissions +import im.vector.app.features.attachments.AttachmentsHelper +import im.vector.app.features.attachments.preview.AttachmentsPreviewActivity +import im.vector.app.features.attachments.preview.AttachmentsPreviewArgs +import im.vector.app.features.login.LoginActivity import kotlinx.android.synthetic.main.fragment_incoming_share.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareViewEvents.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareViewEvents.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/share/IncomingShareViewEvents.kt rename to vector/src/main/java/im/vector/app/features/share/IncomingShareViewEvents.kt index 2940a1e750..4bdc3dedd6 100644 --- a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareViewEvents.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package im.vector.riotx.features.share +package im.vector.app.features.share import im.vector.matrix.android.api.session.content.ContentAttachmentData import im.vector.matrix.android.api.session.room.model.RoomSummary -import im.vector.riotx.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewEvents sealed class IncomingShareViewEvents : VectorViewEvents { data class ShareToRoom(val roomSummary: RoomSummary, diff --git a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareViewModel.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareViewModel.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/share/IncomingShareViewModel.kt rename to vector/src/main/java/im/vector/app/features/share/IncomingShareViewModel.kt index c135460ee4..e2482220db 100644 --- a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.share +package im.vector.app.features.share import com.airbnb.mvrx.FragmentViewModelContext import com.airbnb.mvrx.MvRxViewModelFactory @@ -28,12 +28,12 @@ import im.vector.matrix.android.api.session.content.ContentAttachmentData import im.vector.matrix.android.api.session.room.model.Membership import im.vector.matrix.android.api.session.room.roomSummaryQueryParams import im.vector.matrix.rx.rx -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.extensions.toggle -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.features.attachments.isPreviewable -import im.vector.riotx.features.attachments.toGroupedContentAttachmentData -import im.vector.riotx.features.home.room.list.BreadcrumbsRoomComparator +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.extensions.toggle +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.features.attachments.isPreviewable +import im.vector.app.features.attachments.toGroupedContentAttachmentData +import im.vector.app.features.home.room.list.BreadcrumbsRoomComparator import java.util.concurrent.TimeUnit class IncomingShareViewModel @AssistedInject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareViewState.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareViewState.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/share/IncomingShareViewState.kt rename to vector/src/main/java/im/vector/app/features/share/IncomingShareViewState.kt index 71b416ef7e..60655268d0 100644 --- a/vector/src/main/java/im/vector/riotx/features/share/IncomingShareViewState.kt +++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareViewState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.share +package im.vector.app.features.share import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState diff --git a/vector/src/main/java/im/vector/riotx/features/share/SharedData.kt b/vector/src/main/java/im/vector/app/features/share/SharedData.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/share/SharedData.kt rename to vector/src/main/java/im/vector/app/features/share/SharedData.kt index 741d7b0eb3..81f0a245b6 100644 --- a/vector/src/main/java/im/vector/riotx/features/share/SharedData.kt +++ b/vector/src/main/java/im/vector/app/features/share/SharedData.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.share +package im.vector.app.features.share import android.os.Parcelable import im.vector.matrix.android.api.session.content.ContentAttachmentData diff --git a/vector/src/main/java/im/vector/riotx/features/signout/hard/SignedOutActivity.kt b/vector/src/main/java/im/vector/app/features/signout/hard/SignedOutActivity.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/signout/hard/SignedOutActivity.kt rename to vector/src/main/java/im/vector/app/features/signout/hard/SignedOutActivity.kt index f3d81c8010..4e3d1b6cae 100644 --- a/vector/src/main/java/im/vector/riotx/features/signout/hard/SignedOutActivity.kt +++ b/vector/src/main/java/im/vector/app/features/signout/hard/SignedOutActivity.kt @@ -14,16 +14,16 @@ * limitations under the License. */ -package im.vector.riotx.features.signout.hard +package im.vector.app.features.signout.hard import android.content.Context import android.content.Intent import butterknife.OnClick import im.vector.matrix.android.api.failure.GlobalError -import im.vector.riotx.R -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.features.MainActivity -import im.vector.riotx.features.MainActivityArgs +import im.vector.app.R +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.features.MainActivity +import im.vector.app.features.MainActivityArgs import timber.log.Timber /** diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutAction.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutAction.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutAction.kt rename to vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutAction.kt index 5916c59c55..52895506a8 100644 --- a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutAction.kt +++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutAction.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.signout.soft +package im.vector.app.features.signout.soft import im.vector.matrix.android.api.auth.data.Credentials -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction sealed class SoftLogoutAction : VectorViewModelAction { // In case of failure to get the login flow diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutActivity.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutActivity.kt rename to vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity.kt index 88ddc85ac1..961f156977 100644 --- a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutActivity.kt +++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.signout.soft +package im.vector.app.features.signout.soft import android.content.Context import android.content.Intent @@ -25,13 +25,13 @@ import com.airbnb.mvrx.Success import com.airbnb.mvrx.viewModel import im.vector.matrix.android.api.failure.GlobalError import im.vector.matrix.android.api.session.Session -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.replaceFragment -import im.vector.riotx.features.MainActivity -import im.vector.riotx.features.MainActivityArgs -import im.vector.riotx.features.login.LoginActivity +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.error.ErrorFormatter +import im.vector.app.core.extensions.replaceFragment +import im.vector.app.features.MainActivity +import im.vector.app.features.MainActivityArgs +import im.vector.app.features.login.LoginActivity import kotlinx.android.synthetic.main.activity_login.* import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutController.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt similarity index 87% rename from vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutController.kt rename to vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt index fc428cf0ac..b6f4e13a91 100644 --- a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutController.kt +++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt @@ -14,25 +14,25 @@ * limitations under the License. */ -package im.vector.riotx.features.signout.soft +package im.vector.app.features.signout.soft import com.airbnb.epoxy.EpoxyController import com.airbnb.mvrx.Fail import com.airbnb.mvrx.Incomplete import com.airbnb.mvrx.Success -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.loadingItem -import im.vector.riotx.core.error.ErrorFormatter -import im.vector.riotx.core.extensions.toReducedUrl -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.login.LoginMode -import im.vector.riotx.features.signout.soft.epoxy.loginCenterButtonItem -import im.vector.riotx.features.signout.soft.epoxy.loginErrorWithRetryItem -import im.vector.riotx.features.signout.soft.epoxy.loginPasswordFormItem -import im.vector.riotx.features.signout.soft.epoxy.loginRedButtonItem -import im.vector.riotx.features.signout.soft.epoxy.loginTextItem -import im.vector.riotx.features.signout.soft.epoxy.loginTitleItem -import im.vector.riotx.features.signout.soft.epoxy.loginTitleSmallItem +import im.vector.app.R +import im.vector.app.core.epoxy.loadingItem +import im.vector.app.core.error.ErrorFormatter +import im.vector.app.core.extensions.toReducedUrl +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.login.LoginMode +import im.vector.app.features.signout.soft.epoxy.loginCenterButtonItem +import im.vector.app.features.signout.soft.epoxy.loginErrorWithRetryItem +import im.vector.app.features.signout.soft.epoxy.loginPasswordFormItem +import im.vector.app.features.signout.soft.epoxy.loginRedButtonItem +import im.vector.app.features.signout.soft.epoxy.loginTextItem +import im.vector.app.features.signout.soft.epoxy.loginTitleItem +import im.vector.app.features.signout.soft.epoxy.loginTitleSmallItem import javax.inject.Inject class SoftLogoutController @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutFragment.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutFragment.kt rename to vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt index fadcaa8055..64b71356ec 100644 --- a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutFragment.kt +++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.signout.soft +package im.vector.app.features.signout.soft import android.content.DialogInterface import android.os.Bundle @@ -22,15 +22,15 @@ import android.view.View import androidx.appcompat.app.AlertDialog import com.airbnb.mvrx.activityViewModel import com.airbnb.mvrx.withState -import im.vector.riotx.R -import im.vector.riotx.core.dialogs.withColoredButton -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.extensions.hideKeyboard -import im.vector.riotx.features.login.AbstractLoginFragment -import im.vector.riotx.features.login.LoginAction -import im.vector.riotx.features.login.LoginMode -import im.vector.riotx.features.login.LoginViewEvents +import im.vector.app.R +import im.vector.app.core.dialogs.withColoredButton +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.extensions.hideKeyboard +import im.vector.app.features.login.AbstractLoginFragment +import im.vector.app.features.login.LoginAction +import im.vector.app.features.login.LoginMode +import im.vector.app.features.login.LoginViewEvents import kotlinx.android.synthetic.main.fragment_generic_recycler.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutViewEvents.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewEvents.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutViewEvents.kt rename to vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewEvents.kt index 314d6b0747..df4d556a48 100644 --- a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewEvents.kt @@ -15,9 +15,9 @@ * */ -package im.vector.riotx.features.signout.soft +package im.vector.app.features.signout.soft -import im.vector.riotx.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewEvents /** * Transient events for SoftLogout diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutViewModel.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutViewModel.kt rename to vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt index b1d5cb85c1..78fc935dc3 100644 --- a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.signout.soft +package im.vector.app.features.signout.soft import com.airbnb.mvrx.ActivityViewModelContext import com.airbnb.mvrx.Fail @@ -31,10 +31,10 @@ import im.vector.matrix.android.api.auth.data.LoginFlowResult import im.vector.matrix.android.api.auth.data.LoginFlowTypes import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.util.Cancelable -import im.vector.riotx.core.di.ActiveSessionHolder -import im.vector.riotx.core.extensions.hasUnsavedKeys -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.features.login.LoginMode +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.extensions.hasUnsavedKeys +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.features.login.LoginMode import timber.log.Timber /** diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutViewState.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewState.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutViewState.kt rename to vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewState.kt index 775558499b..50b576e920 100644 --- a/vector/src/main/java/im/vector/riotx/features/signout/soft/SoftLogoutViewState.kt +++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutViewState.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.features.signout.soft +package im.vector.app.features.signout.soft import com.airbnb.mvrx.Async import com.airbnb.mvrx.Loading import com.airbnb.mvrx.MvRxState import com.airbnb.mvrx.Success import com.airbnb.mvrx.Uninitialized -import im.vector.riotx.features.login.LoginMode +import im.vector.app.features.login.LoginMode data class SoftLogoutViewState( val asyncHomeServerLoginFlowRequest: Async = Uninitialized, diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginCenterButtonItem.kt b/vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginCenterButtonItem.kt similarity index 84% rename from vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginCenterButtonItem.kt rename to vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginCenterButtonItem.kt index d73955787c..a0e409ed02 100644 --- a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginCenterButtonItem.kt +++ b/vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginCenterButtonItem.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotx.features.signout.soft.epoxy +package im.vector.app.features.signout.soft.epoxy import android.widget.Button import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -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.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.extensions.setTextOrHide @EpoxyModelClass(layout = R.layout.item_login_centered_button) abstract class LoginCenterButtonItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginErrorWithRetryItem.kt b/vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginErrorWithRetryItem.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginErrorWithRetryItem.kt rename to vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginErrorWithRetryItem.kt index 593695bbd6..47d4617271 100644 --- a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginErrorWithRetryItem.kt +++ b/vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginErrorWithRetryItem.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotx.features.signout.soft.epoxy +package im.vector.app.features.signout.soft.epoxy import android.widget.Button import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel @EpoxyModelClass(layout = R.layout.item_login_error_retry) abstract class LoginErrorWithRetryItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginPasswordFormItem.kt b/vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginPasswordFormItem.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginPasswordFormItem.kt rename to vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginPasswordFormItem.kt index 17eee6b378..32f296385f 100644 --- a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginPasswordFormItem.kt +++ b/vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginPasswordFormItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.signout.soft.epoxy +package im.vector.app.features.signout.soft.epoxy import android.os.Build import android.text.Editable @@ -25,12 +25,12 @@ 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.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel -import im.vector.riotx.core.extensions.showPassword -import im.vector.riotx.core.platform.SimpleTextWatcher -import im.vector.riotx.core.resources.StringProvider +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.extensions.showPassword +import im.vector.app.core.platform.SimpleTextWatcher +import im.vector.app.core.resources.StringProvider @EpoxyModelClass(layout = R.layout.item_login_password_form) abstract class LoginPasswordFormItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginRedButtonItem.kt b/vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginRedButtonItem.kt similarity index 84% rename from vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginRedButtonItem.kt rename to vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginRedButtonItem.kt index 142d6efea1..7a9f6eea6e 100644 --- a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginRedButtonItem.kt +++ b/vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginRedButtonItem.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotx.features.signout.soft.epoxy +package im.vector.app.features.signout.soft.epoxy import android.widget.Button import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -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.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.extensions.setTextOrHide @EpoxyModelClass(layout = R.layout.item_login_red_button) abstract class LoginRedButtonItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginTextItem.kt b/vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginTextItem.kt similarity index 82% rename from vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginTextItem.kt rename to vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginTextItem.kt index 28aa70922b..f2727379ab 100644 --- a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginTextItem.kt +++ b/vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginTextItem.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotx.features.signout.soft.epoxy +package im.vector.app.features.signout.soft.epoxy import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -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.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.extensions.setTextOrHide @EpoxyModelClass(layout = R.layout.item_login_text) abstract class LoginTextItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginTitleItem.kt b/vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginTitleItem.kt similarity index 82% rename from vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginTitleItem.kt rename to vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginTitleItem.kt index 8b30be6a56..dcb565b490 100644 --- a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginTitleItem.kt +++ b/vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginTitleItem.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotx.features.signout.soft.epoxy +package im.vector.app.features.signout.soft.epoxy import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -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.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.extensions.setTextOrHide @EpoxyModelClass(layout = R.layout.item_login_title) abstract class LoginTitleItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginTitleSmallItem.kt b/vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginTitleSmallItem.kt similarity index 82% rename from vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginTitleSmallItem.kt rename to vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginTitleSmallItem.kt index 572eb09ee8..04f5ca0a78 100644 --- a/vector/src/main/java/im/vector/riotx/features/signout/soft/epoxy/LoginTitleSmallItem.kt +++ b/vector/src/main/java/im/vector/app/features/signout/soft/epoxy/LoginTitleSmallItem.kt @@ -14,15 +14,15 @@ * limitations under the License. */ -package im.vector.riotx.features.signout.soft.epoxy +package im.vector.app.features.signout.soft.epoxy import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -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.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.core.extensions.setTextOrHide @EpoxyModelClass(layout = R.layout.item_login_title_small) abstract class LoginTitleSmallItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/sync/widget/SyncStateView.kt b/vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/sync/widget/SyncStateView.kt rename to vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt index fa392a10ad..f4f10d10c6 100755 --- a/vector/src/main/java/im/vector/riotx/features/sync/widget/SyncStateView.kt +++ b/vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.sync.widget +package im.vector.app.features.sync.widget import android.content.Context import android.util.AttributeSet @@ -22,8 +22,8 @@ import android.view.View import android.widget.FrameLayout import androidx.core.view.isVisible import im.vector.matrix.android.api.session.sync.SyncState -import im.vector.riotx.R -import im.vector.riotx.core.utils.isAirplaneModeOn +import im.vector.app.R +import im.vector.app.core.utils.isAirplaneModeOn import kotlinx.android.synthetic.main.view_sync_state.view.* class SyncStateView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0) diff --git a/vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsAction.kt b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsAction.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsAction.kt rename to vector/src/main/java/im/vector/app/features/terms/ReviewTermsAction.kt index 852a4c3301..d3d14e4d80 100644 --- a/vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsAction.kt +++ b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsAction.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.terms +package im.vector.app.features.terms -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction sealed class ReviewTermsAction : VectorViewModelAction { data class LoadTerms(val preferredLanguageCode: String) : ReviewTermsAction() diff --git a/vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsActivity.kt b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsActivity.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsActivity.kt rename to vector/src/main/java/im/vector/app/features/terms/ReviewTermsActivity.kt index dd7e742bd2..f8076c8786 100644 --- a/vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsActivity.kt +++ b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsActivity.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.terms +package im.vector.app.features.terms import android.app.Activity import android.content.Context @@ -21,12 +21,12 @@ import android.content.Intent import androidx.appcompat.app.AlertDialog import com.airbnb.mvrx.viewModel import im.vector.matrix.android.api.session.terms.TermsService -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.exhaustive -import im.vector.riotx.core.extensions.replaceFragment -import im.vector.riotx.core.platform.SimpleFragmentActivity +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.error.ErrorFormatter +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.extensions.replaceFragment +import im.vector.app.core.platform.SimpleFragmentActivity import javax.inject.Inject class ReviewTermsActivity : SimpleFragmentActivity() { diff --git a/vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsFragment.kt b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsFragment.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsFragment.kt rename to vector/src/main/java/im/vector/app/features/terms/ReviewTermsFragment.kt index 0adfa049fe..fd4651abaf 100644 --- a/vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsFragment.kt +++ b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsFragment.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.terms +package im.vector.app.features.terms import android.os.Bundle import android.view.View @@ -23,14 +23,14 @@ import com.airbnb.mvrx.Success import com.airbnb.mvrx.activityViewModel import com.airbnb.mvrx.withState import im.vector.matrix.android.api.session.terms.TermsService -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.onClick -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.utils.openUrlInChromeCustomTab +import im.vector.app.R +import im.vector.app.core.epoxy.onClick +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.utils.openUrlInChromeCustomTab import kotlinx.android.synthetic.main.fragment_review_terms.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsViewEvents.kt b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewEvents.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsViewEvents.kt rename to vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewEvents.kt index e10966ce92..c65045a8c8 100644 --- a/vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewEvents.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.terms +package im.vector.app.features.terms -import im.vector.riotx.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewEvents sealed class ReviewTermsViewEvents : VectorViewEvents { data class Loading(val message: CharSequence? = null) : ReviewTermsViewEvents() diff --git a/vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsViewModel.kt b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewModel.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsViewModel.kt rename to vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewModel.kt index e19b8e7675..70a7c84567 100644 --- a/vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewModel.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.terms +package im.vector.app.features.terms import androidx.lifecycle.viewModelScope import com.airbnb.mvrx.ActivityViewModelContext @@ -27,8 +27,8 @@ import com.squareup.inject.assisted.AssistedInject import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.terms.GetTermsResponse import im.vector.matrix.android.internal.util.awaitCallback -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorViewModel +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorViewModel import kotlinx.coroutines.launch import timber.log.Timber diff --git a/vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsViewState.kt b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewState.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsViewState.kt rename to vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewState.kt index 9583a8f5de..20b09f0cd7 100644 --- a/vector/src/main/java/im/vector/riotx/features/terms/ReviewTermsViewState.kt +++ b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.terms +package im.vector.app.features.terms import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState diff --git a/vector/src/main/java/im/vector/riotx/features/terms/ServiceTermsArgs.kt b/vector/src/main/java/im/vector/app/features/terms/ServiceTermsArgs.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/terms/ServiceTermsArgs.kt rename to vector/src/main/java/im/vector/app/features/terms/ServiceTermsArgs.kt index 663b1a9050..f1127b5fbd 100644 --- a/vector/src/main/java/im/vector/riotx/features/terms/ServiceTermsArgs.kt +++ b/vector/src/main/java/im/vector/app/features/terms/ServiceTermsArgs.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.terms +package im.vector.app.features.terms import android.os.Parcelable import im.vector.matrix.android.api.session.terms.TermsService diff --git a/vector/src/main/java/im/vector/riotx/features/terms/Term.kt b/vector/src/main/java/im/vector/app/features/terms/Term.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/terms/Term.kt rename to vector/src/main/java/im/vector/app/features/terms/Term.kt index 29fae43c64..e54a7f70aa 100644 --- a/vector/src/main/java/im/vector/riotx/features/terms/Term.kt +++ b/vector/src/main/java/im/vector/app/features/terms/Term.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.terms +package im.vector.app.features.terms data class Term( val url: String, diff --git a/vector/src/main/java/im/vector/riotx/features/terms/TermItem.kt b/vector/src/main/java/im/vector/app/features/terms/TermItem.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/terms/TermItem.kt rename to vector/src/main/java/im/vector/app/features/terms/TermItem.kt index 91be50d2b8..87b54adc14 100644 --- a/vector/src/main/java/im/vector/riotx/features/terms/TermItem.kt +++ b/vector/src/main/java/im/vector/app/features/terms/TermItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.terms +package im.vector.app.features.terms import android.view.View import android.widget.CheckBox @@ -23,8 +23,8 @@ import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelWithHolder -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder @EpoxyModelClass(layout = R.layout.item_tos) abstract class TermItem : EpoxyModelWithHolder() { diff --git a/vector/src/main/java/im/vector/riotx/features/terms/TermsController.kt b/vector/src/main/java/im/vector/app/features/terms/TermsController.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/terms/TermsController.kt rename to vector/src/main/java/im/vector/app/features/terms/TermsController.kt index a5518b5f15..0b0088e05e 100644 --- a/vector/src/main/java/im/vector/riotx/features/terms/TermsController.kt +++ b/vector/src/main/java/im/vector/app/features/terms/TermsController.kt @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.terms +package im.vector.app.features.terms import android.view.View import com.airbnb.epoxy.TypedEpoxyController import com.airbnb.mvrx.Fail import com.airbnb.mvrx.Incomplete import com.airbnb.mvrx.Success -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.features.discovery.settingsSectionTitleItem +import im.vector.app.R +import im.vector.app.core.epoxy.errorWithRetryItem +import im.vector.app.core.epoxy.loadingItem +import im.vector.app.core.error.ErrorFormatter +import im.vector.app.features.discovery.settingsSectionTitleItem import javax.inject.Inject class TermsController @Inject constructor( diff --git a/vector/src/main/java/im/vector/riotx/features/themes/ActivityOtherThemes.kt b/vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/themes/ActivityOtherThemes.kt rename to vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt index b29e60784e..3aba6a4dad 100644 --- a/vector/src/main/java/im/vector/riotx/features/themes/ActivityOtherThemes.kt +++ b/vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.themes +package im.vector.app.features.themes import androidx.annotation.StyleRes -import im.vector.riotx.R +import im.vector.app.R /** * Class to manage Activity other possible themes. diff --git a/vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt b/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt similarity index 99% rename from vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt rename to vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt index 35f7e37f41..38fc328f14 100644 --- a/vector/src/main/java/im/vector/riotx/features/themes/ThemeUtils.kt +++ b/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.themes +package im.vector.app.features.themes import android.app.Activity import android.content.Context @@ -26,7 +26,7 @@ import androidx.annotation.ColorInt import androidx.core.content.ContextCompat import androidx.core.graphics.drawable.DrawableCompat import androidx.preference.PreferenceManager -import im.vector.riotx.R +import im.vector.app.R import timber.log.Timber /** diff --git a/vector/src/main/java/im/vector/riotx/features/ui/SharedPreferencesUiStateRepository.kt b/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/ui/SharedPreferencesUiStateRepository.kt rename to vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt index ec1f8e5131..d550329189 100644 --- a/vector/src/main/java/im/vector/riotx/features/ui/SharedPreferencesUiStateRepository.kt +++ b/vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotx.features.ui +package im.vector.app.features.ui import android.content.SharedPreferences import androidx.core.content.edit -import im.vector.riotx.features.home.RoomListDisplayMode -import im.vector.riotx.features.settings.VectorPreferences +import im.vector.app.features.home.RoomListDisplayMode +import im.vector.app.features.settings.VectorPreferences import javax.inject.Inject /** diff --git a/vector/src/main/java/im/vector/riotx/features/ui/UiStateRepository.kt b/vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/ui/UiStateRepository.kt rename to vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt index c3ecd456e5..3223bf6028 100644 --- a/vector/src/main/java/im/vector/riotx/features/ui/UiStateRepository.kt +++ b/vector/src/main/java/im/vector/app/features/ui/UiStateRepository.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.ui +package im.vector.app.features.ui -import im.vector.riotx.features.home.RoomListDisplayMode +import im.vector.app.features.home.RoomListDisplayMode /** * This interface is used to persist UI state across application restart diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/DirectoryUsersController.kt b/vector/src/main/java/im/vector/app/features/userdirectory/DirectoryUsersController.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/userdirectory/DirectoryUsersController.kt rename to vector/src/main/java/im/vector/app/features/userdirectory/DirectoryUsersController.kt index d5fc34728a..70b8bca328 100644 --- a/vector/src/main/java/im/vector/riotx/features/userdirectory/DirectoryUsersController.kt +++ b/vector/src/main/java/im/vector/app/features/userdirectory/DirectoryUsersController.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.userdirectory +package im.vector.app.features.userdirectory import com.airbnb.epoxy.EpoxyController import com.airbnb.mvrx.Fail @@ -25,13 +25,13 @@ import im.vector.matrix.android.api.MatrixPatterns import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.user.model.User import im.vector.matrix.android.api.util.toMatrixItem -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 im.vector.app.R +import im.vector.app.core.epoxy.errorWithRetryItem +import im.vector.app.core.epoxy.loadingItem +import im.vector.app.core.epoxy.noResultItem +import im.vector.app.core.error.ErrorFormatter +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.home.AvatarRenderer import javax.inject.Inject class DirectoryUsersController @Inject constructor(private val session: Session, diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/KnownUsersController.kt b/vector/src/main/java/im/vector/app/features/userdirectory/KnownUsersController.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/userdirectory/KnownUsersController.kt rename to vector/src/main/java/im/vector/app/features/userdirectory/KnownUsersController.kt index c78368f01b..e30ac64244 100644 --- a/vector/src/main/java/im/vector/riotx/features/userdirectory/KnownUsersController.kt +++ b/vector/src/main/java/im/vector/app/features/userdirectory/KnownUsersController.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.userdirectory +package im.vector.app.features.userdirectory import com.airbnb.epoxy.EpoxyModel import com.airbnb.epoxy.paging.PagedListEpoxyController @@ -24,13 +24,13 @@ import com.airbnb.mvrx.Uninitialized import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.user.model.User import im.vector.matrix.android.api.util.toMatrixItem -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.EmptyItem_ -import im.vector.riotx.core.epoxy.loadingItem -import im.vector.riotx.core.epoxy.noResultItem -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.core.utils.createUIHandler -import im.vector.riotx.features.home.AvatarRenderer +import im.vector.app.R +import im.vector.app.core.epoxy.EmptyItem_ +import im.vector.app.core.epoxy.loadingItem +import im.vector.app.core.epoxy.noResultItem +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.utils.createUIHandler +import im.vector.app.features.home.AvatarRenderer import javax.inject.Inject class KnownUsersController @Inject constructor(private val session: Session, diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/KnownUsersFragment.kt b/vector/src/main/java/im/vector/app/features/userdirectory/KnownUsersFragment.kt similarity index 93% rename from vector/src/main/java/im/vector/riotx/features/userdirectory/KnownUsersFragment.kt rename to vector/src/main/java/im/vector/app/features/userdirectory/KnownUsersFragment.kt index e4f08758b2..7053138641 100644 --- a/vector/src/main/java/im/vector/riotx/features/userdirectory/KnownUsersFragment.kt +++ b/vector/src/main/java/im/vector/app/features/userdirectory/KnownUsersFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.userdirectory +package im.vector.app.features.userdirectory import android.os.Bundle import android.view.Menu @@ -30,14 +30,14 @@ import com.airbnb.mvrx.withState import com.google.android.material.chip.Chip import com.jakewharton.rxbinding3.widget.textChanges import im.vector.matrix.android.api.session.user.model.User -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.extensions.hideKeyboard -import im.vector.riotx.core.extensions.setupAsSearch -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.utils.DimensionConverter -import im.vector.riotx.features.homeserver.HomeServerCapabilitiesViewModel +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.extensions.hideKeyboard +import im.vector.app.core.extensions.setupAsSearch +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.utils.DimensionConverter +import im.vector.app.features.homeserver.HomeServerCapabilitiesViewModel import kotlinx.android.synthetic.main.fragment_known_users.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/KnownUsersFragmentArgs.kt b/vector/src/main/java/im/vector/app/features/userdirectory/KnownUsersFragmentArgs.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/userdirectory/KnownUsersFragmentArgs.kt rename to vector/src/main/java/im/vector/app/features/userdirectory/KnownUsersFragmentArgs.kt index 9e87633608..65fd6681bf 100644 --- a/vector/src/main/java/im/vector/riotx/features/userdirectory/KnownUsersFragmentArgs.kt +++ b/vector/src/main/java/im/vector/app/features/userdirectory/KnownUsersFragmentArgs.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.userdirectory +package im.vector.app.features.userdirectory import android.os.Parcelable import kotlinx.android.parcel.Parcelize diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/PendingInvitee.kt b/vector/src/main/java/im/vector/app/features/userdirectory/PendingInvitee.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/userdirectory/PendingInvitee.kt rename to vector/src/main/java/im/vector/app/features/userdirectory/PendingInvitee.kt index c9aad1cf65..78bda37c1f 100644 --- a/vector/src/main/java/im/vector/riotx/features/userdirectory/PendingInvitee.kt +++ b/vector/src/main/java/im/vector/app/features/userdirectory/PendingInvitee.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.userdirectory +package im.vector.app.features.userdirectory import im.vector.matrix.android.api.session.identity.ThreePid import im.vector.matrix.android.api.session.user.model.User diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryAction.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryAction.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryAction.kt rename to vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryAction.kt index fde71cff5c..f4f3fb8cd4 100644 --- a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryAction.kt +++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryAction.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.userdirectory +package im.vector.app.features.userdirectory -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction sealed class UserDirectoryAction : VectorViewModelAction { data class FilterKnownUsers(val value: String) : UserDirectoryAction() diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryFragment.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryFragment.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryFragment.kt rename to vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryFragment.kt index a6d22dfbe3..617cd7d575 100644 --- a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryFragment.kt +++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.userdirectory +package im.vector.app.features.userdirectory import android.os.Bundle import android.view.View @@ -22,13 +22,13 @@ import com.airbnb.mvrx.activityViewModel import com.airbnb.mvrx.withState import com.jakewharton.rxbinding3.widget.textChanges import im.vector.matrix.android.api.session.user.model.User -import im.vector.riotx.R -import im.vector.riotx.core.extensions.cleanup -import im.vector.riotx.core.extensions.configureWith -import im.vector.riotx.core.extensions.hideKeyboard -import im.vector.riotx.core.extensions.setupAsSearch -import im.vector.riotx.core.extensions.showKeyboard -import im.vector.riotx.core.platform.VectorBaseFragment +import im.vector.app.R +import im.vector.app.core.extensions.cleanup +import im.vector.app.core.extensions.configureWith +import im.vector.app.core.extensions.hideKeyboard +import im.vector.app.core.extensions.setupAsSearch +import im.vector.app.core.extensions.showKeyboard +import im.vector.app.core.platform.VectorBaseFragment import kotlinx.android.synthetic.main.fragment_create_direct_room_directory_users.recyclerView import kotlinx.android.synthetic.main.fragment_user_directory.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryLetterHeaderItem.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryLetterHeaderItem.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryLetterHeaderItem.kt rename to vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryLetterHeaderItem.kt index 5fa490b0d7..63f68a1f8b 100644 --- a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryLetterHeaderItem.kt +++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryLetterHeaderItem.kt @@ -14,14 +14,14 @@ * limitations under the License. */ -package im.vector.riotx.features.userdirectory +package im.vector.app.features.userdirectory import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.riotx.R -import im.vector.riotx.core.epoxy.VectorEpoxyHolder -import im.vector.riotx.core.epoxy.VectorEpoxyModel +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel @EpoxyModelClass(layout = R.layout.item_user_directory_letter_header) abstract class UserDirectoryLetterHeaderItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectorySharedAction.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectorySharedAction.kt similarity index 90% rename from vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectorySharedAction.kt rename to vector/src/main/java/im/vector/app/features/userdirectory/UserDirectorySharedAction.kt index 14270f31a7..a4ae0d1be2 100644 --- a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectorySharedAction.kt +++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectorySharedAction.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.userdirectory +package im.vector.app.features.userdirectory -import im.vector.riotx.core.platform.VectorSharedAction +import im.vector.app.core.platform.VectorSharedAction sealed class UserDirectorySharedAction : VectorSharedAction { object OpenUsersDirectory : UserDirectorySharedAction() diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectorySharedActionViewModel.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectorySharedActionViewModel.kt similarity index 87% rename from vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectorySharedActionViewModel.kt rename to vector/src/main/java/im/vector/app/features/userdirectory/UserDirectorySharedActionViewModel.kt index e7081ea969..b63682e57a 100644 --- a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectorySharedActionViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectorySharedActionViewModel.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.userdirectory +package im.vector.app.features.userdirectory -import im.vector.riotx.core.platform.VectorSharedActionViewModel +import im.vector.app.core.platform.VectorSharedActionViewModel import javax.inject.Inject class UserDirectorySharedActionViewModel @Inject constructor() : VectorSharedActionViewModel() diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryUserItem.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryUserItem.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryUserItem.kt rename to vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryUserItem.kt index 86d240eb02..a247cbc4a4 100644 --- a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryUserItem.kt +++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryUserItem.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.userdirectory +package im.vector.app.features.userdirectory import android.view.View import android.widget.ImageView @@ -24,10 +24,10 @@ import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import com.amulyakhare.textdrawable.TextDrawable import im.vector.matrix.android.api.util.MatrixItem -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 +import im.vector.app.R +import im.vector.app.core.epoxy.VectorEpoxyHolder +import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.app.features.home.AvatarRenderer @EpoxyModelClass(layout = R.layout.item_known_user) abstract class UserDirectoryUserItem : VectorEpoxyModel() { diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryViewEvents.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryViewEvents.kt similarity index 87% rename from vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryViewEvents.kt rename to vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryViewEvents.kt index 435fce8b16..bfbdc657ef 100644 --- a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryViewEvents.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.userdirectory +package im.vector.app.features.userdirectory -import im.vector.riotx.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewEvents /** * Transient events for invite users to room screen diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryViewModel.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryViewModel.kt rename to vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryViewModel.kt index 57ebe408c7..0201cdbf0c 100644 --- a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.userdirectory +package im.vector.app.features.userdirectory import androidx.fragment.app.FragmentActivity import arrow.core.Option @@ -28,11 +28,11 @@ import com.squareup.inject.assisted.AssistedInject import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.util.toMatrixItem import im.vector.matrix.rx.rx -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.extensions.toggle -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.features.createdirect.CreateDirectRoomActivity -import im.vector.riotx.features.invite.InviteUsersToRoomActivity +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.extensions.toggle +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.features.createdirect.CreateDirectRoomActivity +import im.vector.app.features.invite.InviteUsersToRoomActivity import io.reactivex.Single import io.reactivex.android.schedulers.AndroidSchedulers import java.util.concurrent.TimeUnit diff --git a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryViewState.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryViewState.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryViewState.kt rename to vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryViewState.kt index 4d99a75fde..d85df5eba6 100644 --- a/vector/src/main/java/im/vector/riotx/features/userdirectory/UserDirectoryViewState.kt +++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryViewState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.userdirectory +package im.vector.app.features.userdirectory import androidx.paging.PagedList import arrow.core.Option diff --git a/vector/src/main/java/im/vector/riotx/features/version/VersionProvider.kt b/vector/src/main/java/im/vector/app/features/version/VersionProvider.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/version/VersionProvider.kt rename to vector/src/main/java/im/vector/app/features/version/VersionProvider.kt index c751c018d0..96a7d917e5 100644 --- a/vector/src/main/java/im/vector/riotx/features/version/VersionProvider.kt +++ b/vector/src/main/java/im/vector/app/features/version/VersionProvider.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.version +package im.vector.app.features.version -import im.vector.riotx.BuildConfig -import im.vector.riotx.core.resources.VersionCodeProvider +import im.vector.app.BuildConfig +import im.vector.app.core.resources.VersionCodeProvider import javax.inject.Inject class VersionProvider @Inject constructor(private val versionCodeProvider: VersionCodeProvider) { diff --git a/vector/src/main/java/im/vector/riotx/features/webview/ConsentWebViewEventListener.kt b/vector/src/main/java/im/vector/app/features/webview/ConsentWebViewEventListener.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/webview/ConsentWebViewEventListener.kt rename to vector/src/main/java/im/vector/app/features/webview/ConsentWebViewEventListener.kt index 4ecd7e30e4..1d75dbc56c 100644 --- a/vector/src/main/java/im/vector/riotx/features/webview/ConsentWebViewEventListener.kt +++ b/vector/src/main/java/im/vector/app/features/webview/ConsentWebViewEventListener.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package im.vector.riotx.features.webview +package im.vector.app.features.webview import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.session.Session -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.core.utils.weak +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.core.utils.weak import timber.log.Timber private const val SUCCESS_URL_SUFFIX = "/_matrix/consent" diff --git a/vector/src/main/java/im/vector/riotx/features/webview/DefaultWebViewEventListener.kt b/vector/src/main/java/im/vector/app/features/webview/DefaultWebViewEventListener.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/webview/DefaultWebViewEventListener.kt rename to vector/src/main/java/im/vector/app/features/webview/DefaultWebViewEventListener.kt index b3e3389d5c..ae5805fc47 100644 --- a/vector/src/main/java/im/vector/riotx/features/webview/DefaultWebViewEventListener.kt +++ b/vector/src/main/java/im/vector/app/features/webview/DefaultWebViewEventListener.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.webview +package im.vector.app.features.webview import timber.log.Timber diff --git a/vector/src/main/java/im/vector/riotx/features/webview/VectorWebViewActivity.kt b/vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/webview/VectorWebViewActivity.kt rename to vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt index d42746ade9..c155b61780 100644 --- a/vector/src/main/java/im/vector/riotx/features/webview/VectorWebViewActivity.kt +++ b/vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.webview +package im.vector.app.features.webview import android.content.Context import android.content.Intent @@ -23,9 +23,9 @@ import android.webkit.WebChromeClient import android.webkit.WebView import androidx.annotation.CallSuper import im.vector.matrix.android.api.session.Session -import im.vector.riotx.R -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.platform.VectorBaseActivity +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.platform.VectorBaseActivity import kotlinx.android.synthetic.main.activity_vector_web_view.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/webview/VectorWebViewClient.kt b/vector/src/main/java/im/vector/app/features/webview/VectorWebViewClient.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/webview/VectorWebViewClient.kt rename to vector/src/main/java/im/vector/app/features/webview/VectorWebViewClient.kt index 3ffbe8c949..47036d6fce 100644 --- a/vector/src/main/java/im/vector/riotx/features/webview/VectorWebViewClient.kt +++ b/vector/src/main/java/im/vector/app/features/webview/VectorWebViewClient.kt @@ -16,7 +16,7 @@ @file:Suppress("DEPRECATION") -package im.vector.riotx.features.webview +package im.vector.app.features.webview import android.annotation.TargetApi import android.graphics.Bitmap diff --git a/vector/src/main/java/im/vector/riotx/features/webview/WebViewEventListener.kt b/vector/src/main/java/im/vector/app/features/webview/WebViewEventListener.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/webview/WebViewEventListener.kt rename to vector/src/main/java/im/vector/app/features/webview/WebViewEventListener.kt index 92d9fedf94..897c913257 100644 --- a/vector/src/main/java/im/vector/riotx/features/webview/WebViewEventListener.kt +++ b/vector/src/main/java/im/vector/app/features/webview/WebViewEventListener.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.webview +package im.vector.app.features.webview interface WebViewEventListener { diff --git a/vector/src/main/java/im/vector/riotx/features/webview/WebViewEventListenerFactory.kt b/vector/src/main/java/im/vector/app/features/webview/WebViewEventListenerFactory.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/webview/WebViewEventListenerFactory.kt rename to vector/src/main/java/im/vector/app/features/webview/WebViewEventListenerFactory.kt index 23e52fe910..32e57cc306 100644 --- a/vector/src/main/java/im/vector/riotx/features/webview/WebViewEventListenerFactory.kt +++ b/vector/src/main/java/im/vector/app/features/webview/WebViewEventListenerFactory.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.webview +package im.vector.app.features.webview import im.vector.matrix.android.api.session.Session -import im.vector.riotx.core.platform.VectorBaseActivity +import im.vector.app.core.platform.VectorBaseActivity interface WebViewEventListenerFactory { diff --git a/vector/src/main/java/im/vector/riotx/features/webview/WebViewMode.kt b/vector/src/main/java/im/vector/app/features/webview/WebViewMode.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/webview/WebViewMode.kt rename to vector/src/main/java/im/vector/app/features/webview/WebViewMode.kt index 1ae6c3ae1d..0768b08f15 100644 --- a/vector/src/main/java/im/vector/riotx/features/webview/WebViewMode.kt +++ b/vector/src/main/java/im/vector/app/features/webview/WebViewMode.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.webview +package im.vector.app.features.webview import im.vector.matrix.android.api.session.Session -import im.vector.riotx.core.platform.VectorBaseActivity +import im.vector.app.core.platform.VectorBaseActivity /** * This enum indicates the WebView mode. It's responsible for creating a WebViewEventListener diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetAPICallback.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetAPICallback.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/widgets/WidgetAPICallback.kt rename to vector/src/main/java/im/vector/app/features/widgets/WidgetAPICallback.kt index 3549ce979c..1dd4d99bdf 100644 --- a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetAPICallback.kt +++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetAPICallback.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package im.vector.riotx.features.widgets +package im.vector.app.features.widgets import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.session.widgets.WidgetPostAPIMediator import im.vector.matrix.android.api.util.JsonDict -import im.vector.riotx.R -import im.vector.riotx.core.resources.StringProvider +import im.vector.app.R +import im.vector.app.core.resources.StringProvider class WidgetAPICallback(private val postAPIMediator: WidgetPostAPIMediator, private val eventData: JsonDict, diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetAction.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetAction.kt similarity index 91% rename from vector/src/main/java/im/vector/riotx/features/widgets/WidgetAction.kt rename to vector/src/main/java/im/vector/app/features/widgets/WidgetAction.kt index 06a27a7084..b72ea68b7f 100644 --- a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetAction.kt +++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetAction.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.widgets +package im.vector.app.features.widgets -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction sealed class WidgetAction : VectorViewModelAction { data class OnWebViewStartedToLoad(val url: String) : WidgetAction() diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetActivity.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt similarity index 89% rename from vector/src/main/java/im/vector/riotx/features/widgets/WidgetActivity.kt rename to vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt index a8153a65d8..10247e5014 100644 --- a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetActivity.kt +++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.widgets +package im.vector.app.features.widgets import android.app.Activity import android.content.Context @@ -24,15 +24,15 @@ import androidx.core.view.isVisible import com.airbnb.mvrx.MvRx import com.airbnb.mvrx.viewModel import im.vector.matrix.android.api.session.events.model.Content -import im.vector.riotx.R -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.extensions.addFragment -import im.vector.riotx.core.platform.ToolbarConfigurable -import im.vector.riotx.core.platform.VectorBaseActivity -import im.vector.riotx.features.widgets.permissions.RoomWidgetPermissionBottomSheet -import im.vector.riotx.features.widgets.permissions.RoomWidgetPermissionViewEvents -import im.vector.riotx.features.widgets.permissions.RoomWidgetPermissionViewModel -import im.vector.riotx.features.widgets.permissions.RoomWidgetPermissionViewState +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.extensions.addFragment +import im.vector.app.core.platform.ToolbarConfigurable +import im.vector.app.core.platform.VectorBaseActivity +import im.vector.app.features.widgets.permissions.RoomWidgetPermissionBottomSheet +import im.vector.app.features.widgets.permissions.RoomWidgetPermissionViewEvents +import im.vector.app.features.widgets.permissions.RoomWidgetPermissionViewModel +import im.vector.app.features.widgets.permissions.RoomWidgetPermissionViewState import kotlinx.android.synthetic.main.activity_widget.* import java.io.Serializable import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetArgsBuilder.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/widgets/WidgetArgsBuilder.kt rename to vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt index 6cbf1f29a1..f5bcb48b13 100644 --- a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetArgsBuilder.kt +++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.widgets +package im.vector.app.features.widgets import im.vector.matrix.android.api.session.widgets.model.Widget -import im.vector.riotx.core.di.ActiveSessionHolder +import im.vector.app.core.di.ActiveSessionHolder import javax.inject.Inject class WidgetArgsBuilder @Inject constructor(private val sessionHolder: ActiveSessionHolder) { diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetFragment.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt similarity index 95% rename from vector/src/main/java/im/vector/riotx/features/widgets/WidgetFragment.kt rename to vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt index b162149ffe..072a20ad84 100644 --- a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetFragment.kt +++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.widgets +package im.vector.app.features.widgets import android.app.Activity import android.content.Intent @@ -36,15 +36,15 @@ import com.airbnb.mvrx.activityViewModel import com.airbnb.mvrx.args import com.airbnb.mvrx.withState import im.vector.matrix.android.api.session.terms.TermsService -import im.vector.riotx.R -import im.vector.riotx.core.platform.OnBackPressed -import im.vector.riotx.core.platform.VectorBaseFragment -import im.vector.riotx.core.utils.openUrlInExternalBrowser -import im.vector.riotx.features.home.room.detail.widget.WidgetRequestCodes -import im.vector.riotx.features.terms.ReviewTermsActivity -import im.vector.riotx.features.webview.WebViewEventListener -import im.vector.riotx.features.widgets.webview.clearAfterWidget -import im.vector.riotx.features.widgets.webview.setupForWidget +import im.vector.app.R +import im.vector.app.core.platform.OnBackPressed +import im.vector.app.core.platform.VectorBaseFragment +import im.vector.app.core.utils.openUrlInExternalBrowser +import im.vector.app.features.home.room.detail.widget.WidgetRequestCodes +import im.vector.app.features.terms.ReviewTermsActivity +import im.vector.app.features.webview.WebViewEventListener +import im.vector.app.features.widgets.webview.clearAfterWidget +import im.vector.app.features.widgets.webview.setupForWidget import kotlinx.android.parcel.Parcelize import kotlinx.android.synthetic.main.fragment_room_widget.* import timber.log.Timber diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetPostAPIHandler.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt similarity index 99% rename from vector/src/main/java/im/vector/riotx/features/widgets/WidgetPostAPIHandler.kt rename to vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt index ce3ad466e2..dbe76b74c5 100644 --- a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetPostAPIHandler.kt +++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.widgets +package im.vector.app.features.widgets import android.text.TextUtils import com.squareup.inject.assisted.Assisted @@ -32,8 +32,8 @@ import im.vector.matrix.android.api.session.room.powerlevels.PowerLevelsHelper import im.vector.matrix.android.api.session.widgets.WidgetPostAPIMediator import im.vector.matrix.android.api.util.JsonDict import im.vector.matrix.android.api.session.accountdata.UserAccountDataTypes -import im.vector.riotx.R -import im.vector.riotx.core.resources.StringProvider +import im.vector.app.R +import im.vector.app.core.resources.StringProvider import timber.log.Timber import java.util.ArrayList import java.util.HashMap diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetViewEvents.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewEvents.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/widgets/WidgetViewEvents.kt rename to vector/src/main/java/im/vector/app/features/widgets/WidgetViewEvents.kt index 5b40e0441d..10adeaa278 100644 --- a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewEvents.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.widgets +package im.vector.app.features.widgets import im.vector.matrix.android.api.session.events.model.Content -import im.vector.riotx.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewEvents sealed class WidgetViewEvents : VectorViewEvents { data class Failure(val throwable: Throwable): WidgetViewEvents() diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetViewModel.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt similarity index 98% rename from vector/src/main/java/im/vector/riotx/features/widgets/WidgetViewModel.kt rename to vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt index 89d597c4dc..ccc9c29f76 100644 --- a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.widgets +package im.vector.app.features.widgets import android.net.Uri import androidx.lifecycle.viewModelScope @@ -40,9 +40,9 @@ import im.vector.matrix.android.internal.util.awaitCallback import im.vector.matrix.rx.mapOptional import im.vector.matrix.rx.rx import im.vector.matrix.rx.unwrap -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.widgets.permissions.WidgetPermissionsHelper +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.widgets.permissions.WidgetPermissionsHelper import kotlinx.coroutines.launch import timber.log.Timber import javax.net.ssl.HttpsURLConnection diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetViewState.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewState.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/widgets/WidgetViewState.kt rename to vector/src/main/java/im/vector/app/features/widgets/WidgetViewState.kt index 2242efc82f..97ec3ba5b7 100644 --- a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetViewState.kt +++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewState.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.widgets +package im.vector.app.features.widgets import androidx.annotation.StringRes import com.airbnb.mvrx.Async @@ -22,7 +22,7 @@ import com.airbnb.mvrx.MvRxState import com.airbnb.mvrx.Uninitialized import im.vector.matrix.android.api.session.widgets.model.Widget import im.vector.matrix.android.api.session.widgets.model.WidgetType -import im.vector.riotx.R +import im.vector.app.R enum class WidgetStatus { UNKNOWN, diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionActions.kt b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionActions.kt similarity index 88% rename from vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionActions.kt rename to vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionActions.kt index 280da5a757..38344b80ae 100644 --- a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionActions.kt +++ b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionActions.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.widgets.permissions +package im.vector.app.features.widgets.permissions -import im.vector.riotx.core.platform.VectorViewModelAction +import im.vector.app.core.platform.VectorViewModelAction sealed class RoomWidgetPermissionActions : VectorViewModelAction { object AllowWidget: RoomWidgetPermissionActions() diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt rename to vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt index f3a9e5fda6..0ad7ef03bb 100644 --- a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt +++ b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.widgets.permissions +package im.vector.app.features.widgets.permissions import android.content.DialogInterface import android.os.Build @@ -25,12 +25,12 @@ import com.airbnb.mvrx.MvRx import com.airbnb.mvrx.activityViewModel import com.airbnb.mvrx.withState import im.vector.matrix.android.api.util.toMatrixItem -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.VectorBaseBottomSheetDialogFragment -import im.vector.riotx.features.home.AvatarRenderer -import im.vector.riotx.features.widgets.WidgetArgs +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.extensions.withArgs +import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment +import im.vector.app.features.home.AvatarRenderer +import im.vector.app.features.widgets.WidgetArgs import kotlinx.android.synthetic.main.bottom_sheet_room_widget_permission.* import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionViewEvents.kt b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewEvents.kt similarity index 87% rename from vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionViewEvents.kt rename to vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewEvents.kt index c3138d082a..b7dc4a14a3 100644 --- a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionViewEvents.kt +++ b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewEvents.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.widgets.permissions +package im.vector.app.features.widgets.permissions -import im.vector.riotx.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewEvents sealed class RoomWidgetPermissionViewEvents : VectorViewEvents { object Close : RoomWidgetPermissionViewEvents() diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionViewModel.kt b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewModel.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionViewModel.kt rename to vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewModel.kt index 8e52a0c7d3..a40b523ad5 100644 --- a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewModel.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.widgets.permissions +package im.vector.app.features.widgets.permissions import androidx.lifecycle.viewModelScope import com.airbnb.mvrx.ActivityViewModelContext @@ -26,8 +26,8 @@ import im.vector.matrix.android.api.extensions.orFalse import im.vector.matrix.android.api.query.QueryStringValue import im.vector.matrix.android.api.session.Session import im.vector.matrix.rx.rx -import im.vector.riotx.R -import im.vector.riotx.core.platform.VectorViewModel +import im.vector.app.R +import im.vector.app.core.platform.VectorViewModel import kotlinx.coroutines.launch import timber.log.Timber import java.net.URL diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionViewState.kt b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewState.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionViewState.kt rename to vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewState.kt index 8daef86324..523c4e5bbc 100644 --- a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionViewState.kt +++ b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewState.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package im.vector.riotx.features.widgets.permissions +package im.vector.app.features.widgets.permissions import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState import com.airbnb.mvrx.Uninitialized import im.vector.matrix.android.api.session.widgets.model.Widget -import im.vector.riotx.features.widgets.WidgetArgs +import im.vector.app.features.widgets.WidgetArgs data class RoomWidgetPermissionViewState( val roomId: String, diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/WidgetPermissionsHelper.kt b/vector/src/main/java/im/vector/app/features/widgets/permissions/WidgetPermissionsHelper.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/widgets/permissions/WidgetPermissionsHelper.kt rename to vector/src/main/java/im/vector/app/features/widgets/permissions/WidgetPermissionsHelper.kt index bcf5f2c541..327a14d69d 100644 --- a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/WidgetPermissionsHelper.kt +++ b/vector/src/main/java/im/vector/app/features/widgets/permissions/WidgetPermissionsHelper.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.widgets.permissions +package im.vector.app.features.widgets.permissions import im.vector.matrix.android.api.query.QueryStringValue import im.vector.matrix.android.api.session.integrationmanager.IntegrationManagerService diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/webview/WebviewPermissionUtils.kt b/vector/src/main/java/im/vector/app/features/widgets/webview/WebviewPermissionUtils.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/widgets/webview/WebviewPermissionUtils.kt rename to vector/src/main/java/im/vector/app/features/widgets/webview/WebviewPermissionUtils.kt index fa0f4e0a97..eaffa147d5 100644 --- a/vector/src/main/java/im/vector/riotx/features/widgets/webview/WebviewPermissionUtils.kt +++ b/vector/src/main/java/im/vector/app/features/widgets/webview/WebviewPermissionUtils.kt @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package im.vector.riotx.features.widgets.webview +package im.vector.app.features.widgets.webview import android.annotation.SuppressLint import android.content.Context import android.webkit.PermissionRequest import androidx.annotation.StringRes import androidx.appcompat.app.AlertDialog -import im.vector.riotx.R +import im.vector.app.R object WebviewPermissionUtils { diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/webview/WidgetWebView.kt b/vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt similarity index 92% rename from vector/src/main/java/im/vector/riotx/features/widgets/webview/WidgetWebView.kt rename to vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt index 8fb1f63e65..7042e14599 100644 --- a/vector/src/main/java/im/vector/riotx/features/widgets/webview/WidgetWebView.kt +++ b/vector/src/main/java/im/vector/app/features/widgets/webview/WidgetWebView.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.widgets.webview +package im.vector.app.features.widgets.webview import android.annotation.SuppressLint import android.os.Build @@ -24,10 +24,10 @@ import android.webkit.PermissionRequest import android.webkit.WebChromeClient import android.webkit.WebSettings import android.webkit.WebView -import im.vector.riotx.R -import im.vector.riotx.features.themes.ThemeUtils -import im.vector.riotx.features.webview.VectorWebViewClient -import im.vector.riotx.features.webview.WebViewEventListener +import im.vector.app.R +import im.vector.app.features.themes.ThemeUtils +import im.vector.app.features.webview.VectorWebViewClient +import im.vector.app.features.webview.WebViewEventListener @SuppressLint("NewApi") fun WebView.setupForWidget(webViewEventListener: WebViewEventListener) { diff --git a/vector/src/main/java/im/vector/riotx/features/workers/signout/ServerBackupStatusViewModel.kt b/vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt similarity index 97% rename from vector/src/main/java/im/vector/riotx/features/workers/signout/ServerBackupStatusViewModel.kt rename to vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt index 35dff87ecb..9692557f24 100644 --- a/vector/src/main/java/im/vector/riotx/features/workers/signout/ServerBackupStatusViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.workers.signout +package im.vector.app.features.workers.signout import androidx.lifecycle.MutableLiveData import com.airbnb.mvrx.ActivityViewModelContext @@ -38,9 +38,9 @@ import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupStateLis import im.vector.matrix.android.api.util.Optional import im.vector.matrix.android.internal.crypto.store.PrivateKeysInfo import im.vector.matrix.rx.rx -import im.vector.riotx.core.platform.EmptyAction -import im.vector.riotx.core.platform.EmptyViewEvents -import im.vector.riotx.core.platform.VectorViewModel +import im.vector.app.core.platform.EmptyAction +import im.vector.app.core.platform.EmptyViewEvents +import im.vector.app.core.platform.VectorViewModel import io.reactivex.Observable import io.reactivex.functions.Function4 import io.reactivex.subjects.PublishSubject diff --git a/vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutBottomSheetDialogFragment.kt b/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt similarity index 96% rename from vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutBottomSheetDialogFragment.kt rename to vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt index 2ebf086796..207af17bec 100644 --- a/vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutBottomSheetDialogFragment.kt +++ b/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.workers.signout +package im.vector.app.features.workers.signout import android.app.Activity import android.app.Dialog @@ -37,13 +37,13 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialog import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState -import im.vector.riotx.R -import im.vector.riotx.core.di.ScreenComponent -import im.vector.riotx.core.dialogs.ExportKeysDialog -import im.vector.riotx.core.extensions.queryExportKeys -import im.vector.riotx.core.platform.VectorBaseBottomSheetDialogFragment -import im.vector.riotx.features.crypto.keysbackup.setup.KeysBackupSetupActivity -import im.vector.riotx.features.crypto.recover.BootstrapBottomSheet +import im.vector.app.R +import im.vector.app.core.di.ScreenComponent +import im.vector.app.core.dialogs.ExportKeysDialog +import im.vector.app.core.extensions.queryExportKeys +import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment +import im.vector.app.features.crypto.keysbackup.setup.KeysBackupSetupActivity +import im.vector.app.features.crypto.recover.BootstrapBottomSheet import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutUiWorker.kt b/vector/src/main/java/im/vector/app/features/workers/signout/SignOutUiWorker.kt similarity index 86% rename from vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutUiWorker.kt rename to vector/src/main/java/im/vector/app/features/workers/signout/SignOutUiWorker.kt index e06a47d3d4..d78b652113 100644 --- a/vector/src/main/java/im/vector/riotx/features/workers/signout/SignOutUiWorker.kt +++ b/vector/src/main/java/im/vector/app/features/workers/signout/SignOutUiWorker.kt @@ -14,17 +14,17 @@ * limitations under the License. */ -package im.vector.riotx.features.workers.signout +package im.vector.app.features.workers.signout import android.content.Context import androidx.appcompat.app.AlertDialog import androidx.fragment.app.FragmentActivity -import im.vector.riotx.R -import im.vector.riotx.core.di.ActiveSessionHolder -import im.vector.riotx.core.extensions.cannotLogoutSafely -import im.vector.riotx.core.extensions.vectorComponent -import im.vector.riotx.features.MainActivity -import im.vector.riotx.features.MainActivityArgs +import im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.extensions.cannotLogoutSafely +import im.vector.app.core.extensions.vectorComponent +import im.vector.app.features.MainActivity +import im.vector.app.features.MainActivityArgs class SignOutUiWorker(private val activity: FragmentActivity) { diff --git a/vector/src/main/java/im/vector/riotx/features/workers/signout/SignoutBottomSheetActionButton.kt b/vector/src/main/java/im/vector/app/features/workers/signout/SignoutBottomSheetActionButton.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/workers/signout/SignoutBottomSheetActionButton.kt rename to vector/src/main/java/im/vector/app/features/workers/signout/SignoutBottomSheetActionButton.kt index cd5e4ed9da..02ea2569e8 100644 --- a/vector/src/main/java/im/vector/riotx/features/workers/signout/SignoutBottomSheetActionButton.kt +++ b/vector/src/main/java/im/vector/app/features/workers/signout/SignoutBottomSheetActionButton.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.workers.signout +package im.vector.app.features.workers.signout import android.content.Context import android.content.res.ColorStateList @@ -27,9 +27,9 @@ import android.widget.TextView import androidx.core.view.isVisible import butterknife.BindView import butterknife.ButterKnife -import im.vector.riotx.R -import im.vector.riotx.core.extensions.setTextOrHide -import im.vector.riotx.features.themes.ThemeUtils +import im.vector.app.R +import im.vector.app.core.extensions.setTextOrHide +import im.vector.app.features.themes.ThemeUtils class SignoutBottomSheetActionButton @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 diff --git a/vector/src/main/java/im/vector/riotx/features/workers/signout/SignoutCheckViewModel.kt b/vector/src/main/java/im/vector/app/features/workers/signout/SignoutCheckViewModel.kt similarity index 94% rename from vector/src/main/java/im/vector/riotx/features/workers/signout/SignoutCheckViewModel.kt rename to vector/src/main/java/im/vector/app/features/workers/signout/SignoutCheckViewModel.kt index 47da7d4edc..7174652b9b 100644 --- a/vector/src/main/java/im/vector/riotx/features/workers/signout/SignoutCheckViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/workers/signout/SignoutCheckViewModel.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.workers.signout +package im.vector.app.features.workers.signout import android.net.Uri import com.airbnb.mvrx.ActivityViewModelContext @@ -35,11 +35,11 @@ import im.vector.matrix.android.api.session.crypto.crosssigning.USER_SIGNING_KEY import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupStateListener import im.vector.matrix.rx.rx -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorViewEvents -import im.vector.riotx.core.platform.VectorViewModel -import im.vector.riotx.core.platform.VectorViewModelAction -import im.vector.riotx.features.crypto.keys.KeysExporter +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewModel +import im.vector.app.core.platform.VectorViewModelAction +import im.vector.app.features.crypto.keys.KeysExporter data class SignoutCheckViewState( val userId: String = "", diff --git a/vector/src/main/res/layout/activity_call.xml b/vector/src/main/res/layout/activity_call.xml index 39d0bef790..d9d476cb9e 100644 --- a/vector/src/main/res/layout/activity_call.xml +++ b/vector/src/main/res/layout/activity_call.xml @@ -102,7 +102,7 @@ tools:visibility="invisible" /> - + tools:context="im.vector.app.features.reactions.EmojiReactionPickerActivity"> + tools:context="im.vector.app.features.webview.VectorWebViewActivity"> - - - - - - - - - - - - - - - - - - - - + - @@ -10,4 +10,4 @@ android:layout_height="match_parent" android:overScrollMode="always" /> - + diff --git a/vector/src/main/res/layout/fragment_group_list.xml b/vector/src/main/res/layout/fragment_group_list.xml index 481c02a323..cdf0ffeb9a 100644 --- a/vector/src/main/res/layout/fragment_group_list.xml +++ b/vector/src/main/res/layout/fragment_group_list.xml @@ -1,5 +1,5 @@ - - + diff --git a/vector/src/main/res/layout/fragment_home_detail.xml b/vector/src/main/res/layout/fragment_home_detail.xml index 75843a2ec6..83bb9994f8 100644 --- a/vector/src/main/res/layout/fragment_home_detail.xml +++ b/vector/src/main/res/layout/fragment_home_detail.xml @@ -45,7 +45,7 @@ - - - - - - + - - + - - - - - - - - - - - + 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 ee8f87fc02..dce0b27358 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 c605a2fe90..4a16ed6dec 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" /> - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/vector/src/main/res/xml/vector_settings_advanced_settings.xml b/vector/src/main/res/xml/vector_settings_advanced_settings.xml index e92aae3ff9..c3aa3de0a8 100644 --- a/vector/src/main/res/xml/vector_settings_advanced_settings.xml +++ b/vector/src/main/res/xml/vector_settings_advanced_settings.xml @@ -2,41 +2,41 @@ - + - - - - - + - - @@ -50,35 +50,35 @@ android:title="@string/settings_rageshake_detection_threshold" app:min="11" /> - + - + - - - + - - - - + \ No newline at end of file diff --git a/vector/src/main/res/xml/vector_settings_flair.xml b/vector/src/main/res/xml/vector_settings_flair.xml index 9d074cbcf7..ac7ae83d24 100644 --- a/vector/src/main/res/xml/vector_settings_flair.xml +++ b/vector/src/main/res/xml/vector_settings_flair.xml @@ -1,7 +1,7 @@ - diff --git a/vector/src/main/res/xml/vector_settings_general.xml b/vector/src/main/res/xml/vector_settings_general.xml index 1278dd933f..d094c203fa 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 2720a19533..b36fba05c2 100644 --- a/vector/src/main/res/xml/vector_settings_help_about.xml +++ b/vector/src/main/res/xml/vector_settings_help_about.xml @@ -3,43 +3,43 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"> - - - - - - - - - diff --git a/vector/src/main/res/xml/vector_settings_labs.xml b/vector/src/main/res/xml/vector_settings_labs.xml index 2c52b2198e..f5bf4c4a79 100644 --- a/vector/src/main/res/xml/vector_settings_labs.xml +++ b/vector/src/main/res/xml/vector_settings_labs.xml @@ -5,7 +5,7 @@ - @@ -34,19 +34,19 @@ - - - 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 6e0fb71671..4e9a9b07bf 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,67 +1,67 @@ - - - - - - - - - - - - - + diff --git a/vector/src/main/res/xml/vector_settings_notifications.xml b/vector/src/main/res/xml/vector_settings_notifications.xml index 5ecf693b44..88ea78d3a9 100644 --- a/vector/src/main/res/xml/vector_settings_notifications.xml +++ b/vector/src/main/res/xml/vector_settings_notifications.xml @@ -2,14 +2,14 @@ - + - - - - + - - - - - - + - + - - + - - - - + - - - + - - - - + - - - - - + - - - + - + - - - + \ 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 787935b884..1d60b0f39d 100644 --- a/vector/src/main/res/xml/vector_settings_voice_video.xml +++ b/vector/src/main/res/xml/vector_settings_voice_video.xml @@ -1,21 +1,19 @@ - + - + - - - + \ No newline at end of file diff --git a/vector/src/sharedTest/java/im/vector/riotx/test/shared/TestRules.kt b/vector/src/sharedTest/java/im/vector/app/test/shared/TestRules.kt similarity index 96% rename from vector/src/sharedTest/java/im/vector/riotx/test/shared/TestRules.kt rename to vector/src/sharedTest/java/im/vector/app/test/shared/TestRules.kt index d5790ba497..73ac4ffcd2 100644 --- a/vector/src/sharedTest/java/im/vector/riotx/test/shared/TestRules.kt +++ b/vector/src/sharedTest/java/im/vector/app/test/shared/TestRules.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.test.shared +package im.vector.app.test.shared import net.lachlanmckee.timberjunit.TimberTestRule diff --git a/vector/src/test/java/im/vector/riotx/features/home/UserColorTest.kt b/vector/src/test/java/im/vector/app/features/home/UserColorTest.kt similarity index 91% rename from vector/src/test/java/im/vector/riotx/features/home/UserColorTest.kt rename to vector/src/test/java/im/vector/app/features/home/UserColorTest.kt index da8dba4137..0ae2d694ba 100644 --- a/vector/src/test/java/im/vector/riotx/features/home/UserColorTest.kt +++ b/vector/src/test/java/im/vector/app/features/home/UserColorTest.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package im.vector.riotx.features.home +package im.vector.app.features.home -import im.vector.riotx.R -import im.vector.riotx.core.utils.getColorFromUserId +import im.vector.app.R +import im.vector.app.core.utils.getColorFromUserId import org.junit.Assert.assertEquals import org.junit.Test diff --git a/vector/src/test/java/im/vector/riotx/features/home/room/detail/composer/rainbow/RainbowGeneratorTest.kt b/vector/src/test/java/im/vector/app/features/home/room/detail/composer/rainbow/RainbowGeneratorTest.kt similarity index 97% rename from vector/src/test/java/im/vector/riotx/features/home/room/detail/composer/rainbow/RainbowGeneratorTest.kt rename to vector/src/test/java/im/vector/app/features/home/room/detail/composer/rainbow/RainbowGeneratorTest.kt index 5a9fdc0ab7..0e46d67860 100644 --- a/vector/src/test/java/im/vector/riotx/features/home/room/detail/composer/rainbow/RainbowGeneratorTest.kt +++ b/vector/src/test/java/im/vector/app/features/home/room/detail/composer/rainbow/RainbowGeneratorTest.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package im.vector.riotx.features.home.room.detail.composer.rainbow +package im.vector.app.features.home.room.detail.composer.rainbow -import im.vector.riotx.test.trimIndentOneLine +import im.vector.app.test.trimIndentOneLine import org.junit.Assert.assertEquals import org.junit.Test diff --git a/vector/src/test/java/im/vector/riotx/test/Extensions.kt b/vector/src/test/java/im/vector/app/test/Extensions.kt similarity index 95% rename from vector/src/test/java/im/vector/riotx/test/Extensions.kt rename to vector/src/test/java/im/vector/app/test/Extensions.kt index 31781ce00e..290268df1c 100644 --- a/vector/src/test/java/im/vector/riotx/test/Extensions.kt +++ b/vector/src/test/java/im/vector/app/test/Extensions.kt @@ -14,6 +14,6 @@ * limitations under the License. */ -package im.vector.riotx.test +package im.vector.app.test fun String.trimIndentOneLine() = trimIndent().replace("\n", "") From 05b849de13dcabb6a90b4ec9b28fe0c5a57ad3e4 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 3 Aug 2020 18:25:16 +0200 Subject: [PATCH 4/6] Rename package `im.vector.riotx` to `im.vector.app` (IDE, other variants) --- .../im/vector/{riotx => app}/FlavorCode.kt | 2 +- .../troubleshoot/TestFirebaseToken.kt | 14 +++++----- .../settings/troubleshoot/TestPlayServices.kt | 8 +++--- .../troubleshoot/TestTokenRegistration.kt | 14 +++++----- .../{riotx => app}/gplay/package-info.kt | 2 +- .../fcm/VectorFirebaseMessagingService.kt | 26 +++++++++---------- .../{riotx => app}/push/fcm/FcmHelper.kt | 10 +++---- ...ificationTroubleshootTestManagerFactory.kt | 18 ++++++------- .../features/debug/DebugMenuActivity.kt | 2 +- .../{riotx => app}/receivers/DebugReceiver.kt | 2 +- 10 files changed, 49 insertions(+), 49 deletions(-) rename vector/src/gplay/java/im/vector/{riotx => app}/FlavorCode.kt (97%) rename vector/src/gplay/java/im/vector/{riotx => app}/gplay/features/settings/troubleshoot/TestFirebaseToken.kt (90%) rename vector/src/gplay/java/im/vector/{riotx => app}/gplay/features/settings/troubleshoot/TestPlayServices.kt (91%) rename vector/src/gplay/java/im/vector/{riotx => app}/gplay/features/settings/troubleshoot/TestTokenRegistration.kt (89%) rename vector/src/gplay/java/im/vector/{riotx => app}/gplay/package-info.kt (95%) rename vector/src/gplay/java/im/vector/{riotx => app}/gplay/push/fcm/VectorFirebaseMessagingService.kt (93%) rename vector/src/gplay/java/im/vector/{riotx => app}/push/fcm/FcmHelper.kt (95%) rename vector/src/gplay/java/im/vector/{riotx => app}/push/fcm/NotificationTroubleshootTestManagerFactory.kt (75%) rename vector/src/release/java/im/vector/{riotx => app}/features/debug/DebugMenuActivity.kt (94%) rename vector/src/release/java/im/vector/{riotx => app}/receivers/DebugReceiver.kt (96%) diff --git a/vector/src/gplay/java/im/vector/riotx/FlavorCode.kt b/vector/src/gplay/java/im/vector/app/FlavorCode.kt similarity index 97% rename from vector/src/gplay/java/im/vector/riotx/FlavorCode.kt rename to vector/src/gplay/java/im/vector/app/FlavorCode.kt index 109e9bc978..040296d755 100644 --- a/vector/src/gplay/java/im/vector/riotx/FlavorCode.kt +++ b/vector/src/gplay/java/im/vector/app/FlavorCode.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx +package im.vector.app import android.content.Context import android.content.Intent diff --git a/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestFirebaseToken.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt similarity index 90% rename from vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestFirebaseToken.kt rename to vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt index 3806893d98..318867af91 100644 --- a/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestFirebaseToken.kt +++ b/vector/src/gplay/java/im/vector/app/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.riotx.gplay.features.settings.troubleshoot +package im.vector.app.gplay.features.settings.troubleshoot import androidx.appcompat.app.AppCompatActivity import com.google.firebase.iid.FirebaseInstanceId -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 im.vector.app.R +import im.vector.app.core.resources.StringProvider +import im.vector.app.core.utils.startAddGoogleAccountIntent +import im.vector.app.features.settings.troubleshoot.NotificationTroubleshootTestManager +import im.vector.app.features.settings.troubleshoot.TroubleshootTest +import im.vector.app.push.fcm.FcmHelper import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestPlayServices.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt similarity index 91% rename from vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestPlayServices.kt rename to vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt index c28a02d350..133fe1cb05 100644 --- a/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestPlayServices.kt +++ b/vector/src/gplay/java/im/vector/app/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.riotx.gplay.features.settings.troubleshoot +package im.vector.app.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.riotx.R -import im.vector.riotx.core.resources.StringProvider -import im.vector.riotx.features.settings.troubleshoot.TroubleshootTest +import im.vector.app.R +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.settings.troubleshoot.TroubleshootTest import timber.log.Timber import javax.inject.Inject diff --git a/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestTokenRegistration.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt similarity index 89% rename from vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestTokenRegistration.kt rename to vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt index 75e888dfb7..f7dd69f37d 100644 --- a/vector/src/gplay/java/im/vector/riotx/gplay/features/settings/troubleshoot/TestTokenRegistration.kt +++ b/vector/src/gplay/java/im/vector/app/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.riotx.gplay.features.settings.troubleshoot +package im.vector.app.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.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 im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.pushers.PushersManager +import im.vector.app.core.resources.StringProvider +import im.vector.app.features.settings.troubleshoot.TroubleshootTest +import im.vector.app.push.fcm.FcmHelper import javax.inject.Inject /** diff --git a/vector/src/gplay/java/im/vector/riotx/gplay/package-info.kt b/vector/src/gplay/java/im/vector/app/gplay/package-info.kt similarity index 95% rename from vector/src/gplay/java/im/vector/riotx/gplay/package-info.kt rename to vector/src/gplay/java/im/vector/app/gplay/package-info.kt index 02e0382503..a37d300d52 100644 --- a/vector/src/gplay/java/im/vector/riotx/gplay/package-info.kt +++ b/vector/src/gplay/java/im/vector/app/gplay/package-info.kt @@ -17,4 +17,4 @@ /** * Code exclusively used by the GPlay build and not referenced on the main source code */ -package im.vector.riotx.gplay +package im.vector.app.gplay diff --git a/vector/src/gplay/java/im/vector/riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt similarity index 93% rename from vector/src/gplay/java/im/vector/riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt rename to vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt index 9fadbcafb6..677a146b46 100755 --- a/vector/src/gplay/java/im/vector/riotx/gplay/push/fcm/VectorFirebaseMessagingService.kt +++ b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt @@ -17,7 +17,7 @@ * limitations under the License. */ -package im.vector.riotx.gplay.push.fcm +package im.vector.app.gplay.push.fcm import android.os.Handler import android.os.Looper @@ -28,18 +28,18 @@ import com.google.firebase.messaging.RemoteMessage import im.vector.matrix.android.api.pushrules.rest.PushRule import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.events.model.Event -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.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.VectorPreferences -import im.vector.riotx.push.fcm.FcmHelper +import im.vector.app.BuildConfig +import im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.extensions.vectorComponent +import im.vector.app.core.pushers.PushersManager +import im.vector.app.features.badge.BadgeProxy +import im.vector.app.features.notifications.NotifiableEventResolver +import im.vector.app.features.notifications.NotifiableMessageEvent +import im.vector.app.features.notifications.NotificationDrawerManager +import im.vector.app.features.notifications.SimpleNotifiableEvent +import im.vector.app.features.settings.VectorPreferences +import im.vector.app.push.fcm.FcmHelper import timber.log.Timber /** diff --git a/vector/src/gplay/java/im/vector/riotx/push/fcm/FcmHelper.kt b/vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt similarity index 95% rename from vector/src/gplay/java/im/vector/riotx/push/fcm/FcmHelper.kt rename to vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt index b04f9b3703..6c68d6c3b5 100755 --- a/vector/src/gplay/java/im/vector/riotx/push/fcm/FcmHelper.kt +++ b/vector/src/gplay/java/im/vector/app/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.riotx.push.fcm +package im.vector.app.push.fcm import android.app.Activity import android.content.Context @@ -25,10 +25,10 @@ import androidx.core.content.edit import com.google.android.gms.common.ConnectionResult import com.google.android.gms.common.GoogleApiAvailability import com.google.firebase.iid.FirebaseInstanceId -import im.vector.riotx.R -import im.vector.riotx.core.di.ActiveSessionHolder -import im.vector.riotx.core.pushers.PushersManager -import im.vector.riotx.features.settings.VectorPreferences +import im.vector.app.R +import im.vector.app.core.di.ActiveSessionHolder +import im.vector.app.core.pushers.PushersManager +import im.vector.app.features.settings.VectorPreferences import timber.log.Timber /** diff --git a/vector/src/gplay/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt b/vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt similarity index 75% rename from vector/src/gplay/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt rename to vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt index 2830822918..b2dad09483 100644 --- a/vector/src/gplay/java/im/vector/riotx/push/fcm/NotificationTroubleshootTestManagerFactory.kt +++ b/vector/src/gplay/java/im/vector/app/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.riotx.push.fcm +package im.vector.app.push.fcm import androidx.fragment.app.Fragment -import im.vector.riotx.features.settings.troubleshoot.NotificationTroubleshootTestManager -import im.vector.riotx.features.settings.troubleshoot.TestAccountSettings -import im.vector.riotx.features.settings.troubleshoot.TestDeviceSettings -import im.vector.riotx.features.settings.troubleshoot.TestPushRulesSettings -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 im.vector.app.features.settings.troubleshoot.NotificationTroubleshootTestManager +import im.vector.app.features.settings.troubleshoot.TestAccountSettings +import im.vector.app.features.settings.troubleshoot.TestDeviceSettings +import im.vector.app.features.settings.troubleshoot.TestPushRulesSettings +import im.vector.app.features.settings.troubleshoot.TestSystemSettings +import im.vector.app.gplay.features.settings.troubleshoot.TestFirebaseToken +import im.vector.app.gplay.features.settings.troubleshoot.TestPlayServices +import im.vector.app.gplay.features.settings.troubleshoot.TestTokenRegistration import javax.inject.Inject class NotificationTroubleshootTestManagerFactory @Inject constructor(private val testSystemSettings: TestSystemSettings, diff --git a/vector/src/release/java/im/vector/riotx/features/debug/DebugMenuActivity.kt b/vector/src/release/java/im/vector/app/features/debug/DebugMenuActivity.kt similarity index 94% rename from vector/src/release/java/im/vector/riotx/features/debug/DebugMenuActivity.kt rename to vector/src/release/java/im/vector/app/features/debug/DebugMenuActivity.kt index bd97cad9e5..c5db033a18 100644 --- a/vector/src/release/java/im/vector/riotx/features/debug/DebugMenuActivity.kt +++ b/vector/src/release/java/im/vector/app/features/debug/DebugMenuActivity.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package im.vector.riotx.features.debug +package im.vector.app.features.debug import androidx.appcompat.app.AppCompatActivity diff --git a/vector/src/release/java/im/vector/riotx/receivers/DebugReceiver.kt b/vector/src/release/java/im/vector/app/receivers/DebugReceiver.kt similarity index 96% rename from vector/src/release/java/im/vector/riotx/receivers/DebugReceiver.kt rename to vector/src/release/java/im/vector/app/receivers/DebugReceiver.kt index 07baeababc..dfb221fbc5 100644 --- a/vector/src/release/java/im/vector/riotx/receivers/DebugReceiver.kt +++ b/vector/src/release/java/im/vector/app/receivers/DebugReceiver.kt @@ -16,7 +16,7 @@ @file:Suppress("UNUSED_PARAMETER") -package im.vector.riotx.receivers +package im.vector.app.receivers import android.content.BroadcastReceiver import android.content.Context From 8931fd314d5f077ed354a35493b8c4c85fc3cb3e Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 3 Aug 2020 18:31:41 +0200 Subject: [PATCH 5/6] Rename package `im.vector.riotx` to `im.vector.app` (other manual changes) --- .../check/forbidden_strings_in_resources.txt | 4 +- tools/debug_alter_scalar_token.sh | 2 +- tools/debug_dump_filesystem.sh | 2 +- tools/debug_dump_prefs.sh | 2 +- .../root/src/app_package/Action.kt.ftl | 2 +- .../root/src/app_package/Activity.kt.ftl | 8 ++-- .../root/src/app_package/Fragment.kt.ftl | 4 +- .../root/src/app_package/ViewEvents.kt.ftl | 2 +- .../root/src/app_package/ViewModel.kt.ftl | 6 +-- tools/tests/app_standby_off.sh | 4 +- tools/tests/app_standby_on.sh | 4 +- tools/workmanager/dumpsys_debug.sh | 2 +- tools/workmanager/dumpsys_release.sh | 2 +- .../app/core/glide/ElementToDecryptOption.kt | 2 +- .../vector/app/core/services/CallService.kt | 16 ++++---- .../features/rageshake/VectorFileLogger.kt | 4 +- .../layout/activity_emoji_reaction_picker.xml | 4 +- .../res/layout/item_timeline_event_base.xml | 2 +- .../layout/item_timeline_event_base_state.xml | 2 +- .../xml/vector_settings_advanced_settings.xml | 8 ++-- .../main/res/xml/vector_settings_general.xml | 6 +-- .../src/main/res/xml/vector_settings_labs.xml | 14 +++---- .../res/xml/vector_settings_notifications.xml | 20 +++++----- .../res/xml/vector_settings_preferences.xml | 2 +- .../src/main/res/xml/vector_settings_root.xml | 38 +++++++------------ .../xml/vector_settings_security_privacy.xml | 10 ++--- 26 files changed, 81 insertions(+), 91 deletions(-) diff --git a/tools/check/forbidden_strings_in_resources.txt b/tools/check/forbidden_strings_in_resources.txt index 17ae015265..0bbe90b31f 100644 --- a/tools/check/forbidden_strings_in_resources.txt +++ b/tools/check/forbidden_strings_in_resources.txt @@ -73,10 +73,10 @@ layout_constraintLeft_ ### Use Preference from androidx library (androidx.preference.PreferenceScreen) diff --git a/tools/templates/RiotXFeature/root/src/app_package/ViewEvents.kt.ftl b/tools/templates/RiotXFeature/root/src/app_package/ViewEvents.kt.ftl index 4d7d2ee450..59b786ddf5 100644 --- a/tools/templates/RiotXFeature/root/src/app_package/ViewEvents.kt.ftl +++ b/tools/templates/RiotXFeature/root/src/app_package/ViewEvents.kt.ftl @@ -1,5 +1,5 @@ package ${escapeKotlinIdentifiers(packageName)} -import im.vector.riotx.core.platform.VectorViewEvents +import im.vector.app.core.platform.VectorViewEvents sealed class ${viewEventsClass} : VectorViewEvents \ No newline at end of file diff --git a/tools/templates/RiotXFeature/root/src/app_package/ViewModel.kt.ftl b/tools/templates/RiotXFeature/root/src/app_package/ViewModel.kt.ftl index 1d2ec0a069..d3c50c961c 100644 --- a/tools/templates/RiotXFeature/root/src/app_package/ViewModel.kt.ftl +++ b/tools/templates/RiotXFeature/root/src/app_package/ViewModel.kt.ftl @@ -6,12 +6,12 @@ import com.airbnb.mvrx.MvRxViewModelFactory import com.airbnb.mvrx.ViewModelContext import com.squareup.inject.assisted.Assisted import com.squareup.inject.assisted.AssistedInject -import im.vector.riotx.core.extensions.exhaustive -import im.vector.riotx.core.platform.VectorViewModel +import im.vector.app.core.extensions.exhaustive +import im.vector.app.core.platform.VectorViewModel <#if createViewEvents> <#else> -import im.vector.riotx.core.platform.EmptyViewEvents +import im.vector.app.core.platform.EmptyViewEvents class ${viewModelClass} @AssistedInject constructor(@Assisted initialState: ${viewStateClass}) diff --git a/tools/tests/app_standby_off.sh b/tools/tests/app_standby_off.sh index f285456bc5..24502cb7fe 100755 --- a/tools/tests/app_standby_off.sh +++ b/tools/tests/app_standby_off.sh @@ -6,5 +6,5 @@ echo "Standby OFF" echo "adb shell dumpsys battery reset" adb shell dumpsys battery reset -echo "adb shell am set-inactive im.vector.riotx false" -adb shell am set-inactive im.vector.riotx false +echo "adb shell am set-inactive im.vector.app false" +adb shell am set-inactive im.vector.app false diff --git a/tools/tests/app_standby_on.sh b/tools/tests/app_standby_on.sh index c4c690b859..390efe064b 100755 --- a/tools/tests/app_standby_on.sh +++ b/tools/tests/app_standby_on.sh @@ -6,5 +6,5 @@ echo "Standby ON" echo "adb shell dumpsys battery unplug" adb shell dumpsys battery unplug -echo "adb shell am set-inactive im.vector.riotx true" -adb shell am set-inactive im.vector.riotx true +echo "adb shell am set-inactive im.vector.app true" +adb shell am set-inactive im.vector.app true diff --git a/tools/workmanager/dumpsys_debug.sh b/tools/workmanager/dumpsys_debug.sh index 42009a27a0..8c4da9909e 100755 --- a/tools/workmanager/dumpsys_debug.sh +++ b/tools/workmanager/dumpsys_debug.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -adb shell dumpsys jobscheduler im.vector.riotx.debug +adb shell dumpsys jobscheduler im.vector.app.debug diff --git a/tools/workmanager/dumpsys_release.sh b/tools/workmanager/dumpsys_release.sh index 5eb7df2bc2..7826e1b3b8 100755 --- a/tools/workmanager/dumpsys_release.sh +++ b/tools/workmanager/dumpsys_release.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -adb shell dumpsys jobscheduler im.vector.riotx +adb shell dumpsys jobscheduler im.vector.app diff --git a/vector/src/main/java/im/vector/app/core/glide/ElementToDecryptOption.kt b/vector/src/main/java/im/vector/app/core/glide/ElementToDecryptOption.kt index c4b39f7f69..7c980c88dc 100644 --- a/vector/src/main/java/im/vector/app/core/glide/ElementToDecryptOption.kt +++ b/vector/src/main/java/im/vector/app/core/glide/ElementToDecryptOption.kt @@ -19,7 +19,7 @@ package im.vector.app.core.glide import com.bumptech.glide.load.Option import im.vector.matrix.android.internal.crypto.attachments.ElementToDecrypt -const val ElementToDecryptOptionKey = "im.vector.riotx.core.glide.ElementToDecrypt" +const val ElementToDecryptOptionKey = "im.vector.app.core.glide.ElementToDecrypt" val ELEMENT_TO_DECRYPT = Option.memory( ElementToDecryptOptionKey, ElementToDecrypt("", "", "")) diff --git a/vector/src/main/java/im/vector/app/core/services/CallService.kt b/vector/src/main/java/im/vector/app/core/services/CallService.kt index 41e35e66df..bb7dccb91e 100644 --- a/vector/src/main/java/im/vector/app/core/services/CallService.kt +++ b/vector/src/main/java/im/vector/app/core/services/CallService.kt @@ -260,14 +260,14 @@ class CallService : VectorService(), WiredHeadsetStateReceiver.HeadsetEventListe companion object { private const val NOTIFICATION_ID = 6480 - private const val ACTION_INCOMING_RINGING_CALL = "im.vector.riotx.core.services.CallService.ACTION_INCOMING_RINGING_CALL" - private const val ACTION_OUTGOING_RINGING_CALL = "im.vector.riotx.core.services.CallService.ACTION_OUTGOING_RINGING_CALL" - private const val ACTION_CALL_CONNECTING = "im.vector.riotx.core.services.CallService.ACTION_CALL_CONNECTING" - private const val ACTION_ONGOING_CALL = "im.vector.riotx.core.services.CallService.ACTION_ONGOING_CALL" - private const val ACTION_ONGOING_CALL_BG = "im.vector.riotx.core.services.CallService.ACTION_ONGOING_CALL_BG" - private const val ACTION_NO_ACTIVE_CALL = "im.vector.riotx.core.services.CallService.NO_ACTIVE_CALL" -// private const val ACTION_ACTIVITY_VISIBLE = "im.vector.riotx.core.services.CallService.ACTION_ACTIVITY_VISIBLE" -// private const val ACTION_STOP_RINGING = "im.vector.riotx.core.services.CallService.ACTION_STOP_RINGING" + private const val ACTION_INCOMING_RINGING_CALL = "im.vector.app.core.services.CallService.ACTION_INCOMING_RINGING_CALL" + private const val ACTION_OUTGOING_RINGING_CALL = "im.vector.app.core.services.CallService.ACTION_OUTGOING_RINGING_CALL" + private const val ACTION_CALL_CONNECTING = "im.vector.app.core.services.CallService.ACTION_CALL_CONNECTING" + private const val ACTION_ONGOING_CALL = "im.vector.app.core.services.CallService.ACTION_ONGOING_CALL" + private const val ACTION_ONGOING_CALL_BG = "im.vector.app.core.services.CallService.ACTION_ONGOING_CALL_BG" + private const val ACTION_NO_ACTIVE_CALL = "im.vector.app.core.services.CallService.NO_ACTIVE_CALL" +// private const val ACTION_ACTIVITY_VISIBLE = "im.vector.app.core.services.CallService.ACTION_ACTIVITY_VISIBLE" +// private const val ACTION_STOP_RINGING = "im.vector.app.core.services.CallService.ACTION_STOP_RINGING" private const val EXTRA_IS_VIDEO = "EXTRA_IS_VIDEO" private const val EXTRA_ROOM_NAME = "EXTRA_ROOM_NAME" diff --git a/vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt b/vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt index 777b6cd1ae..6f38ae0102 100644 --- a/vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt +++ b/vector/src/main/java/im/vector/app/features/rageshake/VectorFileLogger.kt @@ -54,10 +54,10 @@ class VectorFileLogger @Inject constructor(val context: Context, private val vec } } - private val sLogger = Logger.getLogger("im.vector.riotx") + private val sLogger = Logger.getLogger("im.vector.app") private var sFileHandler: FileHandler? = null private var sCacheDirectory: File? = null - private var sFileName = "riotxlogs" + private var sFileName = "elementLogs" private val prioPrefixes = mapOf( Log.VERBOSE to "V/ ", diff --git a/vector/src/main/res/layout/activity_emoji_reaction_picker.xml b/vector/src/main/res/layout/activity_emoji_reaction_picker.xml index a11c7f706f..4139fd7aa1 100644 --- a/vector/src/main/res/layout/activity_emoji_reaction_picker.xml +++ b/vector/src/main/res/layout/activity_emoji_reaction_picker.xml @@ -8,7 +8,7 @@ - diff --git a/vector/src/main/res/layout/item_timeline_event_base_state.xml b/vector/src/main/res/layout/item_timeline_event_base_state.xml index d6bb1f8335..c7a5291338 100644 --- a/vector/src/main/res/layout/item_timeline_event_base_state.xml +++ b/vector/src/main/res/layout/item_timeline_event_base_state.xml @@ -99,7 +99,7 @@ tools:layout_height="40dp"> - diff --git a/vector/src/main/res/xml/vector_settings_advanced_settings.xml b/vector/src/main/res/xml/vector_settings_advanced_settings.xml index c3aa3de0a8..6d8de815d8 100644 --- a/vector/src/main/res/xml/vector_settings_advanced_settings.xml +++ b/vector/src/main/res/xml/vector_settings_advanced_settings.xml @@ -57,12 +57,12 @@ + app:fragment="im.vector.app.features.settings.push.PushGatewaysFragment" /> + app:fragment="im.vector.app.features.settings.push.PushRulesFragment" /> + app:fragment="im.vector.app.features.settings.devtools.AccountDataFragment" /> + app:fragment="im.vector.app.features.settings.devtools.KeyRequestsFragment" /> diff --git a/vector/src/main/res/xml/vector_settings_general.xml b/vector/src/main/res/xml/vector_settings_general.xml index d094c203fa..042ea5c77c 100644 --- a/vector/src/main/res/xml/vector_settings_general.xml +++ b/vector/src/main/res/xml/vector_settings_general.xml @@ -48,7 +48,7 @@ android:persistent="false" android:summary="@string/settings_discovery_manage" android:title="@string/settings_discovery_category" - app:fragment="im.vector.riotx.features.discovery.DiscoverySettingsFragment" /> + app:fragment="im.vector.app.features.discovery.DiscoverySettingsFragment" /> @@ -103,7 +103,7 @@ + app:fragment="im.vector.app.features.settings.account.deactivation.DeactivateAccountFragment" /> diff --git a/vector/src/main/res/xml/vector_settings_labs.xml b/vector/src/main/res/xml/vector_settings_labs.xml index f5bf4c4a79..736a0b90c3 100644 --- a/vector/src/main/res/xml/vector_settings_labs.xml +++ b/vector/src/main/res/xml/vector_settings_labs.xml @@ -1,7 +1,7 @@ - + @@ -10,26 +10,26 @@ android:key="labs_warning" android:summary="@string/room_settings_labs_warning_message" /> - + - + - + - + - + @@ -50,6 +50,6 @@ android:defaultValue="false" android:key="SETTINGS_LABS_UNREAD_NOTIFICATIONS_AS_TAB" android:title="@string/labs_show_unread_notifications_as_tab" /> - + \ No newline at end of file diff --git a/vector/src/main/res/xml/vector_settings_notifications.xml b/vector/src/main/res/xml/vector_settings_notifications.xml index 88ea78d3a9..b1e791e18a 100644 --- a/vector/src/main/res/xml/vector_settings_notifications.xml +++ b/vector/src/main/res/xml/vector_settings_notifications.xml @@ -15,7 +15,7 @@ android:key="SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY" android:title="@string/settings_enable_this_device" /> - + @@ -26,7 +26,7 @@ android:persistent="false" android:summary="@string/settings_notification_advanced_summary_riotx" android:title="@string/settings_notification_advanced" - app:fragment="im.vector.riotx.features.settings.VectorSettingsAdvancedNotificationPreferenceFragment" /> + app:fragment="im.vector.app.features.settings.VectorSettingsAdvancedNotificationPreferenceFragment" /> @@ -67,38 +67,38 @@ + app:fragment="im.vector.app.features.settings.VectorSettingsNotificationsTroubleshootFragment" /> - diff --git a/vector/src/main/res/xml/vector_settings_preferences.xml b/vector/src/main/res/xml/vector_settings_preferences.xml index ec121136bb..668aa9aa2b 100644 --- a/vector/src/main/res/xml/vector_settings_preferences.xml +++ b/vector/src/main/res/xml/vector_settings_preferences.xml @@ -10,7 +10,7 @@ android:key="SETTINGS_INTERFACE_LANGUAGE_PREFERENCE_KEY" android:persistent="false" android:title="@string/settings_interface_language" - app:fragment="im.vector.riotx.features.settings.locale.LocalePickerFragment" /> + app:fragment="im.vector.app.features.settings.locale.LocalePickerFragment" /> + app:fragment="im.vector.app.features.settings.VectorSettingsGeneralFragment" /> - < - < - < - < - < - < - < develop - >>>>>> Rename package `im.vector.riotx` to `im.vector.app` - (IDE) - android:icon="@drawable/ic_settings_root_flair" - android:title="@string/settings_flair" - app:fragment="im.vector.riotx.features.settings.VectorSettingsFlairFragment" - app:isPreferenceVisible="@bool/false_not_implemented" /> + + app:fragment="im.vector.app.features.settings.VectorSettingsNotificationPreferenceFragment" /> + app:fragment="im.vector.app.features.settings.VectorSettingsPreferencesFragment" /> + app:fragment="im.vector.app.features.settings.ignored.VectorSettingsIgnoredUsersFragment" /> + app:fragment="im.vector.app.features.settings.VectorSettingsSecurityPrivacyFragment" /> + app:fragment="im.vector.app.features.settings.VectorSettingsLabsFragment" /> + app:fragment="im.vector.app.features.settings.VectorSettingsAdvancedSettingsFragment" /> + app:fragment="im.vector.app.features.settings.VectorSettingsHelpAboutFragment" /> \ No newline at end of file diff --git a/vector/src/main/res/xml/vector_settings_security_privacy.xml b/vector/src/main/res/xml/vector_settings_security_privacy.xml index 429fc6bcc0..5cc40978b1 100644 --- a/vector/src/main/res/xml/vector_settings_security_privacy.xml +++ b/vector/src/main/res/xml/vector_settings_security_privacy.xml @@ -21,20 +21,20 @@ android:key="SETTINGS_ENCRYPTION_CROSS_SIGNING_PREFERENCE_KEY" android:persistent="false" android:title="@string/encryption_information_cross_signing_state" - app:fragment="im.vector.riotx.features.settings.crosssigning.CrossSigningSettingsFragment" + app:fragment="im.vector.app.features.settings.crosssigning.CrossSigningSettingsFragment" tools:icon="@drawable/ic_shield_trusted" tools:summary="@string/encryption_information_dg_xsigning_complete" /> - + - + - + @@ -54,7 +54,7 @@ + app:fragment="im.vector.app.features.settings.devices.VectorSettingsDevicesFragment" /> From ab4a517ae0c0de590def42933ce5d454cc08d089 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 3 Aug 2020 18:50:04 +0200 Subject: [PATCH 6/6] Cleanup --- vector/src/debug/res/layout/activity_debug_menu.xml | 2 +- vector/src/debug/res/layout/activity_test_linkify.xml | 2 +- vector/src/main/res/layout/activity_emoji_reaction_picker.xml | 2 +- vector/src/main/res/layout/activity_vector_web_view.xml | 2 +- vector/src/main/res/layout/emoji_chooser_fragment.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vector/src/debug/res/layout/activity_debug_menu.xml b/vector/src/debug/res/layout/activity_debug_menu.xml index 18d231ed21..458b44fd05 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.app.features.debug.DebugMenuActivity" + tools:context=".features.debug.DebugMenuActivity" tools:ignore="HardcodedText"> + tools:context=".features.debug.TestLinkifyActivity"> + tools:context=".features.reactions.EmojiReactionPickerActivity"> + tools:context=".features.webview.VectorWebViewActivity">