From 3519e20a98d7c8191cf964a16a2310a774ea85ba Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Fri, 5 May 2023 18:48:37 -0400 Subject: [PATCH 1/4] BugFix for the empty selection --- .../vitorpamplona/amethyst/ui/navigation/AppTopBar.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt index 4415e4648..5aeb3a5f9 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt @@ -48,6 +48,7 @@ import com.vitorpamplona.amethyst.model.Account import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS import com.vitorpamplona.amethyst.model.KIND3_FOLLOWS import com.vitorpamplona.amethyst.model.LocalCache +import com.vitorpamplona.amethyst.model.User import com.vitorpamplona.amethyst.service.NostrAccountDataSource import com.vitorpamplona.amethyst.service.NostrChannelDataSource import com.vitorpamplona.amethyst.service.NostrChatroomDataSource @@ -87,7 +88,7 @@ fun AppTopBar(navController: NavHostController, scaffoldState: ScaffoldState, ac @Composable fun StoriesTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) { GenericTopBar(scaffoldState, accountViewModel) { account -> - FollowList(account.defaultStoriesFollowList, true) { listName -> + FollowList(account.defaultStoriesFollowList, account.userProfile(),true) { listName -> account.changeDefaultStoriesFollowList(listName) } } @@ -96,7 +97,7 @@ fun StoriesTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewMod @Composable fun HomeTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) { GenericTopBar(scaffoldState, accountViewModel) { account -> - FollowList(account.defaultHomeFollowList, false) { listName -> + FollowList(account.defaultHomeFollowList, account.userProfile(),false) { listName -> account.changeDefaultHomeFollowList(listName) } } @@ -226,7 +227,7 @@ private fun LoggedInUserPictureDrawer( } @Composable -fun FollowList(listName: String, withGlobal: Boolean, onChange: (String) -> Unit) { +fun FollowList(listName: String, loggedIn: User, withGlobal: Boolean, onChange: (String) -> Unit) { // Notification val dbState = LocalCache.live.observeAsState() val db = dbState.value ?: return @@ -254,7 +255,7 @@ fun FollowList(listName: String, withGlobal: Boolean, onChange: (String) -> Unit } SimpleTextSpinner( - placeholder = followLists.firstOrNull { it.first == listName }?.first ?: KIND3_FOLLOWS, + placeholder = followLists.firstOrNull { it.first == listName }?.second ?: "Select an Option", options = followNames.value, onSelect = { onChange(followLists.getOrNull(it)?.first ?: KIND3_FOLLOWS) From 0c673e91c6dd8f5930015d20bb58ecb10da15b19 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Fri, 5 May 2023 18:49:13 -0400 Subject: [PATCH 2/4] BugFix for displaying other people's list after loading them from their profile --- .../com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt index 5aeb3a5f9..3cc324086 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt @@ -88,7 +88,7 @@ fun AppTopBar(navController: NavHostController, scaffoldState: ScaffoldState, ac @Composable fun StoriesTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) { GenericTopBar(scaffoldState, accountViewModel) { account -> - FollowList(account.defaultStoriesFollowList, account.userProfile(),true) { listName -> + FollowList(account.defaultStoriesFollowList, account.userProfile(), true) { listName -> account.changeDefaultStoriesFollowList(listName) } } @@ -97,7 +97,7 @@ fun StoriesTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewMod @Composable fun HomeTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) { GenericTopBar(scaffoldState, accountViewModel) { account -> - FollowList(account.defaultHomeFollowList, account.userProfile(),false) { listName -> + FollowList(account.defaultHomeFollowList, account.userProfile(), false) { listName -> account.changeDefaultHomeFollowList(listName) } } @@ -245,7 +245,7 @@ fun FollowList(listName: String, loggedIn: User, withGlobal: Boolean, onChange: followLists = defaultOptions + LocalCache.addressables.mapNotNull { val event = (it.value.event as? PeopleListEvent) // Has to have an list - if (event != null && (event.tags.size > 1 || event.content.length > 50)) { + if (event != null && event.pubKey == loggedIn.pubkeyHex && (event.tags.size > 1 || event.content.length > 50)) { Pair(event.dTag(), event.dTag()) } else { null From 635279d59af22313d48a7d54509a9f66f5c04973 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Fri, 5 May 2023 18:49:32 -0400 Subject: [PATCH 3/4] Testing removing the gradient of quoted posts. --- .../vitorpamplona/amethyst/ui/components/RichTextViewer.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt index 31d03d4a5..b2b0e7824 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt @@ -380,8 +380,7 @@ fun BechLink(word: String, canPreview: Boolean, backgroundColor: Color, accountV MaterialTheme.colors.onSurface.copy(alpha = 0.12f), RoundedCornerShape(15.dp) ), - parentBackgroundColor = MaterialTheme.colors.onSurface.copy(alpha = 0.05f) - .compositeOver(backgroundColor), + parentBackgroundColor = backgroundColor, isQuotedNote = true, navController = navController ) @@ -530,8 +529,7 @@ fun TagLink(word: String, tags: List>, canPreview: Boolean, backgro MaterialTheme.colors.onSurface.copy(alpha = 0.12f), RoundedCornerShape(15.dp) ), - parentBackgroundColor = MaterialTheme.colors.onSurface.copy(alpha = 0.05f) - .compositeOver(backgroundColor), + parentBackgroundColor = backgroundColor, isQuotedNote = true, navController = navController ) From e3ccf71a84c190926562c6c5709e4dbe2b5acca7 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Fri, 5 May 2023 18:50:19 -0400 Subject: [PATCH 4/4] v0.42.5 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 60f23a644..bfcfb4b40 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,8 @@ android { applicationId "com.vitorpamplona.amethyst" minSdk 26 targetSdk 33 - versionCode 146 - versionName "0.42.4" + versionCode 147 + versionName "0.42.5" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables {