diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml index 9d3e6fe2..48b93bbc 100644 --- a/vector/src/main/AndroidManifest.xml +++ b/vector/src/main/AndroidManifest.xml @@ -7,7 +7,7 @@ () { - class Holder : RiotEpoxyHolder() +abstract class EmptyItem : VectorEpoxyModel() { + class Holder : VectorEpoxyHolder() } \ No newline at end of file diff --git a/vector/src/main/java/im/vector/riotredesign/core/epoxy/RiotEpoxyHolder.kt b/vector/src/main/java/im/vector/riotredesign/core/epoxy/VectorEpoxyHolder.kt similarity index 79% rename from vector/src/main/java/im/vector/riotredesign/core/epoxy/RiotEpoxyHolder.kt rename to vector/src/main/java/im/vector/riotredesign/core/epoxy/VectorEpoxyHolder.kt index f6983940..f715106a 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/epoxy/RiotEpoxyHolder.kt +++ b/vector/src/main/java/im/vector/riotredesign/core/epoxy/VectorEpoxyHolder.kt @@ -26,15 +26,15 @@ import kotlin.reflect.KProperty * * See [SampleKotlinModelWithHolder] for a usage example. */ -abstract class RiotEpoxyHolder : EpoxyHolder() { +abstract class VectorEpoxyHolder : EpoxyHolder() { private lateinit var view: View override fun bindView(itemView: View) { view = itemView } - protected fun bind(id: Int): ReadOnlyProperty = - Lazy { holder: RiotEpoxyHolder, prop -> + protected fun bind(id: Int): ReadOnlyProperty = + Lazy { holder: VectorEpoxyHolder, prop -> holder.view.findViewById(id) as V? ?: throw IllegalStateException("View ID $id for '${prop.name}' not found.") } @@ -44,13 +44,13 @@ abstract class RiotEpoxyHolder : EpoxyHolder() { * https://github.com/JakeWharton/kotterknife */ private class Lazy( - private val initializer: (RiotEpoxyHolder, KProperty<*>) -> V - ) : ReadOnlyProperty { + private val initializer: (VectorEpoxyHolder, KProperty<*>) -> V + ) : ReadOnlyProperty { private object EMPTY private var value: Any? = EMPTY - override fun getValue(thisRef: RiotEpoxyHolder, property: KProperty<*>): V { + override fun getValue(thisRef: VectorEpoxyHolder, property: KProperty<*>): V { if (value == EMPTY) { value = initializer(thisRef, property) } diff --git a/vector/src/main/java/im/vector/riotredesign/core/epoxy/RiotEpoxyModel.kt b/vector/src/main/java/im/vector/riotredesign/core/epoxy/VectorEpoxyModel.kt similarity index 91% rename from vector/src/main/java/im/vector/riotredesign/core/epoxy/RiotEpoxyModel.kt rename to vector/src/main/java/im/vector/riotredesign/core/epoxy/VectorEpoxyModel.kt index e93fc3cb..bb7bb10c 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/epoxy/RiotEpoxyModel.kt +++ b/vector/src/main/java/im/vector/riotredesign/core/epoxy/VectorEpoxyModel.kt @@ -19,7 +19,7 @@ package im.vector.riotredesign.core.epoxy import com.airbnb.epoxy.EpoxyModelWithHolder import com.airbnb.epoxy.VisibilityState -abstract class RiotEpoxyModel : EpoxyModelWithHolder() { +abstract class VectorEpoxyModel : EpoxyModelWithHolder() { private var onModelVisibilityStateChangedListener: OnVisibilityStateChangedListener? = null @@ -28,7 +28,7 @@ abstract class RiotEpoxyModel : EpoxyModelWithHolder() { super.onVisibilityStateChanged(visibilityState, view) } - fun setOnVisibilityStateChanged(listener: OnVisibilityStateChangedListener): RiotEpoxyModel { + fun setOnVisibilityStateChanged(listener: OnVisibilityStateChangedListener): VectorEpoxyModel { this.onModelVisibilityStateChangedListener = listener return this } diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/RiotActivity.kt b/vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseActivity.kt similarity index 99% rename from vector/src/main/java/im/vector/riotredesign/core/platform/RiotActivity.kt rename to vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseActivity.kt index 9e64e294..414bf396 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/platform/RiotActivity.kt +++ b/vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseActivity.kt @@ -43,7 +43,7 @@ import io.reactivex.disposables.Disposable import timber.log.Timber -abstract class RiotActivity : BaseMvRxActivity() { +abstract class VectorBaseActivity : BaseMvRxActivity() { /* ========================================================================================== * UI * ========================================================================================== */ diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/RiotFragment.kt b/vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseFragment.kt similarity index 95% rename from vector/src/main/java/im/vector/riotredesign/core/platform/RiotFragment.kt rename to vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseFragment.kt index 076d88b2..4db140f8 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/platform/RiotFragment.kt +++ b/vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseFragment.kt @@ -29,13 +29,13 @@ import com.airbnb.mvrx.MvRx import com.bumptech.glide.util.Util.assertMainThread import timber.log.Timber -abstract class RiotFragment : BaseMvRxFragment(), OnBackPressed { +abstract class VectorBaseFragment : BaseMvRxFragment(), OnBackPressed { // Butterknife unbinder private var mUnBinder: Unbinder? = null - val riotActivity: RiotActivity by lazy { - activity as RiotActivity + val vectorBaseActivity: VectorBaseActivity by lazy { + activity as VectorBaseActivity } /* ========================================================================================== diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/VectorPreferenceFragment.kt b/vector/src/main/java/im/vector/riotredesign/core/platform/VectorPreferenceFragment.kt index 385c405b..23c926fe 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/platform/VectorPreferenceFragment.kt +++ b/vector/src/main/java/im/vector/riotredesign/core/platform/VectorPreferenceFragment.kt @@ -24,8 +24,8 @@ import timber.log.Timber abstract class VectorPreferenceFragment : PreferenceFragmentCompat() { - val vectorActivity: RiotActivity by lazy { - activity as RiotActivity + val vectorActivity: VectorBaseActivity by lazy { + activity as VectorBaseActivity } /* ========================================================================================== diff --git a/vector/src/main/java/im/vector/riotredesign/core/platform/RiotViewModel.kt b/vector/src/main/java/im/vector/riotredesign/core/platform/VectorViewModel.kt similarity index 92% rename from vector/src/main/java/im/vector/riotredesign/core/platform/RiotViewModel.kt rename to vector/src/main/java/im/vector/riotredesign/core/platform/VectorViewModel.kt index dc0462fb..0793a931 100644 --- a/vector/src/main/java/im/vector/riotredesign/core/platform/RiotViewModel.kt +++ b/vector/src/main/java/im/vector/riotredesign/core/platform/VectorViewModel.kt @@ -19,5 +19,5 @@ package im.vector.riotredesign.core.platform import com.airbnb.mvrx.BaseMvRxViewModel import com.airbnb.mvrx.MvRxState -abstract class RiotViewModel(initialState: S) +abstract class VectorViewModel(initialState: S) : BaseMvRxViewModel(initialState, debugMode = false) \ No newline at end of file diff --git a/vector/src/main/java/im/vector/riotredesign/features/MainActivity.kt b/vector/src/main/java/im/vector/riotredesign/features/MainActivity.kt index 139fd64c..44614b7c 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/MainActivity.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/MainActivity.kt @@ -18,12 +18,12 @@ package im.vector.riotredesign.features import android.os.Bundle import im.vector.matrix.android.api.Matrix -import im.vector.riotredesign.core.platform.RiotActivity +import im.vector.riotredesign.core.platform.VectorBaseActivity import im.vector.riotredesign.features.home.HomeActivity import im.vector.riotredesign.features.login.LoginActivity -class MainActivity : RiotActivity() { +class MainActivity : VectorBaseActivity() { private val authenticator = Matrix.getInstance().authenticator() diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt index 26443186..de484aa7 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt @@ -33,8 +33,8 @@ import im.vector.riotredesign.core.extensions.hideKeyboard import im.vector.riotredesign.core.extensions.observeEvent import im.vector.riotredesign.core.extensions.replaceFragment import im.vector.riotredesign.core.platform.OnBackPressed -import im.vector.riotredesign.core.platform.RiotActivity import im.vector.riotredesign.core.platform.ToolbarConfigurable +import im.vector.riotredesign.core.platform.VectorBaseActivity import im.vector.riotredesign.features.home.room.detail.LoadingRoomDetailFragment import im.vector.riotredesign.features.rageshake.BugReporter import im.vector.riotredesign.features.rageshake.VectorUncaughtExceptionHandler @@ -46,7 +46,7 @@ import org.koin.android.scope.ext.android.bindScope import org.koin.android.scope.ext.android.getOrCreateScope -class HomeActivity : RiotActivity(), ToolbarConfigurable { +class HomeActivity : VectorBaseActivity(), ToolbarConfigurable { private val homeActivityViewModel: HomeActivityViewModel by viewModel() private val homeNavigator by inject() diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivityViewModel.kt b/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivityViewModel.kt index c1a4fef0..cb883a79 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivityViewModel.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivityViewModel.kt @@ -24,7 +24,7 @@ import com.airbnb.mvrx.ViewModelContext import im.vector.matrix.android.api.Matrix import im.vector.matrix.android.api.session.Session import im.vector.matrix.rx.rx -import im.vector.riotredesign.core.platform.RiotViewModel +import im.vector.riotredesign.core.platform.VectorViewModel import im.vector.riotredesign.core.utils.LiveEvent import im.vector.riotredesign.features.home.room.list.RoomSelectionRepository import io.reactivex.rxkotlin.subscribeBy @@ -35,7 +35,7 @@ class EmptyState : MvRxState class HomeActivityViewModel(state: EmptyState, private val session: Session, roomSelectionRepository: RoomSelectionRepository -) : RiotViewModel(state) { +) : VectorViewModel(state) { companion object : MvRxViewModelFactory { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeDrawerFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/home/HomeDrawerFragment.kt index dafdc990..4458d456 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeDrawerFragment.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/home/HomeDrawerFragment.kt @@ -19,11 +19,11 @@ package im.vector.riotredesign.features.home import android.os.Bundle import im.vector.riotredesign.R import im.vector.riotredesign.core.extensions.replaceChildFragment -import im.vector.riotredesign.core.platform.RiotFragment +import im.vector.riotredesign.core.platform.VectorBaseFragment import im.vector.riotredesign.features.home.group.GroupListFragment import im.vector.riotredesign.features.home.room.list.RoomListFragment -class HomeDrawerFragment : RiotFragment() { +class HomeDrawerFragment : VectorBaseFragment() { companion object { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListFragment.kt index f8290688..5ed550a2 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListFragment.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListFragment.kt @@ -22,15 +22,15 @@ import com.airbnb.mvrx.Success import com.airbnb.mvrx.fragmentViewModel import im.vector.matrix.android.api.session.group.model.GroupSummary import im.vector.riotredesign.R -import im.vector.riotredesign.core.platform.RiotFragment import im.vector.riotredesign.core.platform.StateView +import im.vector.riotredesign.core.platform.VectorBaseFragment import im.vector.riotredesign.features.home.HomeModule import kotlinx.android.synthetic.main.fragment_group_list.* import org.koin.android.ext.android.inject import org.koin.android.scope.ext.android.bindScope import org.koin.android.scope.ext.android.getOrCreateScope -class GroupListFragment : RiotFragment(), GroupSummaryController.Callback { +class GroupListFragment : VectorBaseFragment(), GroupSummaryController.Callback { companion object { fun newInstance(): GroupListFragment { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListViewModel.kt b/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListViewModel.kt index 1ab01369..1cd23802 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListViewModel.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListViewModel.kt @@ -21,13 +21,13 @@ import com.airbnb.mvrx.MvRxViewModelFactory import com.airbnb.mvrx.ViewModelContext import im.vector.matrix.android.api.session.Session import im.vector.matrix.rx.rx -import im.vector.riotredesign.core.platform.RiotViewModel +import im.vector.riotredesign.core.platform.VectorViewModel import org.koin.android.ext.android.get class GroupListViewModel(initialState: GroupListViewState, private val selectedGroupHolder: SelectedGroupStore, private val session: Session -) : RiotViewModel(initialState) { +) : VectorViewModel(initialState) { companion object : MvRxViewModelFactory { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupSummaryItem.kt b/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupSummaryItem.kt index 52717801..3acf7f0a 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupSummaryItem.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupSummaryItem.kt @@ -20,13 +20,13 @@ import android.widget.ImageView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.RiotEpoxyHolder -import im.vector.riotredesign.core.epoxy.RiotEpoxyModel +import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder +import im.vector.riotredesign.core.epoxy.VectorEpoxyModel import im.vector.riotredesign.core.platform.CheckableFrameLayout import im.vector.riotredesign.features.home.AvatarRenderer @EpoxyModelClass(layout = R.layout.item_group) -abstract class GroupSummaryItem : RiotEpoxyModel() { +abstract class GroupSummaryItem : VectorEpoxyModel() { @EpoxyAttribute lateinit var groupName: CharSequence @EpoxyAttribute var avatarUrl: String? = null @@ -40,7 +40,7 @@ abstract class GroupSummaryItem : RiotEpoxyModel() { AvatarRenderer.render(avatarUrl, groupName.toString(), holder.avatarImageView) } - class Holder : RiotEpoxyHolder() { + class Holder : VectorEpoxyHolder() { val avatarImageView by bind(R.id.groupAvatarImageView) val rootView by bind(R.id.itemGroupLayout) } diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/LoadingRoomDetailFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/LoadingRoomDetailFragment.kt index 11e9593c..eefb6566 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/LoadingRoomDetailFragment.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/LoadingRoomDetailFragment.kt @@ -20,10 +20,10 @@ import android.graphics.drawable.AnimationDrawable import android.os.Bundle import android.view.View import im.vector.riotredesign.R -import im.vector.riotredesign.core.platform.RiotFragment +import im.vector.riotredesign.core.platform.VectorBaseFragment import kotlinx.android.synthetic.main.fragment_loading_room_detail.* -class LoadingRoomDetailFragment : RiotFragment() { +class LoadingRoomDetailFragment : VectorBaseFragment() { companion object { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailFragment.kt index a66362ec..98e3164f 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailFragment.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailFragment.kt @@ -26,8 +26,8 @@ import com.airbnb.mvrx.fragmentViewModel import im.vector.matrix.android.api.session.room.timeline.TimelineEvent import im.vector.riotredesign.R import im.vector.riotredesign.core.epoxy.LayoutManagerStateRestorer -import im.vector.riotredesign.core.platform.RiotFragment import im.vector.riotredesign.core.platform.ToolbarConfigurable +import im.vector.riotredesign.core.platform.VectorBaseFragment import im.vector.riotredesign.features.home.AvatarRenderer import im.vector.riotredesign.features.home.HomeModule import im.vector.riotredesign.features.home.HomePermalinkHandler @@ -50,7 +50,7 @@ data class RoomDetailArgs( ) : Parcelable -class RoomDetailFragment : RiotFragment(), TimelineEventController.Callback { +class RoomDetailFragment : VectorBaseFragment(), TimelineEventController.Callback { companion object { @@ -86,7 +86,7 @@ class RoomDetailFragment : RiotFragment(), TimelineEventController.Callback { // PRIVATE METHODS ***************************************************************************** private fun setupToolbar() { - val parentActivity = riotActivity + val parentActivity = vectorBaseActivity if (parentActivity is ToolbarConfigurable) { parentActivity.configure(toolbar) } @@ -153,7 +153,7 @@ class RoomDetailFragment : RiotFragment(), TimelineEventController.Callback { } override fun onMediaClicked(mediaData: MediaContentRenderer.Data, view: View) { - val intent = MediaViewerActivity.newIntent(riotActivity, mediaData) + val intent = MediaViewerActivity.newIntent(vectorBaseActivity, mediaData) startActivity(intent) } diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailViewModel.kt index d38465f4..eeef99c0 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailViewModel.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailViewModel.kt @@ -23,7 +23,7 @@ import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.session.Session import im.vector.matrix.android.api.session.events.model.Event import im.vector.matrix.rx.rx -import im.vector.riotredesign.core.platform.RiotViewModel +import im.vector.riotredesign.core.platform.VectorViewModel import im.vector.riotredesign.features.home.room.VisibleRoomStore import im.vector.riotredesign.features.home.room.detail.timeline.helper.TimelineDisplayableEvents import io.reactivex.rxkotlin.subscribeBy @@ -33,7 +33,7 @@ import java.util.concurrent.TimeUnit class RoomDetailViewModel(initialState: RoomDetailViewState, private val session: Session, private val visibleRoomHolder: VisibleRoomStore -) : RiotViewModel(initialState) { +) : VectorViewModel(initialState) { private val room = session.getRoom(initialState.roomId)!! private val roomId = initialState.roomId diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineEventController.kt b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineEventController.kt index 0c6b28e1..618c15c2 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineEventController.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineEventController.kt @@ -28,7 +28,7 @@ import com.airbnb.epoxy.VisibilityState import im.vector.matrix.android.api.session.room.timeline.Timeline import im.vector.matrix.android.api.session.room.timeline.TimelineEvent import im.vector.riotredesign.core.epoxy.LoadingItemModel_ -import im.vector.riotredesign.core.epoxy.RiotEpoxyModel +import im.vector.riotredesign.core.epoxy.VectorEpoxyModel import im.vector.riotredesign.core.extensions.localDateTime import im.vector.riotredesign.features.home.room.detail.timeline.factory.TimelineItemFactory import im.vector.riotredesign.features.home.room.detail.timeline.helper.* @@ -189,7 +189,7 @@ class TimelineEventController(private val dateFormatter: TimelineDateFormatter, private class TimelineEventVisibilityStateChangedListener(private val callback: TimelineEventController.Callback?, private val event: TimelineEvent) - : RiotEpoxyModel.OnVisibilityStateChangedListener { + : VectorEpoxyModel.OnVisibilityStateChangedListener { override fun onVisibilityStateChanged(visibilityState: Int) { if (visibilityState == VisibilityState.VISIBLE) { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/MessageItemFactory.kt b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/MessageItemFactory.kt index 8d03e42b..4684e280 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/MessageItemFactory.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/MessageItemFactory.kt @@ -26,7 +26,7 @@ import im.vector.matrix.android.api.session.events.model.toModel import im.vector.matrix.android.api.session.room.model.message.* import im.vector.matrix.android.api.session.room.timeline.TimelineEvent import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.RiotEpoxyModel +import im.vector.riotredesign.core.epoxy.VectorEpoxyModel import im.vector.riotredesign.core.extensions.localDateTime import im.vector.riotredesign.core.resources.ColorProvider import im.vector.riotredesign.features.home.room.detail.timeline.TimelineEventController @@ -45,7 +45,7 @@ class MessageItemFactory(private val colorProvider: ColorProvider, fun create(event: TimelineEvent, nextEvent: TimelineEvent?, callback: TimelineEventController.Callback? - ): RiotEpoxyModel<*>? { + ): VectorEpoxyModel<*>? { val roomMember = event.roomMember val nextRoomMember = nextEvent?.roomMember diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/TimelineItemFactory.kt b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/TimelineItemFactory.kt index a850fd96..234490e4 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/TimelineItemFactory.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/TimelineItemFactory.kt @@ -19,7 +19,7 @@ package im.vector.riotredesign.features.home.room.detail.timeline.factory import im.vector.matrix.android.api.session.events.model.EventType import im.vector.matrix.android.api.session.room.timeline.TimelineEvent import im.vector.riotredesign.core.epoxy.EmptyItem_ -import im.vector.riotredesign.core.epoxy.RiotEpoxyModel +import im.vector.riotredesign.core.epoxy.VectorEpoxyModel import im.vector.riotredesign.features.home.room.detail.timeline.TimelineEventController class TimelineItemFactory(private val messageItemFactory: MessageItemFactory, @@ -32,7 +32,7 @@ class TimelineItemFactory(private val messageItemFactory: MessageItemFactory, fun create(event: TimelineEvent, nextEvent: TimelineEvent?, - callback: TimelineEventController.Callback?): RiotEpoxyModel<*> { + callback: TimelineEventController.Callback?): VectorEpoxyModel<*> { val computedModel = try { when (event.root.type) { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/AbsMessageItem.kt b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/AbsMessageItem.kt index 969ba696..4223793b 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/AbsMessageItem.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/AbsMessageItem.kt @@ -19,11 +19,11 @@ package im.vector.riotredesign.features.home.room.detail.timeline.item import android.view.View import android.widget.ImageView import android.widget.TextView -import im.vector.riotredesign.core.epoxy.RiotEpoxyHolder -import im.vector.riotredesign.core.epoxy.RiotEpoxyModel +import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder +import im.vector.riotredesign.core.epoxy.VectorEpoxyModel import im.vector.riotredesign.features.home.AvatarRenderer -abstract class AbsMessageItem : RiotEpoxyModel() { +abstract class AbsMessageItem : VectorEpoxyModel() { abstract val informationData: MessageInformationData @@ -42,7 +42,7 @@ abstract class AbsMessageItem : RiotEpoxyModel() { } } - abstract class Holder : RiotEpoxyHolder() { + abstract class Holder : VectorEpoxyHolder() { abstract val avatarImageView: ImageView abstract val memberNameView: TextView abstract val timeView: TextView diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/DaySeparatorItem.kt b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/DaySeparatorItem.kt index 2b4e4972..217c12c7 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/DaySeparatorItem.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/DaySeparatorItem.kt @@ -21,7 +21,7 @@ import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import com.airbnb.epoxy.EpoxyModelWithHolder import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.RiotEpoxyHolder +import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder @EpoxyModelClass(layout = R.layout.item_timeline_event_day_separator) abstract class DaySeparatorItem : EpoxyModelWithHolder() { @@ -32,7 +32,7 @@ abstract class DaySeparatorItem : EpoxyModelWithHolder( holder.dayTextView.text = formattedDay } - class Holder : RiotEpoxyHolder() { + class Holder : VectorEpoxyHolder() { val dayTextView by bind(R.id.itemDayTextView) } } \ No newline at end of file diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/DefaultItem.kt b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/DefaultItem.kt index 82471095..ea845fdc 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/DefaultItem.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/DefaultItem.kt @@ -20,11 +20,11 @@ import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.RiotEpoxyHolder -import im.vector.riotredesign.core.epoxy.RiotEpoxyModel +import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder +import im.vector.riotredesign.core.epoxy.VectorEpoxyModel @EpoxyModelClass(layout = R.layout.item_timeline_event_default) -abstract class DefaultItem : RiotEpoxyModel() { +abstract class DefaultItem : VectorEpoxyModel() { @EpoxyAttribute var text: CharSequence? = null @@ -32,7 +32,7 @@ abstract class DefaultItem : RiotEpoxyModel() { holder.messageView.text = text } - class Holder : RiotEpoxyHolder() { + class Holder : VectorEpoxyHolder() { val messageView by bind(R.id.stateMessageView) } } \ No newline at end of file diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/NoticeItem.kt b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/NoticeItem.kt index 7cea98c4..fe28892c 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/NoticeItem.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/NoticeItem.kt @@ -21,12 +21,12 @@ import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.RiotEpoxyHolder -import im.vector.riotredesign.core.epoxy.RiotEpoxyModel +import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder +import im.vector.riotredesign.core.epoxy.VectorEpoxyModel import im.vector.riotredesign.features.home.AvatarRenderer @EpoxyModelClass(layout = R.layout.item_timeline_event_notice) -abstract class NoticeItem : RiotEpoxyModel() { +abstract class NoticeItem : VectorEpoxyModel() { @EpoxyAttribute var noticeText: CharSequence? = null @EpoxyAttribute var avatarUrl: String? = null @@ -37,7 +37,7 @@ abstract class NoticeItem : RiotEpoxyModel() { AvatarRenderer.render(avatarUrl, memberName?.toString(), holder.avatarImageView) } - class Holder : RiotEpoxyHolder() { + class Holder : VectorEpoxyHolder() { val avatarImageView by bind(R.id.itemNoticeAvatarView) val noticeTextView by bind(R.id.itemNoticeTextView) } diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomCategoryItem.kt b/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomCategoryItem.kt index 656593b4..96f97e37 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomCategoryItem.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomCategoryItem.kt @@ -23,11 +23,11 @@ import androidx.core.graphics.drawable.DrawableCompat import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.RiotEpoxyHolder -import im.vector.riotredesign.core.epoxy.RiotEpoxyModel +import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder +import im.vector.riotredesign.core.epoxy.VectorEpoxyModel @EpoxyModelClass(layout = R.layout.item_room_category) -abstract class RoomCategoryItem : RiotEpoxyModel() { +abstract class RoomCategoryItem : VectorEpoxyModel() { @EpoxyAttribute lateinit var title: CharSequence @EpoxyAttribute var expanded: Boolean = false @@ -48,7 +48,7 @@ abstract class RoomCategoryItem : RiotEpoxyModel() { } - class Holder : RiotEpoxyHolder() { + class Holder : VectorEpoxyHolder() { val unreadCounterBadgeView by bind(R.id.roomCategoryUnreadCounterBadgeView) val titleView by bind(R.id.roomCategoryTitleView) val rootView by bind(R.id.roomCategoryRootView) diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListFragment.kt index ece0da61..5a43a21e 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListFragment.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListFragment.kt @@ -30,8 +30,8 @@ import im.vector.riotredesign.R import im.vector.riotredesign.core.epoxy.LayoutManagerStateRestorer import im.vector.riotredesign.core.extensions.observeEvent import im.vector.riotredesign.core.extensions.setupAsSearch -import im.vector.riotredesign.core.platform.RiotFragment import im.vector.riotredesign.core.platform.StateView +import im.vector.riotredesign.core.platform.VectorBaseFragment import im.vector.riotredesign.features.home.HomeModule import im.vector.riotredesign.features.home.HomeNavigator import kotlinx.android.synthetic.main.fragment_room_list.* @@ -39,7 +39,7 @@ import org.koin.android.ext.android.inject import org.koin.android.scope.ext.android.bindScope import org.koin.android.scope.ext.android.getOrCreateScope -class RoomListFragment : RiotFragment(), RoomSummaryController.Callback { +class RoomListFragment : VectorBaseFragment(), RoomSummaryController.Callback { companion object { fun newInstance(): RoomListFragment { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListViewModel.kt index f5213432..656617bb 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListViewModel.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListViewModel.kt @@ -27,7 +27,7 @@ import im.vector.matrix.android.api.session.group.model.GroupSummary import im.vector.matrix.android.api.session.room.model.RoomSummary import im.vector.matrix.android.api.session.room.model.tag.RoomTag import im.vector.matrix.rx.rx -import im.vector.riotredesign.core.platform.RiotViewModel +import im.vector.riotredesign.core.platform.VectorViewModel import im.vector.riotredesign.core.utils.LiveEvent import im.vector.riotredesign.features.home.group.SelectedGroupStore import im.vector.riotredesign.features.home.room.VisibleRoomStore @@ -44,7 +44,7 @@ class RoomListViewModel(initialState: RoomListViewState, private val visibleRoomHolder: VisibleRoomStore, private val roomSelectionRepository: RoomSelectionRepository, private val roomSummaryComparator: RoomSummaryComparator) - : RiotViewModel(initialState) { + : VectorViewModel(initialState) { companion object : MvRxViewModelFactory { diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItem.kt b/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItem.kt index fbe9f4f4..02a240d9 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItem.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItem.kt @@ -21,14 +21,14 @@ import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass import im.vector.riotredesign.R -import im.vector.riotredesign.core.epoxy.RiotEpoxyHolder -import im.vector.riotredesign.core.epoxy.RiotEpoxyModel +import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder +import im.vector.riotredesign.core.epoxy.VectorEpoxyModel import im.vector.riotredesign.core.platform.CheckableFrameLayout import im.vector.riotredesign.features.home.AvatarRenderer @EpoxyModelClass(layout = R.layout.item_room) -abstract class RoomSummaryItem : RiotEpoxyModel() { +abstract class RoomSummaryItem : VectorEpoxyModel() { @EpoxyAttribute lateinit var roomName: CharSequence @EpoxyAttribute var avatarUrl: String? = null @@ -47,7 +47,7 @@ abstract class RoomSummaryItem : RiotEpoxyModel() { AvatarRenderer.render(avatarUrl, roomName.toString(), holder.avatarImageView) } - class Holder : RiotEpoxyHolder() { + class Holder : VectorEpoxyHolder() { val unreadCounterBadgeView by bind(R.id.roomUnreadCounterBadgeView) val titleView by bind(R.id.roomNameView) val avatarImageView by bind(R.id.roomAvatarImageView) diff --git a/vector/src/main/java/im/vector/riotredesign/features/login/LoginActivity.kt b/vector/src/main/java/im/vector/riotredesign/features/login/LoginActivity.kt index 9998e1be..0c79747a 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/login/LoginActivity.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/login/LoginActivity.kt @@ -28,7 +28,7 @@ import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig import im.vector.matrix.android.api.session.Session import im.vector.riotredesign.R -import im.vector.riotredesign.core.platform.RiotActivity +import im.vector.riotredesign.core.platform.VectorBaseActivity import im.vector.riotredesign.features.home.HomeActivity import io.reactivex.Observable import io.reactivex.functions.Function3 @@ -39,7 +39,7 @@ private const val DEFAULT_HOME_SERVER_URI = "https://matrix.org" private const val DEFAULT_IDENTITY_SERVER_URI = "https://vector.im" private const val DEFAULT_ANTIVIRUS_SERVER_URI = "https://matrix.org" -class LoginActivity : RiotActivity() { +class LoginActivity : VectorBaseActivity() { private val authenticator = Matrix.getInstance().authenticator() diff --git a/vector/src/main/java/im/vector/riotredesign/features/media/MediaViewerActivity.kt b/vector/src/main/java/im/vector/riotredesign/features/media/MediaViewerActivity.kt index 403f242b..1cbd16fe 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/media/MediaViewerActivity.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/media/MediaViewerActivity.kt @@ -24,11 +24,11 @@ import android.os.Bundle import androidx.appcompat.widget.Toolbar import com.github.piasy.biv.indicator.progresspie.ProgressPieIndicator import com.github.piasy.biv.view.GlideImageViewFactory -import im.vector.riotredesign.core.platform.RiotActivity +import im.vector.riotredesign.core.platform.VectorBaseActivity import kotlinx.android.synthetic.main.activity_media_viewer.* -class MediaViewerActivity : RiotActivity() { +class MediaViewerActivity : VectorBaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/vector/src/main/java/im/vector/riotredesign/features/rageshake/BugReportActivity.kt b/vector/src/main/java/im/vector/riotredesign/features/rageshake/BugReportActivity.kt index 3865de95..8868ec3e 100755 --- a/vector/src/main/java/im/vector/riotredesign/features/rageshake/BugReportActivity.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/rageshake/BugReportActivity.kt @@ -26,13 +26,13 @@ import butterknife.BindView import butterknife.OnCheckedChanged import butterknife.OnTextChanged import im.vector.riotredesign.R -import im.vector.riotredesign.core.platform.RiotActivity +import im.vector.riotredesign.core.platform.VectorBaseActivity import timber.log.Timber /** * Form to send a bug report */ -class BugReportActivity : RiotActivity() { +class BugReportActivity : VectorBaseActivity() { /* ========================================================================================== * UI diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsActivity.kt b/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsActivity.kt index f6279d18..a657e110 100755 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsActivity.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsActivity.kt @@ -23,13 +23,13 @@ import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat import im.vector.matrix.android.api.session.Session import im.vector.riotredesign.R -import im.vector.riotredesign.core.platform.RiotActivity +import im.vector.riotredesign.core.platform.VectorBaseActivity import org.koin.android.ext.android.inject /** * Displays the client settings. */ -class VectorSettingsActivity : RiotActivity(), +class VectorSettingsActivity : VectorBaseActivity(), PreferenceFragmentCompat.OnPreferenceStartFragmentCallback, FragmentManager.OnBackStackChangedListener, VectorSettingsFragmentInteractionListener { diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt index 20078dbc..4de033f3 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt @@ -28,7 +28,7 @@ import androidx.preference.PreferenceManager import im.vector.matrix.android.api.session.Session import im.vector.riotredesign.R import im.vector.riotredesign.core.extensions.withArgs -import im.vector.riotredesign.core.platform.RiotActivity +import im.vector.riotredesign.core.platform.VectorBaseActivity import im.vector.riotredesign.core.platform.VectorPreferenceFragment import im.vector.riotredesign.core.preference.BingRule import im.vector.riotredesign.core.preference.BingRulePreference @@ -177,7 +177,7 @@ class VectorSettingsAdvancedNotificationPreferenceFragment : VectorPreferenceFra override fun onResume() { super.onResume() - (activity as? RiotActivity)?.supportActionBar?.setTitle(R.string.settings_notification_advanced) + (activity as? VectorBaseActivity)?.supportActionBar?.setTitle(R.string.settings_notification_advanced) // find the view from parent activity mLoadingView = activity!!.findViewById(R.id.vector_settings_spinner_views) diff --git a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt index 8c6b3cef..0fb39fff 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt @@ -29,17 +29,17 @@ import androidx.recyclerview.widget.RecyclerView import androidx.transition.TransitionManager import butterknife.BindView import im.vector.matrix.android.api.session.Session -import im.vector.riotredesign.push.fcm.NotificationTroubleshootTestManagerFactory import im.vector.riotredesign.R import im.vector.riotredesign.core.extensions.withArgs -import im.vector.riotredesign.core.platform.RiotActivity -import im.vector.riotredesign.core.platform.RiotFragment +import im.vector.riotredesign.core.platform.VectorBaseActivity +import im.vector.riotredesign.core.platform.VectorBaseFragment import im.vector.riotredesign.features.rageshake.BugReporter import im.vector.riotredesign.features.settings.troubleshoot.NotificationTroubleshootTestManager import im.vector.riotredesign.features.settings.troubleshoot.TroubleshootTest +import im.vector.riotredesign.push.fcm.NotificationTroubleshootTestManagerFactory import org.koin.android.ext.android.inject -class VectorSettingsNotificationsTroubleshootFragment : RiotFragment() { +class VectorSettingsNotificationsTroubleshootFragment : VectorBaseFragment() { @BindView(R.id.troubleshoot_test_recycler_view) lateinit var mRecyclerView: RecyclerView @@ -163,7 +163,7 @@ class VectorSettingsNotificationsTroubleshootFragment : RiotFragment() { override fun onResume() { super.onResume() - (activity as? RiotActivity)?.supportActionBar?.setTitle(R.string.settings_notification_troubleshoot) + (activity as? VectorBaseActivity)?.supportActionBar?.setTitle(R.string.settings_notification_troubleshoot) } override fun onAttach(context: Context) { diff --git a/vector/src/main/java/im/vector/riotredesign/features/workers/signout/SignOutUiWorker.kt b/vector/src/main/java/im/vector/riotredesign/features/workers/signout/SignOutUiWorker.kt index 868345eb..cf67cbfd 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/workers/signout/SignOutUiWorker.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/workers/signout/SignOutUiWorker.kt @@ -21,10 +21,10 @@ import androidx.appcompat.app.AlertDialog import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.session.Session import im.vector.riotredesign.R -import im.vector.riotredesign.core.platform.RiotActivity +import im.vector.riotredesign.core.platform.VectorBaseActivity import im.vector.riotredesign.features.MainActivity -class SignOutUiWorker(val activity: RiotActivity) { +class SignOutUiWorker(val activity: VectorBaseActivity) { fun perform(session: Session) { if (SignOutViewModel.doYouNeedToBeDisplayed(session)) {