owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,233 Commits 32 Branches 206 Tags
5366c92b4ddab4ad9d977f3099a22b11d32686dd
Commit Graph

115 Commits

Author SHA1 Message Date
LucasGGamerM
1e6dadd7ab Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
 2023-04-27 15:30:58 -03:00
sk
55138c1e86 fix wrong true black badge border color 
closes sk22#485
 2023-04-22 19:17:12 +02:00
LucasGGamerM
7c59b700da fix: inconsistent true black text colors on account picker dialog 2023-04-18 13:26:21 -03:00
LucasGGamerM
cf64e75e2f fix: inconsistent true black text colors on toolbar menus 2023-04-18 12:09:00 -03:00
LucasGGamerM
181fa1383b fix: make compose button accent consistent with dark mode 
This is due to consistency and better usage of colors
 2023-04-15 12:47:09 -03:00
LucasGGamerM
665a0176b9 Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/res/layout/fragment_splash.xml
 2023-04-14 14:27:42 -03:00
sk
3ad46926f1 Merge remote-tracking branch 'upstream/master' 2023-04-13 21:46:45 +02:00
Grishka
0de227ab9c Use fixed colors for SplashFragment 
fixes #561
 2023-04-12 18:47:02 +03:00
Grishka
4f8d8f0c8d Welcome fragment redesign again 
# Conflicts:
#	mastodon/src/main/res/values/strings.xml
#	mastodon/src/main/res/values/styles.xml
 2023-04-07 22:44:28 +03:00
FineFindus
05168b9826 feat(external-share): use transparent background 2023-03-17 20:38:56 +01:00
LucasGGamerM
33b62cf9aa Merge remote-tracking branch 'megalodon_weblate/main' 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/res/values-ca-rES/strings_sk.xml
#	mastodon/src/main/res/values-de-rDE/strings.xml
#	mastodon/src/main/res/values-es-rES/strings_sk.xml
#	mastodon/src/main/res/values-fr-rFR/strings_sk.xml
#	mastodon/src/main/res/values-gl-rES/strings_sk.xml
#	mastodon/src/main/res/values-ko-rKR/strings_sk.xml
#	mastodon/src/main/res/values-pt-rBR/strings_sk.xml
#	mastodon/src/main/res/values-sl-rSI/strings_sk.xml
#	mastodon/src/main/res/values-uk-rUA/strings_sk.xml
#	mastodon/src/main/res/values-zh-rCN/strings_sk.xml
#	metadata/ca/full_description.txt
#	metadata/cy/full_description.txt
#	metadata/es/changelogs/65.txt
#	metadata/es/changelogs/67.txt
#	metadata/es/full_description.txt
#	metadata/id/full_description.txt
#	metadata/ko/full_description.txt
#	metadata/pl/full_description.txt
#	metadata/sl/changelogs/65.txt
#	metadata/sl/changelogs/67.txt
#	metadata/sv/full_description.txt
#	metadata/uk/full_description.txt
#	metadata/zh-Hans/full_description.txt
 2023-02-13 15:38:28 -03:00
sk
0c1fd22253 Merge remote-tracking branch 'upstream' 2023-02-13 17:26:26 +01:00
Grishka
64fbbb2f07 Minor onboarding stuff 2023-02-10 21:09:06 +03:00
LucasGGamerM
ec0f6edc41 Merge branch 'main' 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/Status.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PhotoStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
#	mastodon/src/main/res/layout/display_item_footer.xml
#	mastodon/src/main/res/layout/fragment_profile.xml
#	mastodon/src/main/res/layout/recycler_fragment_with_fab.xml
#	mastodon/src/main/res/values/strings.xml
 2023-02-07 18:09:13 -03:00
sk
defd038064 display roles in profile 2023-02-06 19:41:36 +01:00
sk
e282d54f99 Merge remote-tracking branch 'upstream/master' 2023-01-31 00:00:56 +01:00
Grishka
b153a64373 Signup flow redesign WIP 2023-01-30 01:54:13 +03:00
sk
7cc791ccd9 dividers and alignments 
nobody knows the trouble i've seen
 2023-01-27 15:35:01 -03:00
sk
5280ba1930 use fluent more icon, correct padding 
closes sk22#350
 2023-01-27 14:48:58 -03:00
sk
8bdbb2adef dividers and alignments 
nobody knows the trouble i've seen
 2023-01-25 22:55:14 +01:00
sk
dd7af8b5d3 use fluent more icon, correct padding 
closes sk22#350
 2023-01-23 11:43:19 +01:00
LucasGGamerM
de0afdfa16 improve fab background color 
thanks, @LucasGGamerM!
 2023-01-10 15:26:19 +01:00
sk
1fa42fd20f scale text according to system 
closes #244
 2023-01-10 11:13:04 -03:00
sk
f78c6978cf scale text according to system 
closes #244
 2023-01-09 11:11:00 +01:00
LucasGGamerM
ee441d5b4a Glory! it finally works! 2022-12-31 21:46:37 -03:00
sk22
074efb0813 Drafts and scheduled posts (#217) 
closes #100
closes #59

* enable saving as draft (scheduled)
* add scheduled posts list
* fix NoSuchMethodError
* editable drafts/scheduled posts
* ui for drafts
* use instants between 9999-01-01 and 9999-12-31
* use save and draft strings
* map scheduled status params to status
* implement scheduling posts
* improve save/discard draft dialog
* persist scheduled date in state
* add unsent posts button to toolbar
* clean up imports
 2022-12-31 14:05:03 -03:00
LucasGGamerM
99e3658938 Making fab feel better on light themes. Merging this might be good for you too, @sk22 2022-12-31 12:49:16 -03:00
LucasGGamerM
a881f23253 Fixing the PublishButton background and also fixing the Fab icon background on trueblack theme. Its a relevant thing, i beliebe you shall merge this @sk22 2022-12-30 20:23:13 -03:00
sk
8f6c57d5c9 use popup background color for dialogs 2022-12-29 17:44:15 -03:00
sk
6b1c725ebd fix toolbar inset not applying in true black 2022-12-29 17:14:58 -03:00
LucasGGamerM
a46f8f1c20 Adding a new fluent edit icon for the fab 2022-12-29 17:13:44 -03:00
sk
000cdb08ec change fab styles 
closes sk22#211
 2022-12-29 18:01:22 +01:00
sk22
9547be89e1 Drafts and scheduled posts (#217) 
closes #100
closes #59 

* enable saving as draft (scheduled)
* add scheduled posts list
* fix NoSuchMethodError
* editable drafts/scheduled posts
* ui for drafts
* use instants between 9999-01-01 and 9999-12-31
* use save and draft strings
* map scheduled status params to status
* implement scheduling posts
* improve save/discard draft dialog
* persist scheduled date in state
* add unsent posts button to toolbar
* clean up imports
 2022-12-29 16:53:18 +01:00
sk
3bf0903453 fix toolbar inset not applying in true black 2022-12-29 16:46:10 +01:00
sk
0f1456819b interact as other accounts 
closes #199
 2022-12-27 19:53:01 +01:00
sk
5577124b7a use popup background color for dialogs 2022-12-23 18:38:16 +01:00
LucasGGamerM
66efe750a8 Trying to make it compile properly idek wtf to do anymore 2022-12-22 11:24:36 -03:00
sk
3658fc423b simplify themes 2022-12-22 11:08:26 -03:00
LucasGGamerM
d9f6ef69fe Revert "Whatever the fuck this is. Hopefully it compiles on the first try" 
This reverts commit bdac1d5bb4.
 2022-12-22 09:01:30 -03:00
sk
bdac1d5bb4 Whatever the fuck this is. Hopefully it compiles on the first try 2022-12-22 09:00:51 -03:00
sk
a14783a275 fix action bar buttons color 
closes sk22#175
 2022-12-21 09:14:36 +01:00
sk
3ce58d2edf move button text/background to styles 2022-12-20 16:06:28 +01:00
sk
523efac4fb make separator color brighter 
closes #159
 2022-12-20 15:51:00 +01:00
sk
d352aca9cc add toolbar background color 2022-12-20 15:44:37 +01:00
sk
8d17ac6f28 simplify themes 2022-12-20 10:26:03 +01:00
LucasGGamerM
277361a562 merge moshidon's red theme 
closes sk22#160
 2022-12-19 17:58:16 +01:00
LucasGGamerM
2fbf172729 Styles and colors.xml side done. Putting a string in there as well :D 2022-12-18 12:41:40 -03:00
sk
9d5d4b7957 make red theme less orange 2022-12-17 15:47:04 +01:00
LucasGGamerM
3626da7362 custom, darker grays for everyone 2022-12-17 15:41:42 +01:00
sk
400e340859 Merge branch 'fix-toolbar-styles-api-24' 2022-12-17 14:58:09 +01:00