6543
/
BayernMessenger
forked from GitHub-Mirror/riotX-android
1
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

Rename class from Riot* to Vector*

This commit is contained in:
Benoit Marty 2019-04-05 10:40:59 +02:00
parent 57cea677e4
commit 260cc0dd5f
37 changed files with 92 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/AndroidManifest.xml
View File

@ -7,7 +7,7 @@
<uses-permission android:name="android.permission.INTERNET" />

<application
android:name=".Riot"
android:name=".VectorApplication"
android:allowBackup="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"

2
vector/src/main/java/im/vector/riotredesign/Riot.kt → vector/src/main/java/im/vector/riotredesign/VectorApplication.kt
View File

@ -35,7 +35,7 @@ import org.koin.standalone.StandAloneContext.startKoin
import timber.log.Timber


class Riot : Application() {
class VectorApplication : Application() {

override fun onCreate() {
super.onCreate()

4
vector/src/main/java/im/vector/riotredesign/core/epoxy/EmptyItem.kt
View File

@ -22,6 +22,6 @@ import com.airbnb.epoxy.EpoxyModelClass
import im.vector.riotredesign.R

@EpoxyModelClass(layout = R.layout.item_empty)
abstract class EmptyItem : RiotEpoxyModel<EmptyItem.Holder>() {
class Holder : RiotEpoxyHolder()
abstract class EmptyItem : VectorEpoxyModel<EmptyItem.Holder>() {
class Holder : VectorEpoxyHolder()
}

12
vector/src/main/java/im/vector/riotredesign/core/epoxy/RiotEpoxyHolder.kt → vector/src/main/java/im/vector/riotredesign/core/epoxy/VectorEpoxyHolder.kt
View File

@ -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 <V : View> bind(id: Int): ReadOnlyProperty<RiotEpoxyHolder, V> =
Lazy { holder: RiotEpoxyHolder, prop ->
protected fun <V : View> bind(id: Int): ReadOnlyProperty<VectorEpoxyHolder, V> =
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<V>(
private val initializer: (RiotEpoxyHolder, KProperty<*>) -> V
) : ReadOnlyProperty<RiotEpoxyHolder, V> {
private val initializer: (VectorEpoxyHolder, KProperty<*>) -> V
) : ReadOnlyProperty<VectorEpoxyHolder, V> {
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)
}

4
vector/src/main/java/im/vector/riotredesign/core/epoxy/RiotEpoxyModel.kt → vector/src/main/java/im/vector/riotredesign/core/epoxy/VectorEpoxyModel.kt
View File

@ -19,7 +19,7 @@ package im.vector.riotredesign.core.epoxy
import com.airbnb.epoxy.EpoxyModelWithHolder
import com.airbnb.epoxy.VisibilityState

abstract class RiotEpoxyModel<H : RiotEpoxyHolder> : EpoxyModelWithHolder<H>() {
abstract class VectorEpoxyModel<H : VectorEpoxyHolder> : EpoxyModelWithHolder<H>() {

private var onModelVisibilityStateChangedListener: OnVisibilityStateChangedListener? = null

@ -28,7 +28,7 @@ abstract class RiotEpoxyModel<H : RiotEpoxyHolder> : EpoxyModelWithHolder<H>() {
super.onVisibilityStateChanged(visibilityState, view)
}

fun setOnVisibilityStateChanged(listener: OnVisibilityStateChangedListener): RiotEpoxyModel<H> {
fun setOnVisibilityStateChanged(listener: OnVisibilityStateChangedListener): VectorEpoxyModel<H> {
this.onModelVisibilityStateChangedListener = listener
return this
}

2
vector/src/main/java/im/vector/riotredesign/core/platform/RiotActivity.kt → vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseActivity.kt
View File

@ -43,7 +43,7 @@ import io.reactivex.disposables.Disposable
import timber.log.Timber


abstract class RiotActivity : BaseMvRxActivity() {
abstract class VectorBaseActivity : BaseMvRxActivity() {
/* ==========================================================================================
* UI
* ========================================================================================== */

6
vector/src/main/java/im/vector/riotredesign/core/platform/RiotFragment.kt → vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseFragment.kt
View File

@ -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
}

/* ==========================================================================================

4
vector/src/main/java/im/vector/riotredesign/core/platform/VectorPreferenceFragment.kt
View File

@ -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
}

/* ==========================================================================================

2
vector/src/main/java/im/vector/riotredesign/core/platform/RiotViewModel.kt → vector/src/main/java/im/vector/riotredesign/core/platform/VectorViewModel.kt
View File

@ -19,5 +19,5 @@ package im.vector.riotredesign.core.platform
import com.airbnb.mvrx.BaseMvRxViewModel
import com.airbnb.mvrx.MvRxState

abstract class RiotViewModel<S : MvRxState>(initialState: S)
abstract class VectorViewModel<S : MvRxState>(initialState: S)
: BaseMvRxViewModel<S>(initialState, debugMode = false)

4
vector/src/main/java/im/vector/riotredesign/features/MainActivity.kt
View File

@ -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()


4
vector/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt
View File

@ -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<HomeNavigator>()

4
vector/src/main/java/im/vector/riotredesign/features/home/HomeActivityViewModel.kt
View File

@ -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<EmptyState>(state) {
) : VectorViewModel<EmptyState>(state) {

companion object : MvRxViewModelFactory<HomeActivityViewModel, EmptyState> {


4
vector/src/main/java/im/vector/riotredesign/features/home/HomeDrawerFragment.kt
View File

@ -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 {


4
vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListFragment.kt
View File

@ -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 {

4
vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListViewModel.kt
View File

@ -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<GroupListViewState>(initialState) {
) : VectorViewModel<GroupListViewState>(initialState) {

companion object : MvRxViewModelFactory<GroupListViewModel, GroupListViewState> {


8
vector/src/main/java/im/vector/riotredesign/features/home/group/GroupSummaryItem.kt
View File

@ -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<GroupSummaryItem.Holder>() {
abstract class GroupSummaryItem : VectorEpoxyModel<GroupSummaryItem.Holder>() {

@EpoxyAttribute lateinit var groupName: CharSequence
@EpoxyAttribute var avatarUrl: String? = null
@ -40,7 +40,7 @@ abstract class GroupSummaryItem : RiotEpoxyModel<GroupSummaryItem.Holder>() {
AvatarRenderer.render(avatarUrl, groupName.toString(), holder.avatarImageView)
}

class Holder : RiotEpoxyHolder() {
class Holder : VectorEpoxyHolder() {
val avatarImageView by bind<ImageView>(R.id.groupAvatarImageView)
val rootView by bind<CheckableFrameLayout>(R.id.itemGroupLayout)
}

4
vector/src/main/java/im/vector/riotredesign/features/home/room/detail/LoadingRoomDetailFragment.kt
View File

@ -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 {


8
vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailFragment.kt
View File

@ -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)
}


4
vector/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailViewModel.kt
View File

@ -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<RoomDetailViewState>(initialState) {
) : VectorViewModel<RoomDetailViewState>(initialState) {

private val room = session.getRoom(initialState.roomId)!!
private val roomId = initialState.roomId

4
vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineEventController.kt
View File

@ -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) {

4
vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/MessageItemFactory.kt
View File

@ -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

4
vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
View File

@ -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) {

8
vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/AbsMessageItem.kt
View File

@ -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<H : AbsMessageItem.Holder> : RiotEpoxyModel<H>() {
abstract class AbsMessageItem<H : AbsMessageItem.Holder> : VectorEpoxyModel<H>() {

abstract val informationData: MessageInformationData

@ -42,7 +42,7 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : RiotEpoxyModel<H>() {
}
}

abstract class Holder : RiotEpoxyHolder() {
abstract class Holder : VectorEpoxyHolder() {
abstract val avatarImageView: ImageView
abstract val memberNameView: TextView
abstract val timeView: TextView

4
vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/DaySeparatorItem.kt
View File

@ -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<DaySeparatorItem.Holder>() {
@ -32,7 +32,7 @@ abstract class DaySeparatorItem : EpoxyModelWithHolder<DaySeparatorItem.Holder>(
holder.dayTextView.text = formattedDay
}

class Holder : RiotEpoxyHolder() {
class Holder : VectorEpoxyHolder() {
val dayTextView by bind<TextView>(R.id.itemDayTextView)
}
}

8
vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/DefaultItem.kt
View File

@ -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<DefaultItem.Holder>() {
abstract class DefaultItem : VectorEpoxyModel<DefaultItem.Holder>() {

@EpoxyAttribute var text: CharSequence? = null

@ -32,7 +32,7 @@ abstract class DefaultItem : RiotEpoxyModel<DefaultItem.Holder>() {
holder.messageView.text = text
}

class Holder : RiotEpoxyHolder() {
class Holder : VectorEpoxyHolder() {
val messageView by bind<TextView>(R.id.stateMessageView)
}
}

8
vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/item/NoticeItem.kt
View File

@ -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<NoticeItem.Holder>() {
abstract class NoticeItem : VectorEpoxyModel<NoticeItem.Holder>() {

@EpoxyAttribute var noticeText: CharSequence? = null
@EpoxyAttribute var avatarUrl: String? = null
@ -37,7 +37,7 @@ abstract class NoticeItem : RiotEpoxyModel<NoticeItem.Holder>() {
AvatarRenderer.render(avatarUrl, memberName?.toString(), holder.avatarImageView)
}

class Holder : RiotEpoxyHolder() {
class Holder : VectorEpoxyHolder() {
val avatarImageView by bind<ImageView>(R.id.itemNoticeAvatarView)
val noticeTextView by bind<TextView>(R.id.itemNoticeTextView)
}

8
vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomCategoryItem.kt
View File

@ -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<RoomCategoryItem.Holder>() {
abstract class RoomCategoryItem : VectorEpoxyModel<RoomCategoryItem.Holder>() {

@EpoxyAttribute lateinit var title: CharSequence
@EpoxyAttribute var expanded: Boolean = false
@ -48,7 +48,7 @@ abstract class RoomCategoryItem : RiotEpoxyModel<RoomCategoryItem.Holder>() {
}


class Holder : RiotEpoxyHolder() {
class Holder : VectorEpoxyHolder() {
val unreadCounterBadgeView by bind<UnreadCounterBadgeView>(R.id.roomCategoryUnreadCounterBadgeView)
val titleView by bind<TextView>(R.id.roomCategoryTitleView)
val rootView by bind<ViewGroup>(R.id.roomCategoryRootView)

4
vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListFragment.kt
View File

@ -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 {

4
vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListViewModel.kt
View File

@ -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<RoomListViewState>(initialState) {
: VectorViewModel<RoomListViewState>(initialState) {

companion object : MvRxViewModelFactory<RoomListViewModel, RoomListViewState> {


8
vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItem.kt
View File

@ -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<RoomSummaryItem.Holder>() {
abstract class RoomSummaryItem : VectorEpoxyModel<RoomSummaryItem.Holder>() {

@EpoxyAttribute lateinit var roomName: CharSequence
@EpoxyAttribute var avatarUrl: String? = null
@ -47,7 +47,7 @@ abstract class RoomSummaryItem : RiotEpoxyModel<RoomSummaryItem.Holder>() {
AvatarRenderer.render(avatarUrl, roomName.toString(), holder.avatarImageView)
}

class Holder : RiotEpoxyHolder() {
class Holder : VectorEpoxyHolder() {
val unreadCounterBadgeView by bind<UnreadCounterBadgeView>(R.id.roomUnreadCounterBadgeView)
val titleView by bind<TextView>(R.id.roomNameView)
val avatarImageView by bind<ImageView>(R.id.roomAvatarImageView)

4
vector/src/main/java/im/vector/riotredesign/features/login/LoginActivity.kt
View File

@ -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()


4
vector/src/main/java/im/vector/riotredesign/features/media/MediaViewerActivity.kt
View File

@ -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)

4
vector/src/main/java/im/vector/riotredesign/features/rageshake/BugReportActivity.kt
View File

@ -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

4
vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsActivity.kt
View File

@ -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 {

4
vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsAdvancedNotificationPreferenceFragment.kt
View File

@ -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)


10
vector/src/main/java/im/vector/riotredesign/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
View File

@ -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) {

4
vector/src/main/java/im/vector/riotredesign/features/workers/signout/SignOutUiWorker.kt
View File

@ -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)) {