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

More cleanups

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-10-29 15:22:04 +01:00
parent 716a9c0bfb
commit 4b38eb1d19
No known key found for this signature in database
GPG Key ID: CDE0BBD2738C4CC0
13 changed files with 0 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt
View File

@ -26,12 +26,6 @@ import android.graphics.drawable.LayerDrawable
import android.text.TextUtils import android.text.TextUtils
import android.text.format.DateUtils import android.text.format.DateUtils
import android.view.View import android.view.View
import android.widget.ImageView
import android.widget.ProgressBar
import android.widget.TextView
import androidx.emoji.widget.EmojiTextView
import butterknife.BindView
import butterknife.ButterKnife
import coil.api.load import coil.api.load
import coil.transform.CircleCropTransformation import coil.transform.CircleCropTransformation
import com.nextcloud.talk.R import com.nextcloud.talk.R

13
app/src/main/java/com/nextcloud/talk/adapters/items/NotificationSoundItem.kt
View File

@ -20,29 +20,16 @@
package com.nextcloud.talk.adapters.items package com.nextcloud.talk.adapters.items
import android.content.res.Resources
import android.graphics.drawable.ColorDrawable
import android.graphics.drawable.Drawable
import android.view.View import android.view.View
import android.widget.ImageView import android.widget.ImageView
import android.widget.TextView import android.widget.TextView
import butterknife.BindView import butterknife.BindView
import butterknife.ButterKnife import butterknife.ButterKnife
import coil.Coil
import coil.api.load import coil.api.load
import coil.request.LoadRequest
import coil.request.Request
import coil.request.RequestBuilder
import coil.target.Target
import coil.transform.CircleCropTransformation
import com.nextcloud.talk.R
import com.nextcloud.talk.R.color
import com.nextcloud.talk.R.drawable import com.nextcloud.talk.R.drawable
import com.nextcloud.talk.R.id import com.nextcloud.talk.R.id
import com.nextcloud.talk.R.layout import com.nextcloud.talk.R.layout
import com.nextcloud.talk.adapters.items.NotificationSoundItem.NotificationSoundItemViewHolder import com.nextcloud.talk.adapters.items.NotificationSoundItem.NotificationSoundItemViewHolder
import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
import com.nextcloud.talk.newarch.utils.Images
import eu.davidea.flexibleadapter.FlexibleAdapter import eu.davidea.flexibleadapter.FlexibleAdapter
import eu.davidea.flexibleadapter.items.AbstractFlexibleItem import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
import eu.davidea.flexibleadapter.items.IFlexible import eu.davidea.flexibleadapter.items.IFlexible

1
app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.kt
View File

@ -55,7 +55,6 @@ import com.nextcloud.talk.utils.DrawableUtils.getDrawableResourceIdForMimeType
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ACCOUNT import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ACCOUNT
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_FILE_ID import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_FILE_ID
import com.stfalcon.chatkit.messages.MessageHolders.IncomingImageMessageViewHolder import com.stfalcon.chatkit.messages.MessageHolders.IncomingImageMessageViewHolder
import eu.davidea.flexibleadapter.Payload
import io.reactivex.Single import io.reactivex.Single
import io.reactivex.SingleObserver import io.reactivex.SingleObserver
import io.reactivex.disposables.Disposable import io.reactivex.disposables.Disposable

1
app/src/main/java/com/nextcloud/talk/controllers/CallController.java
View File

@ -119,7 +119,6 @@ import javax.inject.Inject;
import me.zhanghai.android.effortlesspermissions.AfterPermissionDenied; import me.zhanghai.android.effortlesspermissions.AfterPermissionDenied;
import me.zhanghai.android.effortlesspermissions.EffortlessPermissions; import me.zhanghai.android.effortlesspermissions.EffortlessPermissions;
import me.zhanghai.android.effortlesspermissions.OpenAppDetailsDialogFragment; import me.zhanghai.android.effortlesspermissions.OpenAppDetailsDialogFragment;
import okhttp3.Cache;
import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringEscapeUtils;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.Subscribe;

1
app/src/main/java/com/nextcloud/talk/controllers/SettingsController.kt
View File

@ -86,7 +86,6 @@ import io.reactivex.schedulers.Schedulers
import net.orange_box.storebox.listeners.OnPreferenceValueChangedListener import net.orange_box.storebox.listeners.OnPreferenceValueChangedListener
import org.koin.android.ext.android.inject import org.koin.android.ext.android.inject
import java.io.IOException import java.io.IOException
import java.net.Proxy
import java.net.URI import java.net.URI
import java.net.URISyntaxException import java.net.URISyntaxException
import java.util.ArrayList import java.util.ArrayList

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

@ -21,11 +21,9 @@
package com.nextcloud.talk.newarch.data.repository.offline package com.nextcloud.talk.newarch.data.repository.offline
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import androidx.lifecycle.map
import com.nextcloud.talk.models.json.chat.ChatMessage import com.nextcloud.talk.models.json.chat.ChatMessage
import com.nextcloud.talk.newarch.domain.repository.offline.MessagesRepository import com.nextcloud.talk.newarch.domain.repository.offline.MessagesRepository
import com.nextcloud.talk.newarch.local.dao.MessagesDao import com.nextcloud.talk.newarch.local.dao.MessagesDao
import com.nextcloud.talk.newarch.local.models.toConversation
class MessagesRepositoryImpl(val messagesDao: MessagesDao): MessagesRepository { class MessagesRepositoryImpl(val messagesDao: MessagesDao): MessagesRepository {
override fun getMessagesWithUserForConversation( override fun getMessagesWithUserForConversation(

1
app/src/main/java/com/nextcloud/talk/newarch/domain/repository/offline/MessagesRepository.kt
View File

@ -22,7 +22,6 @@ package com.nextcloud.talk.newarch.domain.repository.offline
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import com.nextcloud.talk.models.json.chat.ChatMessage import com.nextcloud.talk.models.json.chat.ChatMessage
import com.nextcloud.talk.models.json.conversations.Conversation
interface MessagesRepository { interface MessagesRepository {
fun getMessagesWithUserForConversation(userId: Int, conversationId: String): LiveData<List<ChatMessage>> fun getMessagesWithUserForConversation(userId: Int, conversationId: String): LiveData<List<ChatMessage>>

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

@ -41,7 +41,6 @@ import com.nextcloud.talk.newarch.domain.usecases.GetConversationsUseCase
import com.nextcloud.talk.newarch.domain.usecases.LeaveConversationUseCase import com.nextcloud.talk.newarch.domain.usecases.LeaveConversationUseCase
import com.nextcloud.talk.newarch.domain.usecases.SetConversationFavoriteValueUseCase import com.nextcloud.talk.newarch.domain.usecases.SetConversationFavoriteValueUseCase
import com.nextcloud.talk.newarch.domain.usecases.base.UseCaseResponse import com.nextcloud.talk.newarch.domain.usecases.base.UseCaseResponse
import com.nextcloud.talk.newarch.utils.ViewState
import com.nextcloud.talk.newarch.utils.ViewState.LOADING import com.nextcloud.talk.newarch.utils.ViewState.LOADING
import com.nextcloud.talk.utils.ShareUtils import com.nextcloud.talk.utils.ShareUtils
import com.nextcloud.talk.utils.database.user.UserUtils import com.nextcloud.talk.utils.database.user.UserUtils

2
app/src/main/java/com/nextcloud/talk/newarch/local/converters/ExternalSignalingConverter.kt
View File

@ -23,8 +23,6 @@ package com.nextcloud.talk.newarch.local.converters
import androidx.room.TypeConverter import androidx.room.TypeConverter
import com.bluelinelabs.logansquare.LoganSquare import com.bluelinelabs.logansquare.LoganSquare
import com.nextcloud.talk.models.ExternalSignalingServer import com.nextcloud.talk.models.ExternalSignalingServer
import com.nextcloud.talk.models.json.capabilities.Capabilities
import com.nextcloud.talk.models.json.push.PushConfigurationState
class ExternalSignalingConverter { class ExternalSignalingConverter {
@TypeConverter @TypeConverter

5
app/src/main/java/com/nextcloud/talk/newarch/local/converters/SystemMessageTypeConverter.kt
View File

@ -21,7 +21,6 @@
package com.nextcloud.talk.newarch.local.converters package com.nextcloud.talk.newarch.local.converters
import androidx.room.TypeConverter import androidx.room.TypeConverter
import com.nextcloud.talk.models.json.chat.ChatMessage
import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType
import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType.CALL_ENDED import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType.CALL_ENDED
import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType.CALL_JOINED import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType.CALL_JOINED
@ -42,10 +41,6 @@ import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType.PASSWOR
import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType.PASSWORD_SET import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType.PASSWORD_SET
import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType.USER_ADDED import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType.USER_ADDED
import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType.USER_REMOVED import com.nextcloud.talk.models.json.chat.ChatMessage.SystemMessageType.USER_REMOVED
import com.nextcloud.talk.newarch.local.models.other.UserStatus
import com.nextcloud.talk.newarch.local.models.other.UserStatus.ACTIVE
import com.nextcloud.talk.newarch.local.models.other.UserStatus.DORMANT
import com.nextcloud.talk.newarch.local.models.other.UserStatus.PENDING_DELETE
class SystemMessageTypeConverter { class SystemMessageTypeConverter {
@TypeConverter @TypeConverter

1
app/src/main/java/com/nextcloud/talk/newarch/local/converters/UserStatusConverter.kt
View File

@ -21,7 +21,6 @@
package com.nextcloud.talk.newarch.local.converters package com.nextcloud.talk.newarch.local.converters
import androidx.room.TypeConverter import androidx.room.TypeConverter
import com.nextcloud.talk.models.json.conversations.Conversation.LobbyState
import com.nextcloud.talk.newarch.local.models.other.UserStatus import com.nextcloud.talk.newarch.local.models.other.UserStatus
import com.nextcloud.talk.newarch.local.models.other.UserStatus.ACTIVE import com.nextcloud.talk.newarch.local.models.other.UserStatus.ACTIVE
import com.nextcloud.talk.newarch.local.models.other.UserStatus.DORMANT import com.nextcloud.talk.newarch.local.models.other.UserStatus.DORMANT

2
app/src/main/java/com/nextcloud/talk/newarch/local/dao/MessagesDao.kt
View File

@ -25,8 +25,6 @@ import androidx.room.Dao
import androidx.room.Insert import androidx.room.Insert
import androidx.room.OnConflictStrategy import androidx.room.OnConflictStrategy
import androidx.room.Query import androidx.room.Query
import com.nextcloud.talk.models.json.chat.ChatMessage
import com.nextcloud.talk.newarch.local.models.ConversationEntity
import com.nextcloud.talk.newarch.local.models.MessageEntity import com.nextcloud.talk.newarch.local.models.MessageEntity
@Dao @Dao

12
app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt
View File

@ -24,14 +24,12 @@ import android.annotation.SuppressLint
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.content.res.ColorStateList import android.content.res.ColorStateList
import android.content.res.Configuration
import android.content.res.Resources import android.content.res.Resources
import android.graphics.Bitmap import android.graphics.Bitmap
import android.graphics.Canvas import android.graphics.Canvas
import android.graphics.Typeface import android.graphics.Typeface
import android.graphics.drawable.BitmapDrawable import android.graphics.drawable.BitmapDrawable
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
import android.graphics.drawable.VectorDrawable
import android.net.Uri import android.net.Uri
import android.os.Build import android.os.Build
import android.text.Spannable import android.text.Spannable
@ -59,21 +57,13 @@ import androidx.core.content.ContextCompat
import androidx.core.graphics.drawable.DrawableCompat import androidx.core.graphics.drawable.DrawableCompat
import androidx.emoji.text.EmojiCompat import androidx.emoji.text.EmojiCompat
import coil.Coil import coil.Coil
import coil.ImageLoader
import coil.api.load import coil.api.load
import coil.target.Target import coil.target.Target
import coil.transform.CircleCropTransformation import coil.transform.CircleCropTransformation
import com.facebook.common.executors.UiThreadImmediateExecutorService
import com.facebook.common.references.CloseableReference
import com.facebook.datasource.DataSource
import com.facebook.drawee.backends.pipeline.Fresco
import com.facebook.drawee.view.SimpleDraweeView import com.facebook.drawee.view.SimpleDraweeView
import com.facebook.imagepipeline.common.RotationOptions import com.facebook.imagepipeline.common.RotationOptions
import com.facebook.imagepipeline.datasource.BaseBitmapDataSubscriber
import com.facebook.imagepipeline.image.CloseableImage
import com.facebook.imagepipeline.image.ImageInfo import com.facebook.imagepipeline.image.ImageInfo
import com.facebook.imagepipeline.postprocessors.RoundAsCirclePostprocessor import com.facebook.imagepipeline.postprocessors.RoundAsCirclePostprocessor
import com.facebook.imagepipeline.postprocessors.RoundPostprocessor
import com.facebook.imagepipeline.request.ImageRequest import com.facebook.imagepipeline.request.ImageRequest
import com.facebook.imagepipeline.request.ImageRequestBuilder import com.facebook.imagepipeline.request.ImageRequestBuilder
import com.facebook.widget.text.span.BetterImageSpan import com.facebook.widget.text.span.BetterImageSpan
@ -83,12 +73,10 @@ import com.nextcloud.talk.application.NextcloudTalkApplication
import com.nextcloud.talk.events.UserMentionClickEvent import com.nextcloud.talk.events.UserMentionClickEvent
import com.nextcloud.talk.models.database.UserEntity import com.nextcloud.talk.models.database.UserEntity
import com.nextcloud.talk.newarch.utils.Images import com.nextcloud.talk.newarch.utils.Images
import com.nextcloud.talk.utils.preferences.AppPreferences
import com.nextcloud.talk.utils.text.Spans import com.nextcloud.talk.utils.text.Spans
import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.EventBus
import java.lang.reflect.InvocationTargetException import java.lang.reflect.InvocationTargetException
import java.util.regex.Pattern import java.util.regex.Pattern
import org.koin.android.ext.android.inject
object DisplayUtils { object DisplayUtils {