Commit Graph

229 Commits

Author SHA1 Message Date
LucasGGamerM
769293ce1a Changing translate icon 2022-12-10 09:56:53 -03:00
LucasGGamerM
83f12b0840 Fixing the sk references. Readding them for easier translation 2022-12-09 19:58:33 -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
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
337689aa45 The api side is actually working! 2022-12-08 21:17:11 -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
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
9a085beea8 fix #130 2022-12-07 14:24:13 +01:00
sk
68863f28eb Merge branch 'better-poll-voting' 2022-12-05 17:57:46 +01:00
sk
7feaf093e2 Merge remote-tracking branch 'upstream/master' 2022-12-05 17:57:24 +01:00
sk
4ab9e25fec show own vote after voted
closes #113
2022-12-05 17:55:52 +01:00
sk
e14dfda2fd show poll vote button for single choice polls 2022-12-05 17:48:28 +01:00
LucasGGamerM
b6178681b0 Adding yellow theme 2022-12-04 11:42:41 -03:00
LucasGGamerM
29abf70cec Adding orange theme, tweaking the blue and green theme 2022-12-04 11:16:58 -03:00
Grishka
012cca550e New login screen 2022-12-04 01:34:03 +03:00
LucasGGamerM
bad44b145c Adding blue theme and refactoring styles.xml 2022-12-03 16:25:28 -03:00
LucasGGamerM
1747ff98b5 Adding a green theme 2022-12-02 14:00:58 -03:00
LucasGGamerM
dad3b8cd6b Proper implementation on the color picker. 2022-12-01 19:42:21 -03:00
sk
d0c4c2d594 Merge branch 'feature/more-html-tags' 2022-12-01 16:06:40 +01:00
sk
e0ae079ea0 make sub/sup text smaller 2022-12-01 16:06:29 +01:00
sk
6c5bb69ba9 move custom strings into separate files 2022-11-30 23:16:14 +01:00
sk
7599406449 Merge branch 'feature/more-html-tags' 2022-11-30 16:15:38 +01:00
sk
670e4c8538 support headings and reduce empty line height 2022-11-30 16:15:31 +01:00
sk
30458b115c Merge branch 'feature/more-html-tags' 2022-11-30 11:46:16 +01:00
sk
da8933ec58 Merge branch 'fix/markdown-lists' into feature/more-html-tags 2022-11-30 11:45:48 +01:00
sk
dc8ac51c83 fix inline rendering of block elements 2022-11-30 11:43:34 +01:00
sk
c4747fdc72 add support for headings 2022-11-30 11:41:10 +01:00
sk
58ba748ade add blockquote support 2022-11-30 11:20:58 +01:00
sk
c0d51ad58a Merge branch 'feature/more-html-tags' 2022-11-30 11:08:55 +01:00
sk
a0da73f76f add support for html code tag 2022-11-30 11:05:00 +01:00
sk
34b8888c8f add support for html code tag 2022-11-30 11:04:19 +01:00
sk
74ad40f67c Merge branch 'fix/markdown-lists' into feature/more-html-tags 2022-11-30 10:55:26 +01:00
sk
a7a29db8d5 improve list rendering implementation 2022-11-30 10:51:25 +01:00
sk
86a938d31d Merge branch 'feature/more-html-tags' 2022-11-30 00:38:08 +01:00
sk
d8d0830631 add support for more html tags
closes #16
2022-11-30 00:36:42 +01:00
sk
bba3b7476a Merge branch 'fix/markdown-lists' 2022-11-30 00:17:40 +01:00
sk
4880c642fe render markdown lists correctly
closes mastodon#152
2022-11-30 00:11:42 +01:00
LucasGGamerM
9179d2198d Fully fixed now, it should be ready to release. 2022-11-29 13:09:32 -03:00
LucasGGamerM
d096bef234 Fixing the fix of the bug I found. 2022-11-28 21:30:32 -03:00
LucasGGamerM
f2c47a1b84 Fixing another bug I found. 2022-11-28 21:24:00 -03:00
LucasGGamerM
bc2ac4e915 Fixed a few bugs from the earlier commit. 2022-11-28 16:47:04 -03:00
LucasGGamerM
ff215412c8 Adding mastodon original colors toggle. Partially fixing #90 2022-11-28 15:40:29 -03:00
sk
6203ded864 Merge branch 'main' into fork 2022-11-28 12:07:35 +01:00
Grishka
4b2c94ab52 Implement bookmarks and add favorites list
Closes #22, at last
2022-11-27 12:43:07 +03:00
Grishka
a98becf2f4 Update splash logo to purple 2022-11-27 11:40:55 +03:00
Grishka
e4c9eb089a Hide posts when muting, blocking or unfollowing an account 2022-11-26 23:09:46 +03:00
Grishka
dc90c09cea Shorten interaction counters 2022-11-26 20:24:27 +03:00
Grishka
06cb335a0a Add tooltips to some icon buttons
closes #423
2022-11-26 20:21:48 +03:00