Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove RecyclerView from MainActivity

Browse source
This commit is contained in:
Alex Sytnyk 2018-06-27 11:26:15 +03:00
parent 7e2a2d9ea3
commit 4bf25a499b
2 changed files with 5 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
OsmAnd-telegram/res/layout/activity_main.xml
View file

@ -13,18 +13,10 @@
android:layout_height="0dp"
android:layout_weight="1">
<android.support.v7.widget.RecyclerView
android:id="@+id/groups_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="vertical"
android:visibility="gone"/>
<net.osmand.telegram.ui.views.LockableViewPager
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="visible"/>
android:layout_height="match_parent"/>
<android.support.v7.widget.AppCompatImageView
android:layout_width="match_parent"
@ -40,7 +32,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/card_bg_color"
android:visibility="visible"
app:itemBackground="?attr/card_bg_color"
app:menu="@menu/bottom_navigation_menu"/>

49
OsmAnd-telegram/src/net/osmand/telegram/ui/MainActivity.kt
View file

@ -12,7 +12,10 @@ import android.support.design.widget.BottomNavigationView
import android.support.v4.app.*
import android.support.v7.app.AlertDialog
import android.support.v7.app.AppCompatActivity
import android.support.v7.widget.*
import android.support.v7.widget.AppCompatImageView
import android.support.v7.widget.AppCompatTextView
import android.support.v7.widget.RecyclerView
import android.support.v7.widget.SwitchCompat
import android.view.*
import android.widget.Toast
import net.osmand.PlatformUtil
@ -42,10 +45,6 @@ class MainActivity : AppCompatActivity(), TelegramListener {
private var telegramAuthorizationRequestHandler: TelegramAuthorizationRequestHandler? = null
private var paused: Boolean = false
private lateinit var chatsView: RecyclerView
private lateinit var chatViewAdapter: ChatsAdapter
private lateinit var chatViewManager: RecyclerView.LayoutManager
private val app: TelegramApplication
get() = application as TelegramApplication
@ -61,19 +60,6 @@ class MainActivity : AppCompatActivity(), TelegramListener {
paused = false
chatViewManager = LinearLayoutManager(this)
chatViewAdapter = ChatsAdapter()
chatsView = findViewById<RecyclerView>(R.id.groups_view).apply {
//setHasFixedSize(true)
// use a linear layout manager
layoutManager = chatViewManager
// specify an viewAdapter (see also next example)
adapter = chatViewAdapter
}
val viewPager = findViewById<LockableViewPager>(R.id.view_pager).apply {
swipeLocked = true
offscreenPageLimit = 2
@ -132,7 +118,6 @@ class MainActivity : AppCompatActivity(), TelegramListener {
invalidateOptionsMenu()
updateTitle()
updateChatsList()
if (settings.hasAnyChatToShareLocation() && !AndroidUtils.isLocationPermissionAvailable(this)) {
requestLocationPermission()
@ -172,16 +157,6 @@ class MainActivity : AppCompatActivity(), TelegramListener {
invalidateOptionsMenu()
updateTitle()
when (newTelegramAuthorizationState) {
TelegramAuthorizationState.READY -> {
updateChatsList()
}
TelegramAuthorizationState.CLOSED,
TelegramAuthorizationState.UNKNOWN -> {
chatViewAdapter.chats = emptyList()
}
else -> Unit
}
listeners.forEach {
it.get()?.onTelegramStatusChanged(prevTelegramAuthorizationState, newTelegramAuthorizationState)
}
@ -191,21 +166,18 @@ class MainActivity : AppCompatActivity(), TelegramListener {
override fun onTelegramChatsRead() {
runOnUi {
removeNonexistingChatsFromSettings()
updateChatsList()
listeners.forEach { it.get()?.onTelegramChatsRead() }
}
}
override fun onTelegramChatsChanged() {
runOnUi {
updateChatsList()
listeners.forEach { it.get()?.onTelegramChatsChanged() }
}
}
override fun onTelegramChatChanged(chat: TdApi.Chat) {
runOnUi {
updateChatsList()
listeners.forEach { it.get()?.onTelegramChatChanged(chat) }
}
}
@ -240,18 +212,6 @@ class MainActivity : AppCompatActivity(), TelegramListener {
settings.removeNonexistingChats(presentChatTitles)
}
private fun updateChatsList() {
val chatList = telegramHelper.getChatList()
val chats: MutableList<TdApi.Chat> = mutableListOf()
for (orderedChat in chatList) {
val chat = telegramHelper.getChat(orderedChat.chatId)
if (chat != null) {
chats.add(chat)
}
}
chatViewAdapter.chats = chats
}
fun loginTelegram() {
if (telegramHelper.getTelegramAuthorizationState() != TelegramAuthorizationState.CLOSED) {
telegramHelper.logout()
@ -378,7 +338,6 @@ class MainActivity : AppCompatActivity(), TelegramListener {
} else {
settings.stopSharingLocationToChats()
app.shareLocationHelper.stopSharingLocation()
updateChatsList()
}
if (settings.hasAnyChatToShowOnMap() && osmandHelper.isOsmandNotInstalled()) {
showOsmandMissingDialog()