Merge remote-tracking branch 'origin/HEAD' into less_memory_test_branch

app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt

@@ -280,11 +280,6 @@ object LocalCache {
 
         note.loadEvent(event, author, awardDefinition)
 
-        // Counts the replies
-        awardees.forEach {
-            it.addBadgeAward(note)
-        }
-
         // Replies of an Badge Definition are Award Events
         awardDefinition.forEach {
             it.addReply(note)

app/src/main/java/com/vitorpamplona/amethyst/model/User.kt

@@ -46,9 +46,6 @@ class User(val pubkeyHex: String) {
     var privateChatrooms = mapOf<User, Chatroom>()
         private set
 
-    var badgeAwards = setOf<Note>()
-        private set
-
     var acceptedBadges: AddressableNote? = null
 
     fun pubkey() = Hex.decode(pubkeyHex)
@@ -142,18 +139,6 @@ class User(val pubkeyHex: String) {
         }
     }
 
-    fun addBadgeAward(note: Note) {
-        if (note !in badgeAwards) {
-            badgeAwards = badgeAwards + note
-            liveSet?.badges?.invalidateData()
-        }
-    }
-
-    fun removeBadgeAward(deleteNote: Note) {
-        badgeAwards = badgeAwards - deleteNote
-        liveSet?.badges?.invalidateData()
-    }
-
     fun updateAcceptedBadges(note: AddressableNote) {
         acceptedBadges = note
         liveSet?.badges?.invalidateData()

app/src/main/java/com/vitorpamplona/amethyst/service/NostrDataSource.kt

@@ -45,7 +45,7 @@ abstract class NostrDataSource(val debugName: String) {
 
     fun printCounter() {
         eventCounter.forEach {
-            println("AAA Count ${it.key}: ${it.value.counter}")
+            Log.d("STATE DUMP", "Received Events ${it.key}: ${it.value.counter}")
         }
     }
 

app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt

@@ -124,7 +124,7 @@ fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel)
                                             .joinToString { it.filter.toJson() }
                                         }"
                                     }.forEach {
-                                        Log.d("CURRENT FILTERS", it)
+                                        Log.d("STATE DUMP", it)
                                     }
 
                                     NostrAccountDataSource.printCounter()
@@ -143,14 +143,14 @@ fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel)
 
                                     NostrUserProfileDataSource.printCounter()
 
-                                    println("Connected Relays: " + RelayPool.connectedRelays())
+                                    Log.d("STATE DUMP", "Connected Relays: " + RelayPool.connectedRelays())
 
                                     val imageLoader = Coil.imageLoader(context)
-                                    println("Image Disk Cache ${(imageLoader.diskCache?.size ?: 0) / (1024 * 1024)}/${(imageLoader.diskCache?.maxSize ?: 0) / (1024 * 1024)} MB")
-                                    println("Image Memory Cache ${(imageLoader.memoryCache?.size ?: 0) / (1024 * 1024)}/${(imageLoader.memoryCache?.maxSize ?: 0) / (1024 * 1024)} MB")
+                                    Log.d("STATE DUMP", "Image Disk Cache ${(imageLoader.diskCache?.size ?: 0) / (1024 * 1024)}/${(imageLoader.diskCache?.maxSize ?: 0) / (1024 * 1024)} MB")
+                                    Log.d("STATE DUMP", "Image Memory Cache ${(imageLoader.memoryCache?.size ?: 0) / (1024 * 1024)}/${(imageLoader.memoryCache?.maxSize ?: 0) / (1024 * 1024)} MB")
 
-                                    println("Notes: " + LocalCache.notes.filter { it.value.event != null }.size + "/" + LocalCache.notes.size)
-                                    println("Users: " + LocalCache.users.filter { it.value.info?.latestMetadata != null }.size + "/" + LocalCache.users.size)
+                                    Log.d("STATE DUMP", "Notes: " + LocalCache.notes.filter { it.value.event != null }.size + "/" + LocalCache.notes.size)
+                                    Log.d("STATE DUMP", "Users: " + LocalCache.users.filter { it.value.info?.latestMetadata != null }.size + "/" + LocalCache.users.size)
                                 }
                             ) {
                                 Icon(

app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt

@@ -250,7 +250,7 @@ fun ListContent(
         Divider(thickness = 0.25.dp)
 
         IconRow(
-            title = "Backup Keys",
+            title = stringResource(R.string.backup_keys),
             icon = R.drawable.ic_key,
             tint = MaterialTheme.colors.onBackground,
             onClick = { backupDialogOpen = true }

app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt

@@ -45,6 +45,7 @@ import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
 import com.vitorpamplona.amethyst.service.model.LongTextNoteEvent
+import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.service.model.ReactionEvent
 import com.vitorpamplona.amethyst.service.model.ReportEvent
 import com.vitorpamplona.amethyst.service.model.RepostEvent
@@ -141,16 +142,18 @@ fun NoteCompose(
             modifier = modifier
                 .combinedClickable(
                     onClick = {
-                        if (noteEvent !is ChannelMessageEvent) {
-                            navController.navigate("Note/${note.idHex}") {
+                        if (noteEvent is ChannelMessageEvent) {
+                            baseChannel?.let {
+                                navController.navigate("Channel/${it.idHex}")
+                            }
+                        } else if (noteEvent is PrivateDmEvent) {
+                            navController.navigate("Room/${note.author?.pubkeyHex}") {
                                 launchSingleTop = true
                             }
                         } else {
-                            note
-                                .channel()
-                                ?.let {
-                                    navController.navigate("Channel/${it.idHex}")
-                                }
+                            navController.navigate("Note/${note.idHex}") {
+                                launchSingleTop = true
+                            }
                         }
                     },
                     onLongClick = { popupExpanded = true }

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountBackupDialog.kt

@@ -38,7 +38,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.ClipboardManager
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
@@ -132,12 +131,12 @@ private fun NSecCopyButton(
         contentPadding = PaddingValues(vertical = 6.dp, horizontal = 16.dp)
     ) {
         Icon(
-            tint = Color.White,
+            tint = MaterialTheme.colors.onPrimary,
             imageVector = Icons.Default.Key,
             contentDescription = stringResource(R.string.copies_the_nsec_id_your_password_to_the_clipboard_for_backup),
             modifier = Modifier.padding(end = 5.dp)
         )
-        Text("Copy Secret Key", color = MaterialTheme.colors.onBackground)
+        Text(stringResource(id = R.string.copy_my_secret_key), color = MaterialTheme.colors.onPrimary)
     }
 }