diff --git a/README.md b/README.md index 67bbf5838..8690d5c6e 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,4 @@ -# Forked Mastodon for Android - -This is the repository for an officially forked Android app for Mastodon. - -Learn more about the official app in the [blog post](https://blog.joinmastodon.org/2022/02/official-mastodon-for-android-app-is-coming-soon/). +# Mastodon for Android Fork ## Changes @@ -18,6 +14,19 @@ Learn more about the official app in the [blog post](https://blog.joinmastodon.o * [Implement a bookmark button and list](https://github.com/sk22/mastodon-android-fork/tree/feature/bookmarks) ([Fixes issue](https://github.com/mastodon/mastodon-android/issues/22)) * [Implement deleting and re-drafting](https://github.com/sk22/mastodon-android-fork/tree/feature/delete-redraft) ([Fixes issue](https://github.com/mastodon/mastodon-android/issues/21)) +## Fork-specific changes + +* Custom app name +* Custom icon: Modulate upstream icon's hue by `161%` using ImageMagick + + ```bash + mogrify -modulate 100,100,161 mastodon/src/main/res/mipmap-*/ic_launcher*.png + ``` + +* Custom primary color: Hue of all `primary` colors in `colors.xml` is rotated + by `109.8°` (equivalent of `161%`, done by hand using + [PineTools](https://pinetools.com/shift-hue-color)) + ## Building As this app is using Java 17 features, you need JDK 17 or newer to build it. Other than that, everything is pretty standard. You can either import the project into Android Studio and build it from there, or run the following command in the project directory: diff --git a/mastodon/build.gradle b/mastodon/build.gradle index 85b1c703f..5a10244d4 100644 --- a/mastodon/build.gradle +++ b/mastodon/build.gradle @@ -9,8 +9,8 @@ android { applicationId "org.joinmastodon.android.sk" minSdk 23 targetSdk 31 - versionCode 17 - versionName '1.1.1+fork.17' + versionCode 18 + versionName '1.1.1+fork.18' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/oauth/CreateOAuthApp.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/oauth/CreateOAuthApp.java index 7bb19de41..23fd7c810 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/oauth/CreateOAuthApp.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/oauth/CreateOAuthApp.java @@ -11,7 +11,7 @@ public class CreateOAuthApp extends MastodonAPIRequest{ } private static class Request{ - public String clientName="Mastadon for Android"; + public String clientName="Mastodon for Android Fork"; public String redirectUris=AccountSessionManager.REDIRECT_URI; public String scopes=AccountSessionManager.SCOPE; public String website="https://github.com/sk22/mastodon-android-fork"; diff --git a/mastodon/src/main/res/mipmap-hdpi/ic_launcher.png b/mastodon/src/main/res/mipmap-hdpi/ic_launcher.png index 9d6abcfc7..12352d8f6 100644 Binary files a/mastodon/src/main/res/mipmap-hdpi/ic_launcher.png and b/mastodon/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/mastodon/src/main/res/mipmap-hdpi/ic_launcher_background.png b/mastodon/src/main/res/mipmap-hdpi/ic_launcher_background.png index 2dae481bb..867d85d37 100644 Binary files a/mastodon/src/main/res/mipmap-hdpi/ic_launcher_background.png and b/mastodon/src/main/res/mipmap-hdpi/ic_launcher_background.png differ diff --git a/mastodon/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/mastodon/src/main/res/mipmap-hdpi/ic_launcher_foreground.png index 652826f1e..a79401703 100644 Binary files a/mastodon/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/mastodon/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/mastodon/src/main/res/mipmap-hdpi/ic_launcher_round.png b/mastodon/src/main/res/mipmap-hdpi/ic_launcher_round.png index 1605879e9..07cce5c8c 100644 Binary files a/mastodon/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/mastodon/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/mastodon/src/main/res/mipmap-mdpi/ic_launcher.png b/mastodon/src/main/res/mipmap-mdpi/ic_launcher.png index eea96f594..b4773de48 100644 Binary files a/mastodon/src/main/res/mipmap-mdpi/ic_launcher.png and b/mastodon/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/mastodon/src/main/res/mipmap-mdpi/ic_launcher_background.png b/mastodon/src/main/res/mipmap-mdpi/ic_launcher_background.png index a507e6d24..bb3570725 100644 Binary files a/mastodon/src/main/res/mipmap-mdpi/ic_launcher_background.png and b/mastodon/src/main/res/mipmap-mdpi/ic_launcher_background.png differ diff --git a/mastodon/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/mastodon/src/main/res/mipmap-mdpi/ic_launcher_foreground.png index 6dad5563c..9ad01b61f 100644 Binary files a/mastodon/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/mastodon/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/mastodon/src/main/res/mipmap-mdpi/ic_launcher_round.png b/mastodon/src/main/res/mipmap-mdpi/ic_launcher_round.png index a0643390e..d0717a6a4 100644 Binary files a/mastodon/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/mastodon/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/mastodon/src/main/res/mipmap-xhdpi/ic_launcher.png b/mastodon/src/main/res/mipmap-xhdpi/ic_launcher.png index 34eea2eed..ff289fb79 100644 Binary files a/mastodon/src/main/res/mipmap-xhdpi/ic_launcher.png and b/mastodon/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/mastodon/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/mastodon/src/main/res/mipmap-xhdpi/ic_launcher_background.png index 958f99160..84665c145 100644 Binary files a/mastodon/src/main/res/mipmap-xhdpi/ic_launcher_background.png and b/mastodon/src/main/res/mipmap-xhdpi/ic_launcher_background.png differ diff --git a/mastodon/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/mastodon/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png index 69704cb8c..f17fe66a3 100644 Binary files a/mastodon/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/mastodon/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/mastodon/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/mastodon/src/main/res/mipmap-xhdpi/ic_launcher_round.png index c14c88bfc..c1d757078 100644 Binary files a/mastodon/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/mastodon/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/mastodon/src/main/res/mipmap-xxhdpi/ic_launcher.png b/mastodon/src/main/res/mipmap-xxhdpi/ic_launcher.png index 123d46e84..8a721e0ea 100644 Binary files a/mastodon/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/mastodon/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/mastodon/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/mastodon/src/main/res/mipmap-xxhdpi/ic_launcher_background.png index 6d702c251..29af9b212 100644 Binary files a/mastodon/src/main/res/mipmap-xxhdpi/ic_launcher_background.png and b/mastodon/src/main/res/mipmap-xxhdpi/ic_launcher_background.png differ diff --git a/mastodon/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/mastodon/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png index d99a2feb8..a3fdc13ab 100644 Binary files a/mastodon/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/mastodon/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/mastodon/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/mastodon/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index 801c1fc6e..e7a08954b 100644 Binary files a/mastodon/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/mastodon/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/mastodon/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/mastodon/src/main/res/mipmap-xxxhdpi/ic_launcher.png index db374d694..71ae9633d 100644 Binary files a/mastodon/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/mastodon/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/mastodon/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/mastodon/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png index 0ee947f7b..86a97a9cf 100644 Binary files a/mastodon/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png and b/mastodon/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png differ diff --git a/mastodon/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/mastodon/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png index c9ff2401e..0d5c85c77 100644 Binary files a/mastodon/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/mastodon/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/mastodon/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/mastodon/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index b886deb9e..1994cdd41 100644 Binary files a/mastodon/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/mastodon/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/mastodon/src/main/res/values/colors.xml b/mastodon/src/main/res/values/colors.xml index 87e7e8c05..5e02d1a4c 100644 --- a/mastodon/src/main/res/values/colors.xml +++ b/mastodon/src/main/res/values/colors.xml @@ -19,17 +19,17 @@ #CC282C37 #101828 - #FAFDFF - #EAF4FB - #D5E9F7 - #BFDEF4 - #AAD3F0 - #95C8EC - #80BCE8 - #55A6E1 - #2B90D9 - #2273AE - #16486D + #fffafd + #fbeaf6 + #f7d4ee + #f4bfe7 + #f0aade + #ec94d6 + #e780cd + #e055bd + #d92aad + #ae218a + #6d1556 #FFFBFA #FEF3F2 #FEE4E2