Refactor UI components

.github/workflows/android.yml

@@ -19,10 +19,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'zulu'
           cache: 'gradle'
 

app/src/main/java/com/xinto/opencord/di/StoreModule.kt

@@ -15,4 +15,5 @@ val storeModule = module {
     singleOf(::SessionStoreImpl) bind SessionStore::class
     singleOf(::UnreadStoreImpl) bind UnreadStore::class
     singleOf(::ReactionStoreImpl) bind ReactionStore::class
+    singleOf(::PersistentDataStoreImpl) bind PersistentDataStore::class
 }

app/src/main/java/com/xinto/opencord/di/ViewModelModule.kt

@@ -1,17 +1,23 @@
 package com.xinto.opencord.di
 
-import com.xinto.opencord.ui.viewmodel.*
+import com.xinto.opencord.ui.screens.home.panels.channel.HomeChannelsPanelViewModel
+import com.xinto.opencord.ui.screens.home.panels.chat.HomeChatPanelViewModel
+import com.xinto.opencord.ui.screens.home.panels.guild.GuildsViewModel
+import com.xinto.opencord.ui.screens.home.panels.messagemenu.HomeMessageMenuPanelViewModel
+import com.xinto.opencord.ui.screens.home.panels.user.HomeUserPanelViewModel
+import com.xinto.opencord.ui.screens.login.LoginViewModel
+import com.xinto.opencord.ui.screens.mentions.MentionsViewModel
+import com.xinto.opencord.ui.screens.pins.PinsScreenViewModel
 import org.koin.androidx.viewmodel.dsl.viewModelOf
 import org.koin.dsl.module
 
 val viewModelModule = module {
     viewModelOf(::LoginViewModel)
-    viewModelOf(::ChatViewModel)
+    viewModelOf(::HomeChatPanelViewModel)
     viewModelOf(::GuildsViewModel)
-    viewModelOf(::ChannelsViewModel)
-    viewModelOf(::ChannelPinsViewModel)
-    viewModelOf(::CurrentUserViewModel)
-    viewModelOf(::MessageMenuViewModel)
+    viewModelOf(::HomeChannelsPanelViewModel)
+    viewModelOf(::PinsScreenViewModel)
+    viewModelOf(::HomeUserPanelViewModel)
+    viewModelOf(::HomeMessageMenuPanelViewModel)
     viewModelOf(::MentionsViewModel)
-    viewModelOf(::ChatInputViewModel)
 }

app/src/main/java/com/xinto/opencord/store/PersistentDataStore.kt

@@ -0,0 +1,95 @@
+package com.xinto.opencord.store
+
+import android.content.Context
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.longPreferencesKey
+import androidx.datastore.preferences.core.stringSetPreferencesKey
+import androidx.datastore.preferences.preferencesDataStore
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+
+interface PersistentDataStore {
+
+    fun observeCurrentGuild(): Flow<Long>
+    fun observeCurrentChannel(): Flow<Long>
+    fun observeCollapsedCategories(): Flow<List<Long>>
+
+    suspend fun updateCurrentGuild(guildId: Long)
+    suspend fun updateCurrentChannel(channelId: Long)
+    suspend fun toggleCategory(categoryId: Long)
+    suspend fun collapseCategory(categoryId: Long)
+    suspend fun expandCategory(categoryId: Long)
+
+}
+
+class PersistentDataStoreImpl(
+    private val context: Context
+) : PersistentDataStore {
+
+    private val Context.dataStore by preferencesDataStore("persistent")
+
+    override fun observeCurrentGuild(): Flow<Long> {
+        return context.dataStore.data.map { preferences ->
+            preferences[CURRENT_GUILD_KEY] ?: 0L
+        }
+    }
+
+    override fun observeCurrentChannel(): Flow<Long> {
+        return context.dataStore.data.map { preferences ->
+            preferences[CURRENT_CHANNEL_KEY] ?: 0L
+        }
+    }
+
+    override fun observeCollapsedCategories(): Flow<List<Long>> {
+        return context.dataStore.data.map { preferences ->
+            (preferences[COLLAPSED_CATEGORIES_KEY] ?: emptySet()).mapNotNull {
+                it.toLongOrNull()
+            }
+        }
+    }
+
+    override suspend fun updateCurrentGuild(guildId: Long) {
+        context.dataStore.edit { preferences ->
+            preferences[CURRENT_GUILD_KEY] = guildId
+        }
+    }
+
+    override suspend fun updateCurrentChannel(channelId: Long) {
+        context.dataStore.edit { preferences ->
+            preferences[CURRENT_CHANNEL_KEY] = channelId
+        }
+    }
+
+    override suspend fun toggleCategory(categoryId: Long) {
+        context.dataStore.edit { preferences ->
+            val current = preferences[COLLAPSED_CATEGORIES_KEY] ?: emptySet()
+            val stringCategoryId = categoryId.toString()
+            if (current.contains(stringCategoryId))  {
+                preferences[COLLAPSED_CATEGORIES_KEY] = current - stringCategoryId
+            } else {
+                preferences[COLLAPSED_CATEGORIES_KEY] = current + stringCategoryId
+            }
+        }
+    }
+
+    override suspend fun expandCategory(categoryId: Long) {
+        context.dataStore.edit { preferences ->
+            val current = preferences[COLLAPSED_CATEGORIES_KEY] ?: emptySet()
+            preferences[COLLAPSED_CATEGORIES_KEY] = current - categoryId.toString()
+        }
+    }
+
+    override suspend fun collapseCategory(categoryId: Long) {
+        context.dataStore.edit { preferences ->
+            val current = preferences[COLLAPSED_CATEGORIES_KEY] ?: emptySet()
+            preferences[COLLAPSED_CATEGORIES_KEY] = current + categoryId.toString()
+        }
+    }
+
+    private companion object {
+        val CURRENT_GUILD_KEY = longPreferencesKey("CURRENT_GULD")
+        val CURRENT_CHANNEL_KEY = longPreferencesKey("CURRENT_CHANNEL")
+        val COLLAPSED_CATEGORIES_KEY = stringSetPreferencesKey("COLLAPSED_CATEGORIES")
+    }
+
+}

app/src/main/java/com/xinto/opencord/ui/AppActivity.kt

@@ -87,33 +87,29 @@ class AppActivity : ComponentActivity() {
                             modifier = Modifier
                                 .fillMaxSize()
                                 .imePadding(),
-                            onPinsClick = { nav.navigate(AppDestination.Pins(data = it)) },
-                            onSettingsClick = { nav.navigate(AppDestination.Settings) },
-                            onMentionsClick = { nav.navigate(AppDestination.Mentions) },
-                            onFriendsClick = { /* TODO */ },
-                            onSearchClick = { /* TODO */ },
+                            navigator = nav,
                         )
 
                         AppDestination.Settings -> Settings(
                             modifier = Modifier
                                 .fillMaxSize()
                                 .imePadding(),
-                            onBackClick = { nav.back() },
+                            navigator = nav,
                         )
 
                         AppDestination.Mentions -> MentionsScreen(
                             modifier = Modifier
                                 .fillMaxSize()
                                 .imePadding(),
-                            onBackClick = { nav.back() },
+                            navigator = nav,
                         )
 
                         is AppDestination.Pins -> PinsScreen(
                             data = dest.data,
                             modifier = Modifier
                                 .fillMaxSize()
                                 .imePadding(),
-                            onBackClick = { nav.back() },
+                            navigator = nav,
                         )
                     }
                 }

app/src/main/java/com/xinto/opencord/ui/navigation/AppDestination.kt

@@ -9,6 +9,8 @@ import dev.olshevski.navigation.reimagined.pop
 import dev.olshevski.navigation.reimagined.replaceAll
 import kotlinx.parcelize.Parcelize
 
+typealias AppNavigator = NavController<AppDestination>
+
 @Parcelize
 sealed interface AppDestination : Parcelable {
     @Parcelize

app/src/main/java/com/xinto/opencord/ui/screens/SettingsScreen.kt

@@ -9,6 +9,19 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import com.xinto.opencord.R
+import com.xinto.opencord.ui.navigation.AppNavigator
+import dev.olshevski.navigation.reimagined.pop
+
+@Composable
+fun Settings(
+    modifier: Modifier = Modifier,
+    navigator: AppNavigator
+) {
+    Settings(
+        modifier = modifier,
+        onBackClick = { navigator.pop() }
+    )
+}
 
 @Composable
 fun Settings(

app/src/main/java/com/xinto/opencord/ui/screens/home/HomeScreen.kt

@@ -4,8 +4,17 @@ import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBarsPadding
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -15,22 +24,40 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
+import com.xinto.opencord.ui.navigation.AppDestination
+import com.xinto.opencord.ui.navigation.AppNavigator
 import com.xinto.opencord.ui.navigation.PinsScreenData
 import com.xinto.opencord.ui.screens.home.panels.HomeNavButtons
-import com.xinto.opencord.ui.screens.home.panels.channel.ChannelsList
-import com.xinto.opencord.ui.screens.home.panels.chat.Chat
-import com.xinto.opencord.ui.screens.home.panels.currentuser.CurrentUser
-import com.xinto.opencord.ui.screens.home.panels.guild.GuildsList
+import com.xinto.opencord.ui.screens.home.panels.channel.HomeChannelsPanel
+import com.xinto.opencord.ui.screens.home.panels.chat.HomeChatPanel
+import com.xinto.opencord.ui.screens.home.panels.guild.HomeGuildsPanel
 import com.xinto.opencord.ui.screens.home.panels.member.MembersList
+import com.xinto.opencord.ui.screens.home.panels.user.HomeUserPanel
 import com.xinto.opencord.ui.util.animateCornerBasedShapeAsState
-import com.xinto.opencord.ui.viewmodel.ChannelsViewModel
-import com.xinto.opencord.ui.viewmodel.ChatViewModel
-import com.xinto.opencord.ui.viewmodel.CurrentUserViewModel
-import com.xinto.opencord.ui.viewmodel.GuildsViewModel
+import dev.olshevski.navigation.reimagined.navigate
+import dev.olshevski.navigation.reimagined.popUpTo
 import io.github.materiiapps.panels.SwipePanels
 import io.github.materiiapps.panels.SwipePanelsValue
 import io.github.materiiapps.panels.rememberSwipePanelsState
-import org.koin.androidx.compose.getViewModel
+
+@Composable
+fun HomeScreen(
+    modifier: Modifier = Modifier,
+    navigator: AppNavigator,
+) {
+    HomeScreen(
+        modifier = modifier,
+        onSettingsClick = {
+            navigator.navigate(AppDestination.Settings)
+        },
+        onPinsClick = {
+            navigator.navigate(AppDestination.Pins(it))
+        },
+        onSearchClick = { /*TODO*/ },
+        onMentionsClick = { navigator.navigate(AppDestination.Mentions) },
+        onFriendsClick = { /*TODO*/ },
+    )
+}
 
 @Composable
 fun HomeScreen(
@@ -41,12 +68,6 @@ fun HomeScreen(
     onFriendsClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    val currentUserViewModel: CurrentUserViewModel = getViewModel()
-    val chatViewModel: ChatViewModel = getViewModel()
-    val guildsViewModel: GuildsViewModel = getViewModel()
-    val channelsViewModel: ChannelsViewModel = getViewModel()
-
-    val channelsListState = rememberLazyListState()
     val panelState = rememberSwipePanelsState()
 
     BackHandler(enabled = panelState.currentValue != SwipePanelsValue.Center) {
@@ -71,28 +92,22 @@ fun HomeScreen(
                 Row(
                     modifier = Modifier.weight(1f),
                 ) {
-                    GuildsList(
+                    HomeGuildsPanel(
                         modifier = Modifier
                             .fillMaxHeight()
                             .width(72.dp),
-                        onGuildSelect = channelsViewModel::load,
-                        viewModel = guildsViewModel,
                     )
-                    ChannelsList(
+                    HomeChannelsPanel(
                         modifier = Modifier
                             .fillMaxHeight()
                             .weight(1f),
-                        onChannelSelect = chatViewModel::load,
-                        viewModel = channelsViewModel,
-                        lazyListState = channelsListState,
                     )
                 }
-                CurrentUser(
+                HomeUserPanel(
                     modifier = Modifier
                         .fillMaxWidth()
                         .padding(start = 6.dp),
-                    viewModel = currentUserViewModel,
-                    onSettingsClick = onSettingsClick,
+                    onSettingsClick = onSettingsClick
                 )
             }
 
@@ -119,16 +134,17 @@ fun HomeScreen(
                 },
             )
 
-            Chat(
-                onChannelsButtonClick = panelState::openStart,
-                onMembersButtonClick = panelState::openEnd,
-                onPinsButtonClick = {
-                    onPinsClick(PinsScreenData(channelsViewModel.selectedChannelId))
-                },
-                viewModel = chatViewModel,
+            HomeChatPanel(
                 modifier = Modifier
                     .fillMaxSize()
                     .clip(centerPanelShape),
+                onPinsButtonClick = onPinsClick,
+                onMembersButtonClick = {
+                    panelState.openEnd()
+                },
+                onChannelsButtonClick = {
+                    panelState.openStart()
+                }
             )
 
         },