Commit Graph

1739 Commits

Author SHA1 Message Date
LucasGGamerM 75a131b675 Api side done 2022-12-10 20:06:45 -03:00
LucasGGamerM d98b1c5ee1
Update readme 2022-12-10 17:38:08 -03:00
LucasGGamerM 1eeab25b7d Bumping version number 2022-12-10 17:30:11 -03:00
sk 82cc0c3c09 add option to allow multiple poll choices 2022-12-10 17:15:41 -03:00
sk e102faff6c improve semantics for poll options 2022-12-10 17:10:56 -03:00
sk 34369bd7e9 fix poll option displaying wrong own vote
fixes #132
2022-12-10 17:10:56 -03:00
sk c71b620402 fix poll option displaying wrong own vote
fixes #132
2022-12-10 17:10:55 -03:00
sk 21b4bf23a1 update description 2022-12-10 17:10:06 -03:00
sk d034311f2d Fixing the changelog ig 2022-12-10 17:10:06 -03:00
sk22 2deed69766 Translated using Weblate (German)
Currently translated at 100.0% (7 of 7 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/de/
2022-12-10 17:09:43 -03:00
sk22 bfbd21b826 Translated using Weblate (German)
Currently translated at 100.0% (47 of 47 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/de/
2022-12-10 17:09:37 -03:00
sk ba8683301d remove upstream fastlane changes 2022-12-10 17:09:37 -03:00
sk22 0ed178167b Translated using Weblate (German)
Currently translated at 100.0% (7 of 7 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/de/
2022-12-10 17:09:27 -03:00
Grishka b34e34de51 Fix #443 again 2022-12-10 17:08:40 -03:00
LucasGGamerM ba38e21e07 Changing back the link on settings to Moshidon 2022-12-10 16:43:03 -03:00
LucasGGamerM 90bef7fddb Merge branch 'material3_dynamic_color_theme' 2022-12-10 13:18:06 -03:00
LucasGGamerM c1b382ef34 Fixing some minor inconsistencies 2022-12-10 13:17:28 -03:00
LucasGGamerM 028b88aa24 Bumping version code 2022-12-10 13:02:28 -03:00
LucasGGamerM 9d0ce33f5e Making material you setting work fine. Its ready for release 2022-12-10 12:59:24 -03:00
LucasGGamerM dbb23d952c Adding the color things 2022-12-10 11:58:29 -03:00
LucasGGamerM 7fe7e47d53
Updating the readme again 2022-12-10 10:21:15 -03:00
LucasGGamerM d0c93dfd4d
Updating the readme 2022-12-10 10:18:19 -03:00
LucasGGamerM acdccaf80a Bumping version code 2022-12-10 10:01:57 -03:00
LucasGGamerM 769293ce1a Changing translate icon 2022-12-10 09:56:53 -03:00
LucasGGamerM 8d0fe18b70 Fixing the notification color, and app name 2022-12-10 09:33:36 -03:00
LucasGGamerM 6926432a6c Bumping version number 2022-12-09 20:10:06 -03:00
LucasGGamerM 83f12b0840 Fixing the sk references. Readding them for easier translation 2022-12-09 19:58:33 -03:00
LucasGGamerM 290b7db7e4 This is unbrokey. Merged changes from upstream. 2022-12-09 19:35:15 -03:00
LucasGGamerM f352c20ed9 This is quite brokey 2022-12-09 19:20:47 -03:00
LucasGGamerM 2ccbffa165 Merge branch 'main' into fork
# Conflicts:
#	README.md
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
#	mastodon/src/main/res/color/button_text_primary_light_on_dark.xml
#	mastodon/src/main/res/drawable/logo.xml
#	mastodon/src/main/res/layout/item_settings_color_picker.xml
#	mastodon/src/main/res/menu/color_picker.xml
#	mastodon/src/main/res/values-night/styles.xml
#	mastodon/src/main/res/values-v27/colors.xml
#	mastodon/src/main/res/values/colors.xml
#	mastodon/src/main/res/values/strings.xml
#	mastodon/src/main/res/values/styles.xml
2022-12-09 19:08:35 -03:00
LucasGGamerM 06cd80a352 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
2022-12-09 18:35:52 -03:00
LucasGGamerM de97493e6a
Update README.md 2022-12-09 14:04:38 -03:00
LucasGGamerM 3a24ff0d15 Bumping version code 2022-12-09 13:44:46 -03:00
LucasGGamerM c463a3fc39 The front end if finally ready! 2022-12-09 13:42:29 -03:00
LucasGGamerM fc845685cc Almost there 2022-12-09 12:25:17 -03:00
LucasGGamerM 0ef0aa1a44 The api side is finally working perfectly! 2022-12-09 10:30:24 -03:00
LucasGGamerM 337689aa45 The api side is actually working! 2022-12-08 21:17:11 -03:00
LucasGGamerM f7e3423f9c Bumping version number 2022-12-08 15:16:22 -03:00
LucasGGamerM b465c09cc8 Fixing the "Megalodon" name on logging into a new account 2022-12-08 15:01:46 -03:00
sk 06f2f67f0c Merge branch 'main' of github.com:sk22/megalodon 2022-12-07 19:02:04 +01:00
sk 05c33be3f4 update readme, bump version 2022-12-07 19:01:58 +01:00
LucasGGamerM ac6c0651d6
Update README.md 2022-12-07 14:32:42 -03:00
LucasGGamerM 18af6f5a12 Bumping version code 2022-12-07 14:24:52 -03:00
LucasGGamerM d11ee3a702
Update README.md 2022-12-07 14:16:48 -03:00
LucasGGamerM 6d9f9ce2d2
Update README.md 2022-12-07 14:14:34 -03:00
LucasGGamerM e274b7e6d5
Implement a color picker (#124)
* Proper implementation on the color picker.
* Disabling the icons for the color picker menu
* Adding a green theme
* Making the green theme more readable
* More polishes over the green theme
* Adding blue theme and refactoring styles.xml
* Make badged settings icon follow accent colors
* Adding an icon to the color picker setting
* Fix readability issue on the light blue theme
* Adding orange theme, tweaking the blue and green theme
* Adding yellow theme
* Making it so that the fab follows the theme
* Fixing the TrueBlack themes for everything
* Make it so that the publish button also follows the theme
* Editing some drawable files to make them also follow the theme
* Making it so that the boost icon is also following the theme when clicked
* Make follow requests icon badge follow the color scheme and also make it that the profile top bar menu also follows the theme. This should be it

Co-authored-by: sk <sk22@mailbox.org>
2022-12-07 18:13:13 +01:00
LucasGGamerM ec1496a4cc Editing the readme 2022-12-07 14:08:28 -03:00
LucasGGamerM 41e19185e8 Edited the color of the new instance search box 2022-12-07 14:06:28 -03:00
LucasGGamerM e15dd6024f Bumped version number 2022-12-07 13:28:07 -03:00
sk 0806d0c5ea Merge branch 'external-share-include-subject' 2022-12-07 16:55:20 +01:00