gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-18 18:25:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean up code

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2020-01-09 14:47:33 +01:00
parent 9f1e4bbc34
commit e105eef2a8
No known key found for this signature in database
GPG Key ID: CDE0BBD2738C4CC0
9 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
View File

@ -49,8 +49,6 @@ import butterknife.OnClick
import coil.api.load
import coil.target.Target
import coil.transform.CircleCropTransformation
import com.bluelinelabs.conductor.ControllerChangeHandler
import com.bluelinelabs.conductor.ControllerChangeType
import com.bluelinelabs.conductor.RouterTransaction
import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler
import com.bluelinelabs.conductor.changehandler.VerticalChangeHandler

16
app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.kt
View File

@ -77,16 +77,16 @@ abstract class BaseController : ButterKnifeController(), ComponentCallbacks {
}
protected val floatingActionButton: FloatingActionButton?
get() {
var floatingActionButton: FloatingActionButton? = null
activity?.let {
if (it is MainActivity) {
floatingActionButton = it.floatingActionButton
get() {
var floatingActionButton: FloatingActionButton? = null
activity?.let {
if (it is MainActivity) {
floatingActionButton = it.floatingActionButton
}
}
}
return floatingActionButton
}
return floatingActionButton
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
return when (item.itemId) {

2
app/src/main/java/com/nextcloud/talk/newarch/data/repository/offline/ConversationsRepositoryImpl.kt
View File

@ -60,7 +60,7 @@ class ConversationsRepositoryImpl(val conversationsDao: ConversationsDao) :
override fun getConversationsForUser(userId: Long, filter: CharSequence?): LiveData<List<Conversation>> {
filter?.let {
return conversationsDao.getConversationsForUserWithFilter(userId, it.toString()).distinctUntilChanged().map { data ->
data.map {conversationEntity ->
data.map { conversationEntity ->
conversationEntity.toConversation()
}
}

2
app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationPresenter.kt
View File

@ -147,7 +147,7 @@ open class ConversationsPresenter(context: Context, onElementClick: ((Page, Hold
conversationDrawable?.let {
holder.itemView.dialogAvatar.load(conversationDrawable)
}?: run {
} ?: run {
holder.itemView.dialogAvatar.load(ApiUtils.getUrlForAvatarWithName(
user.baseUrl,
conversation.name, R.dimen.avatar_size))

2
app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListSource.kt
View File

@ -29,7 +29,7 @@ import com.otaliastudios.elements.Page
import com.otaliastudios.elements.Source
import com.otaliastudios.elements.extensions.MainSource
class ConversationsListSource<T: Conversation>(private val data: LiveData<List<T>>, private val elementType: Int = 0, loadingIndicatorsEnabled: Boolean = true, errorIndicatorEnabled: Boolean = true, emptyIndicatorEnabled: Boolean = true) : MainSource<T>(loadingIndicatorsEnabled, errorIndicatorEnabled, emptyIndicatorEnabled) {
class ConversationsListSource<T : Conversation>(private val data: LiveData<List<T>>, private val elementType: Int = 0, loadingIndicatorsEnabled: Boolean = true, errorIndicatorEnabled: Boolean = true, emptyIndicatorEnabled: Boolean = true) : MainSource<T>(loadingIndicatorsEnabled, errorIndicatorEnabled, emptyIndicatorEnabled) {
override fun onPageOpened(page: Page, dependencies: List<Element<*>>) {
super.onPageOpened(page, dependencies)

12
app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt
View File

@ -22,10 +22,11 @@ package com.nextcloud.talk.newarch.features.conversationsList
import android.content.Context
import android.os.Bundle
import android.view.*
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.view.isVisible
import androidx.lifecycle.observe
import butterknife.OnClick
import com.afollestad.materialdialogs.LayoutMode
import com.afollestad.materialdialogs.MaterialDialog
import com.afollestad.materialdialogs.bottomsheets.BottomSheet
@ -51,7 +52,10 @@ import com.nextcloud.talk.utils.ConductorRemapping
import com.nextcloud.talk.utils.DisplayUtils
import com.nextcloud.talk.utils.animations.SharedElementTransition
import com.nextcloud.talk.utils.bundle.BundleKeys
import com.otaliastudios.elements.*
import com.otaliastudios.elements.Adapter
import com.otaliastudios.elements.Element
import com.otaliastudios.elements.Page
import com.otaliastudios.elements.Presenter
import com.uber.autodispose.lifecycle.LifecycleScopeProvider
import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
import kotlinx.android.synthetic.main.controller_conversations_rv.view.*
@ -124,7 +128,7 @@ class ConversationsListView : BaseView() {
activity?.settingsButton?.setImageDrawable(avatar)
}
viewModel.filterLiveData.observe(this@ConversationsListView) {query ->
viewModel.filterLiveData.observe(this@ConversationsListView) { query ->
activity?.settingsButton?.isVisible = query.isNullOrEmpty()
activity?.clearButton?.isVisible = !query.isNullOrEmpty()
}

3
app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListViewModel.kt
View File

@ -22,11 +22,8 @@ package com.nextcloud.talk.newarch.features.conversationsList
import android.app.Application
import android.graphics.drawable.Drawable
import android.os.Handler
import android.util.Log
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.Transformations
import androidx.lifecycle.distinctUntilChanged
import androidx.lifecycle.viewModelScope
import coil.Coil
import coil.api.get

1
app/src/main/java/com/nextcloud/talk/newarch/services/shortcuts/ShortcutService.kt
View File

@ -49,7 +49,6 @@ import com.nextcloud.talk.utils.ApiUtils
import com.nextcloud.talk.utils.bundle.BundleKeys
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import java.lang.Exception
import kotlin.math.abs

8
app/src/main/java/com/nextcloud/talk/newarch/utils/ChangeHandlerCoordinatorLayout.kt
View File

@ -34,15 +34,13 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout
import com.bluelinelabs.conductor.Controller
import com.bluelinelabs.conductor.ControllerChangeHandler
import com.bluelinelabs.conductor.ControllerChangeHandler.ControllerChangeListener
import com.nextcloud.talk.activities.MainActivity
import com.nextcloud.talk.newarch.features.conversationsList.ConversationsListView
class ChangeHandlerCoordinatorLayout : CoordinatorLayout, ControllerChangeListener {
private var inProgressTransactionCount = 0
constructor(context: Context) : super(context) {}
constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {}
constructor(context: Context, attrs: AttributeSet?, @AttrRes defStyleAttr: Int) : super(context, attrs, defStyleAttr) {}
constructor(context: Context) : super(context)
constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
constructor(context: Context, attrs: AttributeSet?, @AttrRes defStyleAttr: Int) : super(context, attrs, defStyleAttr)
override fun onInterceptTouchEvent(ev: MotionEvent): Boolean {
return inProgressTransactionCount > 0 || super.onInterceptTouchEvent(ev)