1d25d80186
Merge remote branch 'FineFindus/feat/settings-redesign'
2023-04-23 12:09:49 -03:00
cdeeb24eac
refactor(settings): add red header item
2023-04-23 15:20:57 +02:00
5a5181fde8
refactor(settings): move about to about page
2023-04-23 15:10:47 +02:00
69420b2399
refactor: move account and instance setttings to account page
2023-04-23 15:02:26 +02:00
aaa80f80f1
refactor: move miscellanious settings
2023-04-23 14:50:00 +02:00
9b11fbbbfe
refactor: move notifications to NotificationsFragment
2023-04-23 14:45:57 +02:00
57f513048a
refactor: move timelines to TimelineFragment
2023-04-23 12:44:40 +02:00
c5e35e550c
refactor: add compose behaviour to behaviour page
2023-04-23 12:38:51 +02:00
2751b804fe
refactor: move behaviour settings to behaviour page
2023-04-23 12:33:03 +02:00
d310673f92
refactor: use SettingsCategory to move between pages
2023-04-23 12:24:06 +02:00
afca57501f
fix: move method to fix compiler error
2023-04-23 12:10:43 +02:00
34443726e2
feat: trying to add the theme settings. Still missing some things
...
What is an enclosed class? What am I missing?
2023-04-22 23:01:31 -03:00
fc9ffc9aef
feat: add settings category view holder
...
Also adds a small proof of concept
2023-04-22 22:35:39 -03:00
44b1bc70af
feat: add all previously missing view holders
...
This includes: Updater View holder, theme view holder and notification policy view holder
2023-04-22 18:02:54 -03:00
45796000c4
Merge https://github.com/LucasGGamerM/moshidon into HEAD
2023-04-22 17:22:46 -03:00
22febe019b
build: update proguard rules for better clarity
2023-04-22 16:29:31 -03:00
e0f4f87086
build: fix missing proguard rules
2023-04-22 16:19:49 -03:00
7917e34568
build: fix on startup crash on nightly release
2023-04-22 15:32:53 -03:00
d7287441ca
build: fix compilation errors
2023-04-22 14:47:53 -03:00
5b391b44d3
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/github/AndroidManifest.xml
# mastodon/src/main/res/values-de-rDE/strings_sk.xml
# mastodon/src/main/res/values-es-rES/strings_sk.xml
# mastodon/src/main/res/values-eu-rES/strings_sk.xml
# mastodon/src/main/res/values-ko-rKR/strings_sk.xml
# mastodon/src/main/res/values-pl-rPL/strings_sk.xml
# mastodon/src/main/res/values-uk-rUA/strings_sk.xml
# metadata/es/changelogs/83.txt
# metadata/fr/short_description.txt
# metadata/gl-ES/changelogs/83.txt
2023-04-22 13:53:50 -03:00
fe20fe4254
feat(compose): add automatically mentioning Reblogger functionality
...
Fixes #173
2023-04-22 13:44:50 -03:00
63e536c66c
fix hidden no alt/alt badge remaining clickable
...
closes sk22#498
2023-04-22 18:20:05 +02:00
b5a08b1b98
Pleroma emoji reaction notifications ( #499 )
2023-04-22 17:39:41 +02:00
226e2a7cdc
Minor maintenance things ( #501 )
...
* validate gradle wrapper jar file
this is extremely important. see the following:
https://blog.gradle.org/wrapper-attack-report
https://github.com/gradle/wrapper-validation-action#the-gradle-wrapper-problem-in-open-source
Signed-off-by: r3g_5z <june@girlboss.ceo>
* update gradle wrapper to 8.1.1
it is necessary to run the gradlew update command twice to actually
update the jar file properly, e.g.:
./gradlew wrapper --gradle-version=8.1.1 --gradle-distribution-sha256-sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
./gradlew wrapper --gradle-version=8.1.1 --gradle-distribution-sha256-sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
Signed-off-by: r3g_5z <june@girlboss.ceo>
* use Gradle toolchain
this allows for better build reproducibility and avoid mix and matching
JDKs from other projects
https://docs.gradle.org/current/userguide/toolchains.html
Signed-off-by: r3g_5z <june@girlboss.ceo>
* update dependencies and fix build errors
Signed-off-by: r3g_5z <june@girlboss.ceo>
---------
Signed-off-by: r3g_5z <june@girlboss.ceo>
Co-authored-by: sk22 <sk22@mailbox.org>
2023-04-22 17:28:16 +02:00
4d7c4aed4c
enable nonTransitiveRClass
2023-04-22 16:51:44 +02:00
c9bcd000c3
update gradle
2023-04-22 16:49:42 +02:00
de42145f30
Translated using Weblate (German)
...
Currently translated at 100.0% (273 of 273 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/de/
2023-04-22 14:38:25 +00:00
7bcdd6070a
boost instead of reblog
2023-04-22 16:38:16 +02:00
8a215e90d0
Merge remote-tracking branch 'weblate/main'
2023-04-22 16:34:11 +02:00
b736fa18bb
remove empty french metadata
2023-04-22 16:32:00 +02:00
43c19e4942
Translated using Weblate (Ukrainian)
...
Currently translated at 100.0% (273 of 273 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/uk/
2023-04-22 14:30:34 +00:00
ffc18029bb
Translated using Weblate (Polish)
...
Currently translated at 100.0% (273 of 273 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/pl/
2023-04-22 14:30:34 +00:00
b88b3d15f8
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (273 of 273 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/id/
2023-04-22 14:30:34 +00:00
c817886a2d
Translated using Weblate (French)
...
Currently translated at 100.0% (273 of 273 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/fr/
2023-04-22 14:30:34 +00:00
aae239494e
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (273 of 273 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/es/
2023-04-22 14:30:34 +00:00
b0b2daa5d5
Translated using Weblate (Basque)
...
Currently translated at 100.0% (272 of 272 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/eu/
2023-04-22 14:30:34 +00:00
eea2e38f1b
Translated using Weblate (Galician)
...
Currently translated at 100.0% (17 of 17 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/gl/
2023-04-22 14:30:34 +00:00
f894ecd25b
Translated using Weblate (Korean)
...
Currently translated at 100.0% (17 of 17 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/ko/
2023-04-22 14:30:34 +00:00
e0b6ed7103
Translated using Weblate (Korean)
...
Currently translated at 100.0% (272 of 272 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
2023-04-22 14:30:34 +00:00
a78e75747a
Translated using Weblate (Galician)
...
Currently translated at 100.0% (17 of 17 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/gl/
2023-04-22 14:30:34 +00:00
3b25e367bb
Translated using Weblate (Ukrainian)
...
Currently translated at 100.0% (17 of 17 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/uk/
2023-04-22 14:30:34 +00:00
08b29dff3d
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (17 of 17 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/es/
2023-04-22 14:30:34 +00:00
2f2e053d26
Translated using Weblate (French)
...
Currently translated at 17.6% (3 of 17 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/fr/
2023-04-22 14:30:34 +00:00
191d582c30
Translated using Weblate (Croatian)
...
Currently translated at 12.5% (2 of 16 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/hr/
2023-04-22 14:30:34 +00:00
8d3380ff6e
Translated using Weblate (Croatian)
...
Currently translated at 97.4% (265 of 272 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/hr/
2023-04-22 14:30:34 +00:00
ba85d18574
Translated using Weblate (Korean)
...
Currently translated at 100.0% (272 of 272 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
2023-04-22 14:30:34 +00:00
0f53b17515
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (272 of 272 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/es/
2023-04-22 14:30:34 +00:00
cb9c869712
Translated using Weblate (Russian)
...
Currently translated at 92.2% (251 of 272 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ru/
2023-04-22 14:30:34 +00:00
aa3d9e7b8f
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 100.0% (272 of 272 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/zh_Hans/
2023-04-22 14:30:34 +00:00
b3a9b5824d
fix non-positional subtitution in string
2023-04-22 16:29:41 +02:00
LucasGGamerM
FineFindus
sk
Jacoco
r3g_5z
ihor_ck
Eryk Michalak
Linerly
Choukajohn
gallegonovato
a_mento
Espasant3
AiOO
Pegasus89
Anonymous
poesty