From d28c091f0a5e8cb2604617034dc6364ec3e54cac Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 3 Aug 2020 17:58:35 +0200 Subject: [PATCH] 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