another update

Author: Troplo

app/build.gradle.kts

@@ -10,7 +10,7 @@ android {
 
     defaultConfig {
         applicationId = "com.troplo.privateuploader"
-        minSdk = 24
+        minSdk = 26
         targetSdk = 33
         versionCode = 1
         versionName = "1.0"

app/release/app-release.aab

@@ -20,6 +20,7 @@ class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         val token = SessionManager(this).fetchAuthToken()
         var user: User? = null
+
         if(token != null) {
             TpuApi.retrofitService.getUser(token).enqueue(object : retrofit2.Callback<User> {
                 override fun onResponse(

app/src/main/ic_launcher-playstore.png

@@ -25,7 +25,7 @@ fun MainScreen(user: User?) {
     val context = LocalContext.current
     val token = SessionManager(context).fetchAuthToken()
     if (token != null) {
-        SocketHandler.initializeSocket(token)
+        SocketHandler.initializeSocket(token, context)
         UserHandler.initializeUser(token)
     }
     val navController = rememberNavController()

app/src/main/java/com/troplo/privateuploader/MainActivity.kt

@@ -32,6 +32,9 @@ object TpuFunctions {
   }
 
     fun formatDate(date: Date?): CharSequence? {
-        return DateFormat.format("dd MMMM yyyy, h:mm a", date)
+        if(DateFormat.format("dd MMMM yyyy", date) == DateFormat.format("dd MMMM yyyy", Date())) {
+            return DateFormat.format("hh:mm:ss a", date)
+        }
+        return DateFormat.format("dd MMMM yyyy, hh:mm:ss a", date)
     }
 }

app/src/main/java/com/troplo/privateuploader/MainScreen.kt

@@ -1,10 +1,23 @@
 package com.troplo.privateuploader.api
 
+import android.app.Notification
+import android.app.NotificationManager
+import android.app.PendingIntent
 import android.content.Context
+import android.content.Intent
+import android.graphics.drawable.Icon
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Reply
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.app.RemoteInput
+import androidx.core.content.ContextCompat.getSystemService
+import com.google.gson.Gson
+import com.troplo.privateuploader.R
+import com.troplo.privateuploader.data.model.MessageEvent
 import io.socket.client.IO
-import io.socket.client.Manager
 import io.socket.client.Socket
-import java.net.URI
+import org.json.JSONObject
 import java.net.URISyntaxException
 import java.util.Collections
 
@@ -13,8 +26,9 @@ object SocketHandler {
   private const val SERVER_URL = "http://192.168.0.12:34582" // Replace with your Socket.io server URL
 
   private var socket: Socket? = null
+  private val gson = Gson()
 
-  fun initializeSocket(token: String) {
+  fun initializeSocket(token: String, context: Context) {
     try {
       val options = IO.Options()
       options.forceNew = true
@@ -32,10 +46,51 @@ object SocketHandler {
         socket?.on(Socket.EVENT_CONNECT_ERROR) {
           println("Socket connect error ${socket?.isActive}")
         }
-        // socket on any other events
-        socket?.on("message") {
-          println("Socket $it")
-        }
+        /*socket?.on("message") {
+          val jsonArray = it[0] as JSONObject
+          val payload = jsonArray.toString()
+          val messageEvent = gson.fromJson(payload, MessageEvent::class.java)
+
+          val message = messageEvent.message
+
+          val notificationBuilder = NotificationCompat.Builder(context, "communications")
+            .setSmallIcon(R.drawable.ic_launcher_foreground)
+            .setContentTitle(message.user?.username)
+            .setContentText(message.content)
+            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+            .setContentIntent(null)
+
+          val remoteInput: RemoteInput = RemoteInput.Builder("reply").run {
+            setLabel("Reply")
+            build()
+          }
+
+        /*  val replyPendingIntent: PendingIntent =
+            PendingIntent.getBroadcast(
+              context,
+              messageEvent.association.id,
+              getMessageReplyIntent(messageEvent.association.id),
+              PendingIntent.FLAG_MUTABLE
+            )
+
+          val action: NotificationCompat.Action =
+            NotificationCompat.Action.Builder(
+              null,
+              "Reply",
+              replyPendingIntent
+            )
+              .addRemoteInput(remoteInput)
+              .build()
+*/
+          val newMessageNotification = Notification.Builder(context, "communications")
+            .setSmallIcon(R.drawable.ic_launcher_foreground)
+            .setContentTitle(message.user?.username)
+            .setContentText(message.content)
+            .build()
+          val notificationManager: NotificationManager =
+            context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            notificationManager.notify(message.id, newMessageNotification)
+        }*/
         println("Socket connected ${socket?.isActive}")
       } else {
         println("Socket is null")
@@ -45,6 +100,14 @@ object SocketHandler {
     }
   }
 
+  private fun getMessageReplyIntent(associationId: Int): Intent {
+    return Intent()
+      .addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES)
+      .setAction("reply")
+      .putExtra("associationId", associationId)
+  }
+
+
   fun getSocket(): Socket? {
     return socket
   }

app/src/main/java/com/troplo/privateuploader/api/Functions.kt

@@ -7,5 +7,5 @@ class TpuConfig (private val sharedPref: SharedPreferences) {
     get() = sharedPref.getString("token", null)
     set(value) = sharedPref.edit().putString("token", value).apply()
 
-  var instance: String? = "http://192.168.0.12:34582"
+  var instance: String? = "https://privateuploader.com"
 }

app/src/main/java/com/troplo/privateuploader/api/SocketHandler.kt

@@ -82,15 +82,16 @@ fun Message(@PreviewParameter(
             if (normal) {
                 UserAvatar(
                     avatar = message.user?.avatar,
-                    username = message.user?.username ?: "Deleted User"
+                    username = message.user?.username ?: "Deleted User",
+                    modifier = Modifier.align(Alignment.Top)
                 )
             }
             if (!normal) {
                 Spacer(modifier = Modifier.width(40.dp))
             }
             Column(modifier = Modifier.padding(start = 8.dp)) {
                 if (normal) {
-                    Row(verticalAlignment = Alignment.CenterVertically) {
+                    Row {
                         Text(
                             text = message.user?.username ?: "Deleted User",
                             style = MaterialTheme.typography.bodyMedium,

app/src/main/java/com/troplo/privateuploader/api/TpuConfig.kt

@@ -1,5 +1,20 @@
 package com.troplo.privateuploader.components.core
 
+import com.troplo.privateuploader.api.ChatStore
+import com.troplo.privateuploader.api.TpuFunctions
+import com.troplo.privateuploader.data.model.Chat
+
+fun getCurrentRouteTitle(route: String): String {
+    return when (route) {
+        NavRoute.Home.path -> "Chat"
+        NavRoute.Gallery.path -> "Gallery"
+        NavRoute.Settings.path -> "Settings"
+        NavRoute.SettingsUpload.path -> "Upload"
+        NavRoute.Chat.path -> "Chat"
+        else -> "PrivateUploader"
+    }
+}
+
 sealed class NavRoute(val path: String) {
     object Login: NavRoute("login")
     object Home: NavRoute("home")

app/src/main/java/com/troplo/privateuploader/components/chat/Message.kt

@@ -52,7 +52,7 @@ fun TopBarNav(navController: NavController, user: User?) {
         },
         title = {
             Text(
-                "${navBackStackEntry?.destination?.route} (TPUvNATIVE)" ?: "PrivateUploader",
+                text = getCurrentRouteTitle(currentRoute),
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis
             )

app/src/main/java/com/troplo/privateuploader/components/core/NavRoute.kt

@@ -22,6 +22,7 @@ import com.troplo.privateuploader.api.TpuFunctions
 fun UserAvatar(
     avatar: String?,
     username: String,
+    modifier: Modifier = Modifier,
 ) {
     if(avatar != null) {
         GlideImage(
@@ -30,6 +31,7 @@ fun UserAvatar(
             modifier = Modifier
                 .size(40.dp)
                 .clip(CircleShape)
+                .then(modifier)
         )
     } else {
         Column(
@@ -39,6 +41,7 @@ fun UserAvatar(
                 .size(40.dp)
                 .background(MaterialTheme.colorScheme.primary, CircleShape)
                 .clip(CircleShape)
+                .then(modifier)
         ) {
             Text(
                 text = username.first().toString(),

app/src/main/java/com/troplo/privateuploader/components/core/TopNav.kt

@@ -11,7 +11,7 @@ data class Message(
   @field:Json(name = "userId") val userId: Int,
   @field:Json(name = "content") val content: String,
   @field:Json(name = "type") val type: String,
-  @field:Json(name = "embeds") val embeds: List<Embed>,
+  @field:Json(name = "embeds") var embeds: List<Embed>,
   @field:Json(name = "edited") val edited: Boolean,
   @field:Json(name = "editedAt") val editedAt: String?,
   @field:Json(name = "replyId") val replyId: Int?,
@@ -63,4 +63,9 @@ data class EmbedResolutionEvent(
   @field:Json(name = "chatId") val chatId: Int,
   @field:Json(name = "id") val id: Int,
   @field:Json(name = "embeds") val embeds: List<Embed>
+)
+
+data class EmbedFail(
+  val data: EmbedResolutionEvent,
+  val retries: Int
 )