melod1n/fast-messenger
3
2
Fork 1
Code Issues Actions Packages Projects 1 Releases Wiki Activity

Marked old classes as deprecated

Browse Source
This commit is contained in:
Danil Nikolaev
2021-02-21 19:25:55 +03:00
parent 662f1333c2
commit f15690758c
35 changed files with 147 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/meloda/fast/fragment/FragmentConversations.kt → app/src/main/java/com/meloda/fast/fragment/FragmentConversationsDeprecated.kt
+8 -8
View File
@@ -14,7 +14,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
import com.meloda.fast.R
import com.meloda.fast.activity.MessagesActivity
import com.meloda.fast.activity.MessagesActivityDeprecated
import com.meloda.fast.api.UserConfig
import com.meloda.fast.api.VKApiKeys
import com.meloda.fast.base.BaseFragment
@@ -23,17 +23,17 @@ import com.meloda.fast.common.TaskManager
import com.meloda.fast.event.EventInfo
import com.meloda.fast.extensions.FragmentExtensions.findViewById
import com.meloda.fast.extensions.FragmentExtensions.runOnUiThread
import com.meloda.fast.fragment.ui.presenter.ConversationsPresenter
import com.meloda.fast.fragment.ui.view.ConversationsView
import com.meloda.fast.fragment.ui.presenter.ConversationsPresenterDeprecated
import com.meloda.fast.fragment.ui.view.ConversationsViewDeprecated
import com.meloda.fast.util.AndroidUtils
import com.meloda.fast.util.ViewUtils
import com.meloda.fast.widget.Toolbar
@Suppress("UNCHECKED_CAST")
class FragmentConversations : BaseFragment(), ConversationsView {
class FragmentConversationsDeprecated : BaseFragment(), ConversationsViewDeprecated {
private lateinit var presenter: ConversationsPresenter
private lateinit var presenterDeprecated: ConversationsPresenterDeprecated
private lateinit var toolbar: Toolbar
private lateinit var refreshLayout: SwipeRefreshLayout
@@ -57,8 +57,8 @@ class FragmentConversations : BaseFragment(), ConversationsView {
prepareRecyclerView()
prepareRefreshLayout()
presenter = ConversationsPresenter(this)
presenter.setup(recyclerView, refreshLayout)
presenterDeprecated = ConversationsPresenterDeprecated(this)
presenterDeprecated.setup(recyclerView, refreshLayout)
}
private fun initViews() {
@@ -122,7 +122,7 @@ class FragmentConversations : BaseFragment(), ConversationsView {
}
override fun openChat(extras: Bundle) {
startActivity(Intent(requireContext(), MessagesActivity::class.java).putExtras(extras))
startActivity(Intent(requireContext(), MessagesActivityDeprecated::class.java).putExtras(extras))
}
override fun showErrorSnackbar(t: Throwable) {
app/src/main/java/com/meloda/fast/fragment/FragmentFriends.kt → app/src/main/java/com/meloda/fast/fragment/FragmentFriendsDeprecated.kt
+9 -9
View File
@@ -15,7 +15,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
import com.meloda.fast.R
import com.meloda.fast.activity.MessagesActivity
import com.meloda.fast.activity.MessagesActivityDeprecated
import com.meloda.fast.api.UserConfig
import com.meloda.fast.api.VKApiKeys
import com.meloda.fast.base.BaseFragment
@@ -23,14 +23,14 @@ import com.meloda.fast.common.AppGlobal
import com.meloda.fast.common.TaskManager
import com.meloda.fast.event.EventInfo
import com.meloda.fast.extensions.FragmentExtensions.findViewById
import com.meloda.fast.fragment.ui.presenter.FriendsPresenter
import com.meloda.fast.fragment.ui.view.FriendsView
import com.meloda.fast.fragment.ui.presenter.FriendsPresenterDeprecated
import com.meloda.fast.fragment.ui.view.FriendsViewDeprecated
import com.meloda.fast.util.ViewUtils
import com.meloda.fast.widget.Toolbar
class FragmentFriends(private val userId: Int = 0) : BaseFragment(), FriendsView {
class FragmentFriendsDeprecated(private val userId: Int = 0) : BaseFragment(), FriendsViewDeprecated {
private lateinit var presenter: FriendsPresenter
private lateinit var presenterDeprecated: FriendsPresenterDeprecated
private lateinit var toolbar: Toolbar
private lateinit var recyclerView: RecyclerView
@@ -56,8 +56,8 @@ class FragmentFriends(private val userId: Int = 0) : BaseFragment(), FriendsView
prepareRecyclerView()
prepareRefreshLayout()
presenter = FriendsPresenter(this)
presenter.setup(userId, recyclerView, refreshLayout)
presenterDeprecated = FriendsPresenterDeprecated(this)
presenterDeprecated.setup(userId, recyclerView, refreshLayout)
}
private fun initViews() {
@@ -104,7 +104,7 @@ class FragmentFriends(private val userId: Int = 0) : BaseFragment(), FriendsView
}
override fun onDetach() {
presenter.destroy()
presenterDeprecated.destroy()
super.onDetach()
}
@@ -131,7 +131,7 @@ class FragmentFriends(private val userId: Int = 0) : BaseFragment(), FriendsView
}
override fun openChat(extras: Bundle) {
startActivity(Intent(requireContext(), MessagesActivity::class.java).putExtras(extras))
startActivity(Intent(requireContext(), MessagesActivityDeprecated::class.java).putExtras(extras))
}
override fun showErrorSnackbar(t: Throwable) {
app/src/main/java/com/meloda/fast/fragment/FragmentImportant.kt
-21
View File
@@ -1,21 +0,0 @@
package com.meloda.fast.fragment
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import com.meloda.fast.R
import com.meloda.fast.base.BaseFragment
class FragmentImportant : BaseFragment() {
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
return inflater.inflate(R.layout.fragment_important, container, false)
}
}
app/src/main/java/com/meloda/fast/fragment/FragmentSearch.kt
-8
View File
@@ -1,8 +0,0 @@
package com.meloda.fast.fragment
import com.meloda.fast.base.BaseFragment
class FragmentSearch : BaseFragment() {
inner class SearchConversations : BaseFragment()
inner class SearchMessages : BaseFragment()
}
app/src/main/java/com/meloda/fast/fragment/SettingsFragment.kt
+2 -2
View File
@@ -9,7 +9,7 @@ import androidx.preference.PreferenceFragmentCompat
import androidx.preference.PreferenceScreen
import com.meloda.fast.R
import com.meloda.fast.activity.DropUserDataActivity
import com.meloda.fast.activity.UpdateActivity
import com.meloda.fast.activity.UpdateActivityDeprecated
import com.meloda.fast.common.AppGlobal
import com.meloda.fast.common.TaskManager
import com.meloda.fast.extensions.ContextExtensions.color
@@ -171,7 +171,7 @@ class SettingsFragment : PreferenceFragmentCompat(),
}
private fun openUpdateScreen() {
startActivity(Intent(requireContext(), UpdateActivity::class.java))
startActivity(Intent(requireContext(), UpdateActivityDeprecated::class.java))
}
override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean {
app/src/main/java/com/meloda/fast/fragment/ui/presenter/ConversationsPresenter.kt → app/src/main/java/com/meloda/fast/fragment/ui/presenter/ConversationsPresenterDeprecated.kt
+16 -16
View File
@@ -6,16 +6,16 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
import com.meloda.fast.BuildConfig
import com.meloda.fast.activity.MessagesActivity
import com.meloda.fast.adapter.ConversationsAdapter
import com.meloda.fast.adapter.diffutil.ConversationsCallback
import com.meloda.fast.activity.MessagesActivityDeprecated
import com.meloda.fast.adapter.ConversationsAdapterDeprecated
import com.meloda.fast.adapter.diffutil.ConversationsCallbackDeprecated
import com.meloda.fast.api.model.VKConversation
import com.meloda.fast.api.util.VKUtil
import com.meloda.fast.common.TaskManager
import com.meloda.fast.common.TimeManager
import com.meloda.fast.database.MemoryCache
import com.meloda.fast.fragment.ui.repository.ConversationsRepository
import com.meloda.fast.fragment.ui.view.ConversationsView
import com.meloda.fast.fragment.ui.repository.ConversationsRepositoryDeprecated
import com.meloda.fast.fragment.ui.view.ConversationsViewDeprecated
import com.meloda.fast.listener.ItemClickListener
import com.meloda.fast.listener.ItemLongClickListener
import com.meloda.fast.util.AndroidUtils
@@ -24,10 +24,10 @@ import com.meloda.mvp.MvpOnLoadListener
import com.meloda.mvp.MvpPresenter
import java.util.*
class ConversationsPresenter(viewState: ConversationsView) :
MvpPresenter<VKConversation, ConversationsRepository, ConversationsView>(
class ConversationsPresenterDeprecated(viewState: ConversationsViewDeprecated) :
MvpPresenter<VKConversation, ConversationsRepositoryDeprecated, ConversationsViewDeprecated>(
viewState,
ConversationsRepository::class.java.name
ConversationsRepositoryDeprecated::class.java.name
),
ItemClickListener,
ItemLongClickListener,
@@ -39,7 +39,7 @@ class ConversationsPresenter(viewState: ConversationsView) :
private var conversationsCount: Int = 0
private lateinit var adapter: ConversationsAdapter
private lateinit var adapter: ConversationsAdapterDeprecated
private lateinit var recyclerView: RecyclerView
private lateinit var layoutManager: LinearLayoutManager
@@ -194,7 +194,7 @@ class ConversationsPresenter(viewState: ConversationsView) :
}
private fun createAdapter() {
adapter = ConversationsAdapter(recyclerView, arrayListOf()).also {
adapter = ConversationsAdapterDeprecated(recyclerView, arrayListOf()).also {
it.itemClickListener = this
it.itemLongClickListener = this
}
@@ -225,7 +225,7 @@ class ConversationsPresenter(viewState: ConversationsView) :
}
override fun onMinuteChange(currentMinute: Int) {
post { adapter.notifyItemRangeChanged(0, adapter.itemCount, ConversationsCallback.DATE) }
post { adapter.notifyItemRangeChanged(0, adapter.itemCount, ConversationsCallbackDeprecated.DATE) }
}
private fun openChat(conversation: VKConversation) {
@@ -234,17 +234,17 @@ class ConversationsPresenter(viewState: ConversationsView) :
val peerGroup = MemoryCache.getGroupById(conversation.conversationId)
val extras = Bundle().also {
it.putInt(MessagesActivity.TAG_EXTRA_ID, conversation.conversationId)
it.putInt(MessagesActivityDeprecated.TAG_EXTRA_ID, conversation.conversationId)
it.putString(
MessagesActivity.TAG_EXTRA_TITLE,
MessagesActivityDeprecated.TAG_EXTRA_TITLE,
VKUtil.getTitle(conversation, peerUser, peerGroup)
)
it.putString(
MessagesActivity.TAG_EXTRA_AVATAR,
MessagesActivityDeprecated.TAG_EXTRA_AVATAR,
VKUtil.getAvatar(conversation, peerUser, peerGroup)
)
it.putSerializable(MessagesActivity.TAG_EXTRA_USER, peerUser)
it.putSerializable(MessagesActivity.TAG_EXTRA_GROUP, peerGroup)
it.putSerializable(MessagesActivityDeprecated.TAG_EXTRA_USER, peerUser)
it.putSerializable(MessagesActivityDeprecated.TAG_EXTRA_GROUP, peerGroup)
}
post { viewState.openChat(extras) }
app/src/main/java/com/meloda/fast/fragment/ui/presenter/FriendsPresenter.kt → app/src/main/java/com/meloda/fast/fragment/ui/presenter/FriendsPresenterDeprecated.kt
+14 -14
View File
@@ -5,21 +5,21 @@ import android.util.Log
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
import com.meloda.fast.activity.MessagesActivity
import com.meloda.fast.adapter.UsersAdapter
import com.meloda.fast.activity.MessagesActivityDeprecated
import com.meloda.fast.adapter.UsersAdapterDeprecated
import com.meloda.fast.api.model.VKUser
import com.meloda.fast.fragment.ui.repository.FriendsRepository
import com.meloda.fast.fragment.ui.view.FriendsView
import com.meloda.fast.fragment.ui.repository.FriendsRepositoryDeprecated
import com.meloda.fast.fragment.ui.view.FriendsViewDeprecated
import com.meloda.fast.listener.ItemClickListener
import com.meloda.fast.util.AndroidUtils
import com.meloda.fast.util.ArrayUtils
import com.meloda.mvp.MvpOnLoadListener
import com.meloda.mvp.MvpPresenter
class FriendsPresenter(viewState: FriendsView) :
MvpPresenter<VKUser, FriendsRepository, FriendsView>(
class FriendsPresenterDeprecated(viewState: FriendsViewDeprecated) :
MvpPresenter<VKUser, FriendsRepositoryDeprecated, FriendsViewDeprecated>(
viewState,
FriendsRepository::class.java.name
FriendsRepositoryDeprecated::class.java.name
),
ItemClickListener {
@@ -32,7 +32,7 @@ class FriendsPresenter(viewState: FriendsView) :
private var userId: Int = 0
private var friendsCount: Int = 0
private lateinit var adapter: UsersAdapter
private lateinit var adapter: UsersAdapterDeprecated
private lateinit var recyclerView: RecyclerView
private lateinit var layoutManager: LinearLayoutManager
@@ -51,12 +51,12 @@ class FriendsPresenter(viewState: FriendsView) :
getCachedFriends(userId, 0, DEFAULT_FRIENDS_COUNT, false, object : MvpOnLoadListener<Any?> {
override fun onResponse(response: Any?) {
setState(if (adapter.isEmpty()) MvpPresenter.ListState.EMPTY_LOADING else ListState.FILLED_LOADING)
loadFriends(userId, 0, ConversationsPresenter.DEFAULT_CONVERSATIONS_COUNT)
loadFriends(userId, 0, DEFAULT_FRIENDS_COUNT)
}
override fun onError(t: Throwable) {
setState(if (adapter.isEmpty()) ListState.EMPTY_LOADING else ListState.FILLED_LOADING)
loadFriends(userId, 0, ConversationsPresenter.DEFAULT_CONVERSATIONS_COUNT)
loadFriends(userId, 0, DEFAULT_FRIENDS_COUNT)
}
})
}
@@ -193,7 +193,7 @@ class FriendsPresenter(viewState: FriendsView) :
}
private fun createAdapter() {
adapter = UsersAdapter(context!!, arrayListOf()).also {
adapter = UsersAdapterDeprecated(context!!, arrayListOf()).also {
it.itemClickListener = this
}
@@ -219,9 +219,9 @@ class FriendsPresenter(viewState: FriendsView) :
val user = adapter[position]
val data = Bundle().apply {
putInt(MessagesActivity.TAG_EXTRA_ID, user.userId)
putString(MessagesActivity.TAG_EXTRA_TITLE, user.toString())
putString(MessagesActivity.TAG_EXTRA_AVATAR, user.photo200)
putInt(MessagesActivityDeprecated.TAG_EXTRA_ID, user.userId)
putString(MessagesActivityDeprecated.TAG_EXTRA_TITLE, user.toString())
putString(MessagesActivityDeprecated.TAG_EXTRA_AVATAR, user.photo200)
}
}
app/src/main/java/com/meloda/fast/fragment/ui/presenter/LoginPresenter.kt
+4 -4
View File
@@ -11,10 +11,10 @@ import androidx.core.view.isVisible
import androidx.fragment.app.setFragmentResultListener
import com.google.android.material.textfield.TextInputEditText
import com.meloda.fast.R
import com.meloda.fast.activity.MainActivity
import com.meloda.fast.activity.MainActivityDeprecated
import com.meloda.fast.api.UserConfig
import com.meloda.fast.extensions.FragmentExtensions.runOnUiThread
import com.meloda.fast.fragment.FragmentConversations
import com.meloda.fast.fragment.FragmentConversationsDeprecated
import com.meloda.fast.fragment.LoginFragment
import com.meloda.fast.fragment.ValidationFragment
import com.meloda.fast.fragment.ui.repository.LoginRepository
@@ -119,12 +119,12 @@ class LoginPresenter(
private fun openMainScreen() {
fragment.runOnUiThread {
(fragment.requireActivity() as MainActivity).bottomBar.isVisible = true
(fragment.requireActivity() as MainActivityDeprecated).bottomBar.isVisible = true
fragment.parentFragmentManager.beginTransaction()
.replace(
R.id.fragmentContainer,
FragmentConversations()
FragmentConversationsDeprecated()
).commit()
}
}
app/src/main/java/com/meloda/fast/fragment/ui/repository/ConversationsRepository.kt → app/src/main/java/com/meloda/fast/fragment/ui/repository/ConversationsRepositoryDeprecated.kt
+1 -1
View File
@@ -12,7 +12,7 @@ import com.meloda.fast.listener.OnResponseListener
import com.meloda.mvp.MvpOnLoadListener
import com.meloda.mvp.MvpRepository
class ConversationsRepository : MvpRepository<VKConversation>() {
class ConversationsRepositoryDeprecated : MvpRepository<VKConversation>() {
fun loadConversations(
offset: Int, count: Int,
app/src/main/java/com/meloda/fast/fragment/ui/repository/FriendsRepository.kt → app/src/main/java/com/meloda/fast/fragment/ui/repository/FriendsRepositoryDeprecated.kt
+1 -1
View File
@@ -10,7 +10,7 @@ import com.meloda.fast.listener.OnResponseListener
import com.meloda.mvp.MvpOnLoadListener
import com.meloda.mvp.MvpRepository
class FriendsRepository : MvpRepository<VKUser>() {
class FriendsRepositoryDeprecated : MvpRepository<VKUser>() {
fun loadFriends(
userId: Int,
app/src/main/java/com/meloda/fast/fragment/ui/view/FriendsView.kt → app/src/main/java/com/meloda/fast/fragment/ui/view/ConversationsViewDeprecated.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package com.meloda.fast.fragment.ui.view
import android.os.Bundle
import com.meloda.mvp.MvpView
interface FriendsView : MvpView {
interface ConversationsViewDeprecated : MvpView {
fun openChat(extras: Bundle)
app/src/main/java/com/meloda/fast/fragment/ui/view/ConversationsView.kt → app/src/main/java/com/meloda/fast/fragment/ui/view/FriendsViewDeprecated.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package com.meloda.fast.fragment.ui.view
import android.os.Bundle
import com.meloda.mvp.MvpView
interface ConversationsView : MvpView {
interface FriendsViewDeprecated : MvpView {
fun openChat(extras: Bundle)