Beta 2 pre-release

Author: Troplo

.idea/codeStyles/Project.xml

@@ -6,17 +6,18 @@ plugins {
 
 android {
     namespace = "com.troplo.privateuploader"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         applicationId = "com.troplo.privateuploader"
         minSdk = 26
-        targetSdk = 33
+        targetSdk = 34
         versionCode = 1
-        versionName = "1.0"
+        versionName = "1.0.2"
         multiDexEnabled = true
         buildConfigField("String", "SERVER_URL", "\"https://privateuploader.com\"")
         buildConfigField("String", "BUILD_TIME", "\"${System.currentTimeMillis()}\"")
+        buildConfigField("Integer", "BETA_VERSION", "2")
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -61,6 +62,7 @@ android {
 
 dependencies {
     // TPU
+    implementation("androidx.compose.runtime:runtime-tracing:1.0.0-alpha03")
     implementation("io.coil-kt:coil-gif:2.4.0")
     implementation("io.coil-kt:coil-compose:2.4.0")
     implementation("com.github.X1nto:OverlappingPanelsCompose:1.2.0")
@@ -84,7 +86,7 @@ dependencies {
     implementation("androidx.navigation:navigation-compose:2.6.0")
 
     // Material Design 3
-    implementation("androidx.compose.material3:material3")
+    implementation("androidx.compose.material3:material3:1.2.0-alpha03")
     // For SwipeableState
     implementation("androidx.compose.material:material:1.4.3")
     // or only import the main APIs for the underlying toolkit systems,

.idea/codeStyles/codeStyleConfig.xml

@@ -3,6 +3,7 @@ package com.troplo.privateuploader
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
+import android.os.StrictMode
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.result.contract.ActivityResultContracts
@@ -18,11 +19,13 @@ import java.util.Collections
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
+       // if(BuildConfig.DEBUG) StrictMode.enableDefaults();
         val token = SessionManager(this).getAuthToken()
         var user: User? = null
 
         if(token != null) {
-            TpuApi.retrofitService.getUser(token).enqueue(object : retrofit2.Callback<User> {
+            TpuApi.init(token, this)
+            TpuApi.retrofitService.getUser().enqueue(object : retrofit2.Callback<User> {
                 override fun onResponse(
                     call: retrofit2.Call<User>,
                     response: retrofit2.Response<User>
@@ -50,6 +53,7 @@ class MainActivity : ComponentActivity() {
                 }
             })
         } else {
+            TpuApi.init("", this)
             setContent {
                 PrivateUploaderTheme {
                     MainScreen(user)

app/build.gradle.kts

@@ -24,9 +24,10 @@ import androidx.navigation.compose.rememberNavController
 import com.troplo.privateuploader.api.ChatStore
 import com.troplo.privateuploader.api.SessionManager
 import com.troplo.privateuploader.api.SocketHandler
-import com.troplo.privateuploader.api.UserHandler
+import com.troplo.privateuploader.api.stores.UserStore
 import com.troplo.privateuploader.components.chat.MemberSidebar
 import com.troplo.privateuploader.components.core.BottomBarNav
+import com.troplo.privateuploader.components.core.ConnectingBanner
 import com.troplo.privateuploader.components.core.NavGraph
 import com.troplo.privateuploader.components.core.NavRoute
 import com.troplo.privateuploader.components.core.OverlappingPanels
@@ -43,11 +44,12 @@ fun MainScreen(user: User?) {
     val token = SessionManager(context).getAuthToken()
     if (token != null) {
         SocketHandler.initializeSocket(token, context)
-        UserHandler.initializeUser(token)
+        UserStore.initializeUser(token)
     }
     val navController = rememberNavController()
     val panelState = rememberOverlappingPanelsState()
     var closePanels by remember { mutableStateOf(false) }
+    // track socket connection status
     val closePanelsFunc = {
         closePanels = true
     }
@@ -58,13 +60,18 @@ fun MainScreen(user: User?) {
         }
     }
     Scaffold(
-        topBar = { TopBarNav(navController =  navController, user = user) },
+        topBar = {
+            if(!SocketHandler.connected.value) {
+                ConnectingBanner()
+            }
+            TopBarNav(navController =  navController, user = user)
+         },
         bottomBar = { BottomBarNav(navController = navController, panelState = panelState, closePanels = closePanelsFunc) },
     ) { paddingValues ->
         OverlappingPanels(
             modifier = Modifier.fillMaxSize(),
             panelsState = panelState,
-            gesturesEnabled = true,
+            gesturesEnabled = navController.currentDestination?.route?.startsWith("chat/") == true,
             panelStart = {
                 PanelSurface {
                     ModalDrawerSheet(