Commit Graph

769 Commits

Author SHA1 Message Date
Vitor Pamplona b93f28f09d Merge branch 'main' into less_memory_test_branch
# Conflicts:
#	app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
#	app/src/main/java/com/vitorpamplona/amethyst/service/model/LongTextNoteEvent.kt
#	app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt
2023-03-08 17:47:34 -05:00
Vitor Pamplona 38df1ba6f7 Merge commit '40a6feab8a4a36813644c19ca034333b73e98132' into less_memory_test_branch 2023-03-08 17:35:30 -05:00
Vitor Pamplona 6c9aa9b6ff Merge commit '9c7a5b73b3a75a465f78c1d97726e66f0e3032a3' into less_memory_test_branch 2023-03-08 17:35:21 -05:00
Vitor Pamplona 26b581b13c Merge commit 'a41f2c38ec9683f0e9aaca3e4cffb2cd45f21145' into less_memory_test_branch 2023-03-08 17:34:40 -05:00
Vitor Pamplona 6a3cae1c8d Merge commit 'c7ba0bce5bbc3edd8ece9669751b110d59c40052' into less_memory_test_branch 2023-03-08 17:34:29 -05:00
Vitor Pamplona 8c25667d0f Organize imports to simplify merge 2023-03-08 17:29:36 -05:00
Vitor Pamplona 6acc842d4f Readding LocalCacheImport 2023-03-08 17:18:25 -05:00
Vitor Pamplona fc4b68b264 Merge commit 'f1b6927bb37d1c9887fb48aa5655a6d2df558e81' into less_memory_test_branch
# Conflicts:
#	app/src/androidTest/java/com/vitorpamplona/amethyst/UrlUserTagTransformationTest.kt
#	app/src/main/java/com/vitorpamplona/amethyst/ServiceManager.kt
#	app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
#	app/src/main/java/com/vitorpamplona/amethyst/model/User.kt
#	app/src/main/java/com/vitorpamplona/amethyst/service/NostrHomeDataSource.kt
#	app/src/main/java/com/vitorpamplona/amethyst/service/model/ChannelCreateEvent.kt
#	app/src/main/java/com/vitorpamplona/amethyst/service/model/ContactListEvent.kt
#	app/src/main/java/com/vitorpamplona/amethyst/service/model/EventInterface.kt
#	app/src/main/java/com/vitorpamplona/amethyst/service/model/LongTextNoteEvent.kt
#	app/src/main/java/com/vitorpamplona/amethyst/service/model/TextNoteEvent.kt
#	app/src/main/java/com/vitorpamplona/amethyst/ui/dal/GlobalFeedFilter.kt
#	app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeConversationsFeedFilter.kt
#	app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HomeNewThreadFeedFilter.kt
#	app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NotificationFeedFilter.kt
#	app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileFollowersFeedFilter.kt
#	app/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileFollowsFeedFilter.kt
2023-03-08 17:17:03 -05:00
Vitor Pamplona 9470560002 Testing Lint Commit 2023-03-08 17:07:56 -05:00
Vitor Pamplona cd950ee946 Merge commit '2d92e1d44491d62005e45adcf3dc1c5a403c386f' into less_memory_test_branch 2023-03-08 17:04:24 -05:00
Vitor Pamplona f9f68e2a4f Merge commit '691b8225035d8fe59539a971a85b1df2f2f84ebe' into less_memory_test_branch 2023-03-08 17:03:42 -05:00
Vitor Pamplona 0986698c4b Merge pull request #230 from maxmoney21m/bugfix/223-invoice-intent
Fix LN invoice in expandable text component
2023-03-08 15:16:44 -05:00
Vitor Pamplona 19c7ab189c Merge pull request #221 from Radiokot/fix/looong_buttons
Fix looong buttons due to localization
2023-03-08 13:58:40 -05:00
maxmoney21m 4be15e23da Fix LN invoice in expandable text component #223 2023-03-09 02:57:17 +08:00
Oleg Koretsky c6a991967c Autoformat by ktLint 2023-03-08 20:53:06 +02:00
Oleg Koretsky f2b1fa9101 Fix shrinking of public channel names 2023-03-08 20:50:42 +02:00
Chemaclass ffed3e7e22 Fix KeyParseTest 2023-03-08 18:32:32 +00:00
Oleg Koretsky 13e488e1e2 Merge branch 'main' into fix/looong_buttons 2023-03-08 20:31:31 +02:00
Vitor Pamplona b62adc61ab Merge pull request #226 from maxmoney21m/feature/71-note-menu
Redesign note long click menu, URL sharing
2023-03-08 13:15:13 -05:00
Vitor Pamplona 5055afd979 Fixes the build 2023-03-08 13:14:06 -05:00
maxmoney21m 9e58ef1110 Show alert first time deleting a note 2023-03-09 02:07:01 +08:00
maxmoney21m 07e4c82c1b Add (un)follow/delete to note quick actions 2023-03-09 02:07:00 +08:00
maxmoney21m 32cd5f7eef Fix linting errors 2023-03-09 02:06:58 +08:00
maxmoney21m 15771289e2 Revise note quick action button layout 2023-03-09 02:06:57 +08:00
maxmoney21m 4967361257 Note long click action opens NoteQuickActionMenu 2023-03-09 02:06:56 +08:00
maxmoney21m 6324dc64d5 Add NoteQuickActionMenu composable cf #71 2023-03-09 02:06:55 +08:00
Vitor Pamplona 71671865ff Merge remote-tracking branch 'origin/HEAD' 2023-03-08 11:47:29 -05:00
Vitor Pamplona 4d7f29ba8f Adds a parser for naddr when composing messages and a filter to avoid thinking the a tag is a reply instead of a quote. 2023-03-08 11:47:13 -05:00
detherminal 9c7a5b73b3 Added Turkish Translation 2023-03-08 18:45:07 +03:00
Vitor Pamplona 40a6feab8a Fixes Clickable tag for addresses (naddr) 2023-03-08 09:59:19 -05:00
Chemaclass 26b5061042 Rename Utils to Tlv 2023-03-08 14:21:52 +00:00
Chemaclass 49199fe892 Change Nip19 from class to object 2023-03-08 14:21:52 +00:00
Chemaclass 30fe861853 Extract from Nip19 global funcs into another script 2023-03-08 14:21:52 +00:00
Chemaclass 1998711e60 Extract TlvTypes to nip19 module 2023-03-08 14:21:52 +00:00
Chemaclass c7ba0bce5b Fix HU translations 2023-03-08 14:14:58 +00:00
Vitor Pamplona 6f71685f08 Merge branch 'main' into add-ktlint 2023-03-08 09:08:46 -05:00
Vitor Pamplona b763d3c140 Merge pull request #222 from ZsZolee/main
Hungarian Translation
2023-03-08 09:04:21 -05:00
Vitor Pamplona 3fd656da9f Removes several Indexes from User and Notes to see if we can reduce App's memory usage. 2023-03-08 08:47:33 -05:00
Vitor Pamplona 6543df5d28 Adds a Log to Failures in Parsing contained Zap events 2023-03-08 08:45:03 -05:00
Vitor Pamplona 67d6b24993 Removing unnecessary coroutine 2023-03-08 08:44:05 -05:00
Vitor Pamplona 9f5b3d82c5 Making LnInvoice amount a Lazy property. 2023-03-08 08:43:38 -05:00
Vitor Pamplona 7275799f9d Solves crashing when events have null tags. 2023-03-08 08:31:56 -05:00
Vitor Pamplona 77a70c3202 Duplicated Stop 2023-03-08 08:28:09 -05:00
Zoltan 00f38670a5 Hungarian Translation
This time I made the proper structure for the file. (Thanks Jose Maria Valera Reales for the help!)
2023-03-08 09:58:24 +01:00
Oleg Koretsky 773d747f5a Fix slightly lighter color of the terms checkbox 2023-03-07 22:15:55 +02:00
Oleg Koretsky a82fc73346 Rearrange buttons on the new post screen. Add icons 2023-03-07 22:02:53 +02:00
Chemaclass c9b859610e Format last files with conflicts 2023-03-07 20:43:34 +01:00
Chemaclass f1b6927bb3 Merge branch 'main' into add-ktlint
Conflicts:
	app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
	app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt
	app/src/main/java/com/vitorpamplona/amethyst/model/ThreadAssembler.kt
	app/src/main/java/com/vitorpamplona/amethyst/service/Nip19.kt
	app/src/main/java/com/vitorpamplona/amethyst/service/NostrUserProfileDataSource.kt
	app/src/main/java/com/vitorpamplona/amethyst/service/model/ATag.kt
	app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapEvent.kt
	app/src/main/java/com/vitorpamplona/amethyst/service/model/LnZapRequestEvent.kt
	app/src/main/java/com/vitorpamplona/amethyst/service/model/ReactionEvent.kt
	app/src/main/java/com/vitorpamplona/amethyst/service/model/ReportEvent.kt
	app/src/main/java/com/vitorpamplona/amethyst/service/model/RepostEvent.kt
	app/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableRoute.kt
	app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt
	app/src/test/java/com/vitorpamplona/amethyst/NIP19ParserTest.kt
2023-03-07 20:42:38 +01:00
Vitor Pamplona 9720fdfce9 Moving aTag check to the ATag class 2023-03-07 13:53:03 -05:00
Vitor Pamplona 1919dc5c81 1. Moves AddressableNote index from NAddr to aTag format due to the presence of a preferred relay inside NAddr, which is an optional field and should not be part of the idex.
2. Parses relay information for Addressable Notes
2023-03-07 13:48:05 -05:00