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/activity/DropUserDataActivity.kt
+1 -1
View File
@@ -16,7 +16,7 @@ class DropUserDataActivity : BaseActivity() {
TaskManager.execute { AppGlobal.database.clearAllTables() }
startActivity(Intent(this, MainActivity::class.java))
startActivity(Intent(this, MainActivityDeprecated::class.java))
finishAffinity()
}
app/src/main/java/com/meloda/fast/activity/LoginActivity.kt → app/src/main/java/com/meloda/fast/activity/LoginActivityDeprecated.kt
+2 -2
View File
@@ -19,7 +19,7 @@ import com.meloda.fast.extensions.ContextExtensions.drawable
import com.meloda.fast.extensions.DrawableExtensions.tint
import com.meloda.fast.widget.Toolbar
class LoginActivity : BaseActivity() {
class LoginActivityDeprecated : BaseActivity() {
private lateinit var toolbar: Toolbar
private lateinit var progressBar: ProgressBar
@@ -125,7 +125,7 @@ class LoginActivity : BaseActivity() {
UserConfig.save()
finishAffinity()
startActivity(Intent(this, MainActivity::class.java))
startActivity(Intent(this, MainActivityDeprecated::class.java))
}
} catch (e: Exception) {
e.printStackTrace()
app/src/main/java/com/meloda/fast/activity/MainActivity.kt → app/src/main/java/com/meloda/fast/activity/MainActivityDeprecated.kt
+13 -18
View File
@@ -22,8 +22,8 @@ import com.meloda.fast.dialog.AccountDialog
import com.meloda.fast.extensions.ContextExtensions.color
import com.meloda.fast.extensions.ContextExtensions.drawable
import com.meloda.fast.extensions.DrawableExtensions.tint
import com.meloda.fast.fragment.FragmentConversations
import com.meloda.fast.fragment.FragmentFriends
import com.meloda.fast.fragment.FragmentConversationsDeprecated
import com.meloda.fast.fragment.FragmentFriendsDeprecated
import com.meloda.fast.fragment.SettingsFragment
import com.meloda.fast.fragment.LoginFragment
import com.meloda.fast.listener.OnResponseListener
@@ -33,12 +33,12 @@ import com.meloda.fast.util.ViewUtils
import com.meloda.fast.widget.Toolbar
class MainActivity : BaseActivity(),
class MainActivityDeprecated : BaseActivity(),
NavigationView.OnNavigationItemSelectedListener,
BottomNavigationView.OnNavigationItemSelectedListener {
private lateinit var fragmentConversations: FragmentConversations
private lateinit var fragmentFriends: FragmentFriends
private lateinit var fragmentConversationsDeprecated: FragmentConversationsDeprecated
private lateinit var fragmentFriendsDeprecated: FragmentFriendsDeprecated
private lateinit var settingsFragment: SettingsFragment
private var selectedId = 0
@@ -57,7 +57,7 @@ class MainActivity : BaseActivity(),
if (UserConfig.isLoggedIn()) {
supportFragmentManager.beginTransaction()
.replace(R.id.fragmentContainer, FragmentConversations())
.replace(R.id.fragmentContainer, FragmentConversationsDeprecated())
.commit()
} else {
bottomBar.isVisible = false
@@ -89,8 +89,8 @@ class MainActivity : BaseActivity(),
}
private fun prepareFragments() {
fragmentConversations = FragmentConversations()
fragmentFriends = FragmentFriends(UserConfig.userId)
fragmentConversationsDeprecated = FragmentConversationsDeprecated()
fragmentFriendsDeprecated = FragmentFriendsDeprecated(UserConfig.userId)
settingsFragment = SettingsFragment()
val containerId = R.id.fragmentContainer
@@ -98,7 +98,7 @@ class MainActivity : BaseActivity(),
FragmentSwitcher.addFragments(
supportFragmentManager,
containerId,
listOf(fragmentConversations)
listOf(fragmentConversationsDeprecated)
)
}
@@ -156,7 +156,7 @@ class MainActivity : BaseActivity(),
startLongPoll()
loadProfileInfo()
} else {
openStartScreen()
}
}
@@ -170,15 +170,10 @@ class MainActivity : BaseActivity(),
startService(Intent(this, LongPollService::class.java))
}
private fun openStartScreen() {
finish()
startActivity(Intent(this, StartActivity::class.java))
}
private fun openConversationsScreen() {
FragmentSwitcher.showFragment(
supportFragmentManager,
fragmentConversations.javaClass.simpleName,
fragmentConversationsDeprecated.javaClass.simpleName,
true
)
}
@@ -186,13 +181,13 @@ class MainActivity : BaseActivity(),
private fun openFriendsScreen() {
FragmentSwitcher.showFragment(
supportFragmentManager,
fragmentFriends.javaClass.simpleName,
fragmentFriendsDeprecated.javaClass.simpleName,
true
)
}
private fun openSettingsScreen() {
startActivity(Intent(this, SettingsActivity::class.java))
startActivity(Intent(this, SettingsActivityDeprecated::class.java))
}
private fun loadProfileInfo() {
app/src/main/java/com/meloda/fast/activity/MessagesActivity.kt → app/src/main/java/com/meloda/fast/activity/MessagesActivityDeprecated.kt
+13 -13
View File
@@ -15,8 +15,8 @@ import androidx.recyclerview.widget.RecyclerView
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
import com.amulyakhare.textdrawable.TextDrawable
import com.meloda.fast.R
import com.meloda.fast.activity.ui.presenter.MessagesPresenter
import com.meloda.fast.activity.ui.view.MessagesView
import com.meloda.fast.activity.ui.presenter.MessagesPresenterDeprecated
import com.meloda.fast.activity.ui.view.MessagesViewDeprecated
import com.meloda.fast.api.model.VKConversation
import com.meloda.fast.api.model.VKGroup
import com.meloda.fast.api.model.VKModel
@@ -34,7 +34,7 @@ import com.meloda.fast.util.ViewUtils
import com.meloda.fast.widget.CircleImageView
class MessagesActivity : BaseActivity(), MessagesView {
class MessagesActivityDeprecated : BaseActivity(), MessagesViewDeprecated {
companion object {
const val TAG = "MessagesActivity"
@@ -67,7 +67,7 @@ class MessagesActivity : BaseActivity(), MessagesView {
private var dialogUser: VKUser? = null
private var dialogGroup: VKGroup? = null
private lateinit var presenter: MessagesPresenter
private lateinit var presenterDeprecated: MessagesPresenterDeprecated
lateinit var recyclerView: RecyclerView
private lateinit var refreshLayout: SwipeRefreshLayout
@@ -86,7 +86,7 @@ class MessagesActivity : BaseActivity(), MessagesView {
override fun onDestroy() {
super.onDestroy()
presenter.destroy()
presenterDeprecated.destroy()
}
override fun onCreate(savedInstanceState: Bundle?) {
@@ -101,8 +101,8 @@ class MessagesActivity : BaseActivity(), MessagesView {
prepareRecyclerView()
prepareEditText()
presenter = MessagesPresenter(this)
presenter.setup(peerId, recyclerView)
presenterDeprecated = MessagesPresenterDeprecated(this)
presenterDeprecated.setup(peerId, recyclerView)
}
private fun initViews() {
@@ -142,9 +142,9 @@ class MessagesActivity : BaseActivity(), MessagesView {
chatAvatar.loadImage(avatar, placeholder)
toolbar.setOnClickListener { presenter.openProfile() }
toolbar.setOnClickListener { presenterDeprecated.openProfile() }
chatAvatar.setOnClickListener { presenter.openProfile() }
chatAvatar.setOnClickListener { presenterDeprecated.openProfile() }
chatTitle.text = title
@@ -209,7 +209,7 @@ class MessagesActivity : BaseActivity(), MessagesView {
android.R.id.home -> onBackPressed()
R.id.messagesRefresh -> {
presenter.updateData()
presenterDeprecated.updateData()
}
}
@@ -237,11 +237,11 @@ class MessagesActivity : BaseActivity(), MessagesView {
setImageResource(R.drawable.ic_send)
setOnClickListener {
presenter.sendMessage(chatMessage.text.toString(), attachments)
presenterDeprecated.sendMessage(chatMessage.text.toString(), attachments)
}
setOnLongClickListener {
presenter.sendMessage(chatMessage.text.toString(), attachments, false)
presenterDeprecated.sendMessage(chatMessage.text.toString(), attachments, false)
true
}
}
@@ -331,7 +331,7 @@ class MessagesActivity : BaseActivity(), MessagesView {
builder.setTitle(R.string.error_occurred)
builder.setMessage(R.string.error_loading_message)
builder.setPositiveButton(R.string.retry) { _, _ ->
presenter.loadConversation(peerId)
presenterDeprecated.loadConversation(peerId)
}
builder.setNegativeButton(R.string.no) { _, _ -> onBackPressed() }
builder.setCancelable(false)
app/src/main/java/com/meloda/fast/activity/SettingsActivity.kt → app/src/main/java/com/meloda/fast/activity/SettingsActivityDeprecated.kt
+1 -1
View File
@@ -9,7 +9,7 @@ import com.meloda.fast.fragment.SettingsFragment
import com.meloda.fast.util.ColorUtils
import com.meloda.fast.widget.Toolbar
class SettingsActivity : BaseActivity() {
class SettingsActivityDeprecated : BaseActivity() {
private lateinit var toolbar: Toolbar
app/src/main/java/com/meloda/fast/activity/StartActivity.kt
-82
View File
@@ -1,82 +0,0 @@
package com.meloda.fast.activity
import android.annotation.SuppressLint
import android.content.Intent
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.widget.Toast
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.widget.AppCompatEditText
import com.google.android.material.button.MaterialButton
import com.meloda.fast.R
import com.meloda.fast.api.UserConfig
import com.meloda.fast.base.BaseActivity
@SuppressLint("InflateParams")
class StartActivity : BaseActivity() {
private lateinit var startEnter: MaterialButton
private lateinit var startLoginSettings: MaterialButton
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_start)
initViews()
prepareEnterButton()
}
private fun initViews() {
startEnter = findViewById(R.id.startEnter)
startLoginSettings = findViewById(R.id.startLoginSettings)
}
private fun prepareEnterButton() {
startEnter.setOnClickListener {
startActivity(Intent(this, LoginActivity::class.java))
}
startEnter.setOnLongClickListener {
showUserIdTokenDialog()
true
}
startLoginSettings.setOnClickListener {
Toast.makeText(this, R.string.in_progress_placeholder, Toast.LENGTH_LONG).show()
}
}
private fun showUserIdTokenDialog() {
AlertDialog.Builder(this).apply {
setTitle(R.string.custom_data)
val view = LayoutInflater.from(this@StartActivity)
.inflate(R.layout.activity_login_custom_data, null, false) as View
setView(view)
val userId = view.findViewById<AppCompatEditText>(R.id.customDataUserId)
val token = view.findViewById<AppCompatEditText>(R.id.customDataToken)
setPositiveButton(android.R.string.ok) { _, _ ->
if (userId.text.toString().isEmpty() || token.text.toString().isEmpty())
return@setPositiveButton
val id = userId.text.toString().toInt()
val accessToken = token.text.toString()
if (id < 1) return@setPositiveButton
UserConfig.userId = id
UserConfig.token = accessToken
UserConfig.save()
finish()
startActivity(Intent(this@StartActivity, MainActivity::class.java))
}
setCancelable(false)
setNegativeButton(android.R.string.cancel, null)
}.show()
}
}
app/src/main/java/com/meloda/fast/activity/UpdateActivity.kt → app/src/main/java/com/meloda/fast/activity/UpdateActivityDeprecated.kt
+4 -4
View File
@@ -36,7 +36,7 @@ import java.text.SimpleDateFormat
import java.util.*
class UpdateActivity : BaseActivity() {
class UpdateActivityDeprecated : BaseActivity() {
companion object {
private const val FILE_BASE_PATH = "file://"
@@ -149,7 +149,7 @@ class UpdateActivity : BaseActivity() {
override fun onResponse(response: Any?) {
timer.cancel()
installUpdate(this@UpdateActivity, file)
installUpdate(this@UpdateActivityDeprecated, file)
unregisterReceiver(receiver)
@@ -218,7 +218,7 @@ class UpdateActivity : BaseActivity() {
isChecking = false
isNewUpdate = true
this@UpdateActivity.newUpdate = updateInfo
this@UpdateActivityDeprecated.newUpdate = updateInfo
refreshState()
}
@@ -227,7 +227,7 @@ class UpdateActivity : BaseActivity() {
isNewUpdate = false
isChecking = false
this@UpdateActivity.newUpdate = NewUpdateInfo()
this@UpdateActivityDeprecated.newUpdate = NewUpdateInfo()
refreshState()
}
app/src/main/java/com/meloda/fast/activity/ui/presenter/MessagesPresenter.kt → app/src/main/java/com/meloda/fast/activity/ui/presenter/MessagesPresenterDeprecated.kt
+8 -8
View File
@@ -2,9 +2,9 @@ package com.meloda.fast.activity.ui.presenter
import androidx.recyclerview.widget.RecyclerView
import com.meloda.fast.R
import com.meloda.fast.activity.ui.repository.MessagesRepository
import com.meloda.fast.activity.ui.view.MessagesView
import com.meloda.fast.adapter.MessagesAdapter
import com.meloda.fast.activity.ui.repository.MessagesRepositoryDeprecated
import com.meloda.fast.activity.ui.view.MessagesViewDeprecated
import com.meloda.fast.adapter.MessagesAdapterDeprecated
import com.meloda.fast.api.UserConfig
import com.meloda.fast.api.VKApiKeys
import com.meloda.fast.api.model.VKConversation
@@ -20,10 +20,10 @@ import com.meloda.mvp.MvpOnLoadListener
import com.meloda.mvp.MvpPresenter
import kotlin.random.Random
class MessagesPresenter(viewState: MessagesView) :
MvpPresenter<VKMessage, MessagesRepository, MessagesView>(
class MessagesPresenterDeprecated(viewState: MessagesViewDeprecated) :
MvpPresenter<VKMessage, MessagesRepositoryDeprecated, MessagesViewDeprecated>(
viewState,
MessagesRepository::class.java.name
MessagesRepositoryDeprecated::class.java.name
),
ItemClickListener,
ItemLongClickListener,
@@ -33,7 +33,7 @@ class MessagesPresenter(viewState: MessagesView) :
const val DEFAULT_MESSAGES_COUNT = 30
}
private lateinit var adapter: MessagesAdapter
private lateinit var adapter: MessagesAdapterDeprecated
private lateinit var conversation: VKConversation
private var peerId: Int = -1
@@ -65,7 +65,7 @@ class MessagesPresenter(viewState: MessagesView) :
}
private fun createAdapter() {
adapter = MessagesAdapter(context!!, arrayListOf(), conversation).also {
adapter = MessagesAdapterDeprecated(context!!, arrayListOf(), conversation).also {
it.itemClickListener = this
it.itemLongClickListener = this
}
app/src/main/java/com/meloda/fast/activity/ui/repository/MessagesRepository.kt → app/src/main/java/com/meloda/fast/activity/ui/repository/MessagesRepositoryDeprecated.kt
+1 -1
View File
@@ -18,7 +18,7 @@ import com.meloda.mvp.MvpOnLoadListener
import com.meloda.mvp.MvpRepository
import java.util.*
class MessagesRepository : MvpRepository<VKMessage>() {
class MessagesRepositoryDeprecated : MvpRepository<VKMessage>() {
fun loadMessages(
peerId: Int,
app/src/main/java/com/meloda/fast/activity/ui/view/MessagesView.kt → app/src/main/java/com/meloda/fast/activity/ui/view/MessagesViewDeprecated.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package com.meloda.fast.activity.ui.view
import com.meloda.fast.api.model.VKConversation
import com.meloda.mvp.MvpView
interface MessagesView : MvpView {
interface MessagesViewDeprecated : MvpView {
fun showChatPanel()