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
sk
5c67dd0188
include subject line on external share
...
closes #123
2022-12-07 16:55:10 +01:00
LucasGGamerM
e52dffeece
Fix notification logo and lets start splash screen button color
2022-12-07 12:46:26 -03:00
sk
b4358f51cb
Merge branch 'better-inline-emoji-search'
2022-12-07 16:35:58 +01:00
sk
622c6d503d
improve inline emoji search
...
closes #131
closes mastodon#219
2022-12-07 16:34:52 +01:00
sk
b190480d77
add push post notifications
...
closes #93
2022-12-07 14:50:24 +01:00
sk
9a085beea8
fix #130
2022-12-07 14:24:13 +01:00
sk
1a42a77e24
fix #122
2022-12-07 14:12:11 +01:00
sk
e35794ef7d
add new languages
2022-12-07 14:01:20 +01:00
sk
1f9611fc3e
Merge remote-tracking branch 'upstream/master'
2022-12-07 13:55:36 +01:00
LucasGGamerM
563afd487c
add new megalodon logo text
...
closes #129
2022-12-07 13:50:07 +01:00
LucasGGamerM
5b85bb427d
bumping version code
2022-12-07 09:50:03 -03:00
LucasGGamerM
4d62388617
Fixing the notification icon once again...
2022-12-07 09:36:50 -03:00
LucasGGamerM
04b8055474
Fixing the notification icon once more
2022-12-07 09:22:18 -03:00
LucasGGamerM
3c34b6a7d2
Upping the version code once more, and fixing the self updater
2022-12-06 22:06:49 -03:00
LucasGGamerM
de4964c2cd
Upping the version code and changing notification icon. This should be the first release
2022-12-06 21:58:35 -03:00
LucasGGamerM
fbcaa05c03
Changing the name of the archivesBaseName
2022-12-06 21:49:46 -03:00
LucasGGamerM
883f28696e
Editing a while lot of files. New icon, new notification icon, a bunch of new stuff!
2022-12-06 21:21:43 -03:00
LucasGGamerM
df52230837
Editing the readme just in case
2022-12-06 19:23:28 -03:00
LucasGGamerM
a90f26a37a
Setting update client
2022-12-06 19:20:47 -03:00
LucasGGamerM
8c1f76d7fa
Initial Moshidon "release"
2022-12-06 19:17:07 -03:00
Grishka
e10faeefc4
Update languages
2022-12-06 19:18:51 +03:00
LucasGGamerM
f384d44f8f
Changing my app id
2022-12-06 13:03:26 -03:00
Grishka
65dbbb3d61
Fix #443
2022-12-06 18:44:17 +03:00
LucasGGamerM
4ab6ed55f5
Changing my version number and string
2022-12-06 12:41:03 -03:00
Grishka
fa69868ca1
Merge branch 'l10n_master'
2022-12-06 18:33:35 +03:00
Eugen Rochko
9c18de7b90
New translations strings.xml (Icelandic)
2022-12-06 15:26:12 +01:00
Eugen Rochko
61bd19f6ff
New translations strings.xml (Icelandic)
2022-12-06 14:24:50 +01:00
LucasGGamerM
cf99bf5152
Merge branch 'proper_implementation_of_the_color_picker'
...
Just fixing stuff here and there
2022-12-05 17:47:03 -03:00
