diff --git a/README.md b/README.md
index 2cf6cb4a8..6aeecdd75 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
-# Mastodos?
+# Megalodon
-Currently trying to find out whether I'll have to rename the project. I will definitely need a new logo, though, since `The Mastodon name and logo are trademarks of Mastodon gGmbH. If you intend to redistribute a modified version of this app, use a unique name and icon for your app that does not mistakenly imply any official connection with or endorsement by Mastodon gGmbH.` Feel free to help me in [https://github.com/sk22/mastodos/issues/15](https://github.com/sk22/mastodos/issues/15)
+Currently trying to find out whether I'll have to rename the project. I will definitely need a new logo, though, since `The Mastodon name and logo are trademarks of Mastodon gGmbH. If you intend to redistribute a modified version of this app, use a unique name and icon for your app that does not mistakenly imply any official connection with or endorsement by Mastodon gGmbH.` Feel free to help me in [https://github.com/sk22/megalodon/issues/15](https://github.com/sk22/megalodon/issues/15)
---
> A fork of the [official Mastodon Android app](https://github.com/mastodon/mastodon-android) adding important features that are missing in the official app and possibly won’t ever be implemented, such as the federated timeline, unlisted posting, bookmarks and an image description viewer.
-[](https://github.com/sk22/mastodos/releases/latest/download/mastodos.apk)
+[](https://github.com/sk22/megalodon/releases/latest/download/megalodon.apk)
---
@@ -49,11 +49,11 @@ To bookmark a post, press the button between the Favorite and Share buttons on t
## Installation
-**Press the download button above to download the APK. Open the downloaded file on your Android device to install it. Mastodos will automatically notify you about new updates inside the app.**
+**Press the download button above to download the APK. Open the downloaded file on your Android device to install it. Megalodon will automatically notify you about new updates inside the app.**
-To install this app on your Android device, download the [latest release from GitHub](https://github.com/sk22/mastodos/releases/latest/download/mastodos.apk) and open it. You might have to accept installing APK files from your browser when trying to install it. You can also take a look at all releases on the [Releases](https://github.com/sk22/mastodos/releases) page.
+To install this app on your Android device, download the [latest release from GitHub](https://github.com/sk22/megalodon/releases/latest/download/megalodon.apk) and open it. You might have to accept installing APK files from your browser when trying to install it. You can also take a look at all releases on the [Releases](https://github.com/sk22/megalodon/releases) page.
-Mastodos makes use of [Mastodon for Android](https://github.com/mastodon/mastodon-android)’s automatic update checker. Mastodos will check for new updates available on GitHub and offer to download and install them. You can also manually press “Check for updates” at the bottom of the settings page!
+Megalodon makes use of [Mastodon for Android](https://github.com/mastodon/mastodon-android)’s automatic update checker. Megalodon will check for new updates available on GitHub and offer to download and install them. You can also manually press “Check for updates” at the bottom of the settings page!
### Other sources
@@ -63,17 +63,17 @@ Mastodos makes use of [Mastodon for Android](https://github.com/mastodon/mastodo
## Release variants
-All downloads can be found on the [Releases](https://github.com/sk22/mastodos/releases) page.
+All downloads can be found on the [Releases](https://github.com/sk22/megalodon/releases) page.
-**`mastodos.apk`**
+**`megalodon.apk`**
-Variant with an integrated updater. If you download Mastodos from here (and not from an app store), just download the regular `mastodos.apk`.
+Variant with an integrated updater. If you download Megalodon from here (and not from an app store), just download the regular `megalodon.apk`.
**`upstream-1234abc.apk`**
-This is an **unmodified version** of the official [Mastodon for Android](https://github.com/mastodon/mastodon-android) app the respective Mastodos release is based on. Should you find any bugs in Mastodos (which you will), try to see if it occurs with this variant, too. The last 7 digits of the file name are important to know which version of the official app you're using.
+This is an **unmodified version** of the official [Mastodon for Android](https://github.com/mastodon/mastodon-android) app the respective Megalodon release is based on. Should you find any bugs in Megalodon (which you will), try to see if it occurs with this variant, too. The last 7 digits of the file name are important to know which version of the official app you're using.
-
@@ -83,47 +83,47 @@ Variant without the integrated updater. This is the variant to be published to F
### Features
-* [Add “Unlisted” as a post visibility option](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/enable-unlisted)
+* [Add “Unlisted” as a post visibility option](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/enable-unlisted)
([Pull request](https://github.com/mastodon/mastodon-android/pull/103))
-* [Add “Federation” tab and change Discover tab order](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/add-federated-timeline) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/8))
-* [Add image description button and viewer](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/display-alt-text) ([Pull request](https://github.com/mastodon/mastodon-android/pull/129))
-* [Implement pinning posts and displaying pinned posts](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/pin-posts) ([Pull request](https://github.com/mastodon/mastodon-android/pull/140))
-* [Implement deleting and re-drafting](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/delete-redraft) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/21))
-* [Implement a bookmark button and list](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/bookmarks) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/22))
-* [Add “Check for update” button in addition to integrated update checker](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/check-for-update-button)
-* [Add “Mark media as sensitive” option](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/mark-media-as-sensitive)
-* [Add settings to hide replies and reposts from the timeline](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/filter-home-timeline) ([Pull request](https://github.com/mastodon/mastodon-android/pull/317))
-* [Follow and unfollow hashtags](https://github.com/sk22/mastodos/commit/7d38f031f197aa6cefaf53e39d929538689c1e4e) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/233))
-* [Notification bell for posts](https://github.com/sk22/mastodos/commit/b166ca705eb9169025ef32bbe6315b42491b57ea) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/81))
-* [Viewing lists and adding/removing users from lists](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:list-timeline-views) based on [@obstsalatschuessel](https://github.com/obstsalatschuessel)'s [Pull request](https://github.com/mastodon/mastodon-android/pull/286)
-* [List favorited posts](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/favs-list)
-* [Accept/reject follow requests](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/follow-requests)
-* [Display content warning title above text](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/cw-above-text)
-* [Add notifications tab for posts](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/posts-notifications-tab)
-* [Show visibility of original post when replying](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/display-reply-visibility)
-* [Clickable reply/boost line above posts](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:clickable-boost-reply-line)
-* [Long-click to copy username from profile](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/copy-username)
+* [Add “Federation” tab and change Discover tab order](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/add-federated-timeline) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/8))
+* [Add image description button and viewer](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/display-alt-text) ([Pull request](https://github.com/mastodon/mastodon-android/pull/129))
+* [Implement pinning posts and displaying pinned posts](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/pin-posts) ([Pull request](https://github.com/mastodon/mastodon-android/pull/140))
+* [Implement deleting and re-drafting](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/delete-redraft) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/21))
+* [Implement a bookmark button and list](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/bookmarks) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/22))
+* [Add “Check for update” button in addition to integrated update checker](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/check-for-update-button)
+* [Add “Mark media as sensitive” option](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/mark-media-as-sensitive)
+* [Add settings to hide replies and reposts from the timeline](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/filter-home-timeline) ([Pull request](https://github.com/mastodon/mastodon-android/pull/317))
+* [Follow and unfollow hashtags](https://github.com/sk22/megalodon/commit/7d38f031f197aa6cefaf53e39d929538689c1e4e) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/233))
+* [Notification bell for posts](https://github.com/sk22/megalodon/commit/b166ca705eb9169025ef32bbe6315b42491b57ea) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/81))
+* [Viewing lists and adding/removing users from lists](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:list-timeline-views) based on [@obstsalatschuessel](https://github.com/obstsalatschuessel)'s [Pull request](https://github.com/mastodon/mastodon-android/pull/286)
+* [List favorited posts](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/favs-list)
+* [Accept/reject follow requests](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/follow-requests)
+* [Display content warning title above text](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/cw-above-text)
+* [Add notifications tab for posts](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/posts-notifications-tab)
+* [Show visibility of original post when replying](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/display-reply-visibility)
+* [Clickable reply/boost line above posts](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:clickable-boost-reply-line)
+* [Long-click to copy username from profile](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/copy-username)
### Behavior
-* [Make back button return to the home tab before exiting the app](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/back-returns-home) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/118))
-* [Always preserve content warnings when replying](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/always-preserve-cw) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/113))
-* [Display full image when adding image description](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/compose-image-description-full-image) ([Pull request](https://github.com/mastodon/mastodon-android/pull/182))
-* [Set spoiler height independently to content height](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:spoiler-height-independent) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/166))
-* [Option to hide interaction numbers](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:settings/hide-interaction-numbers)
-* [Option to always reveal content warnings](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:feature/cw-above-text)
-* [Option to disable scrolling title bars](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:settings/disable-marquee)
+* [Make back button return to the home tab before exiting the app](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/back-returns-home) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/118))
+* [Always preserve content warnings when replying](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/always-preserve-cw) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/113))
+* [Display full image when adding image description](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/compose-image-description-full-image) ([Pull request](https://github.com/mastodon/mastodon-android/pull/182))
+* [Set spoiler height independently to content height](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:spoiler-height-independent) ([Closes issue](https://github.com/mastodon/mastodon-android/issues/166))
+* [Option to hide interaction numbers](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:settings/hide-interaction-numbers)
+* [Option to always reveal content warnings](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:feature/cw-above-text)
+* [Option to disable scrolling title bars](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:settings/disable-marquee)
### Visual
-* [Custom extended footer redesign](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:compact-extended-footer)
-* [Improvements to the true black mode](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:true-black-improvements)
-* [Profile header tweaks](https://github.com/mastodon/mastodon-android/compare/master...sk22:mastodos:ui/profile-header-tweaks)
+* [Custom extended footer redesign](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:compact-extended-footer)
+* [Improvements to the true black mode](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:true-black-improvements)
+* [Profile header tweaks](https://github.com/mastodon/mastodon-android/compare/master...sk22:megalodon:ui/profile-header-tweaks)
### Branding
**TODO:** Come up with "a unique name and icon for your app that does not mistakenly imply any official connection with or endorsement by Mastodon gGmbH"...
-[https://github.com/sk22/mastodos/issues/15](https://github.com/sk22/mastodos/issues/15)
+[https://github.com/sk22/megalodon/issues/15](https://github.com/sk22/megalodon/issues/15)
## Building
@@ -139,4 +139,4 @@ This project is released under the [GPL-3 License](./LICENSE).
## Links
-@mastodos@floss.social
+@megalodon@floss.social
diff --git a/_config.yml b/_config.yml
index e4c267d31..4e7d76b75 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,2 +1,2 @@
-title: Mastodos
+title: Megalodon
layout: default
diff --git a/_layouts/default.html b/_layouts/default.html
index 6bbf738b7..cd80d4a87 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -4,7 +4,7 @@
- Mastodos
+ Megalodon
diff --git a/mastodon/src/github/java/org/joinmastodon/android/updater/GithubSelfUpdaterImpl.java b/mastodon/src/github/java/org/joinmastodon/android/updater/GithubSelfUpdaterImpl.java
index 7cfa03321..703b1c19e 100644
--- a/mastodon/src/github/java/org/joinmastodon/android/updater/GithubSelfUpdaterImpl.java
+++ b/mastodon/src/github/java/org/joinmastodon/android/updater/GithubSelfUpdaterImpl.java
@@ -111,7 +111,7 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
private void actuallyCheckForUpdates(){
Request req=new Request.Builder()
- .url("https://api.github.com/repos/sk22/mastodos/releases/latest")
+ .url("https://api.github.com/repos/sk22/megalodon/releases/latest")
.build();
Call call=MastodonAPIController.getHttpClient().newCall(req);
try(Response resp=call.execute()){
@@ -144,7 +144,7 @@ public class GithubSelfUpdaterImpl extends GithubSelfUpdater{
Log.d(TAG, "actuallyCheckForUpdates: new version: "+version);
for(JsonElement el:obj.getAsJsonArray("assets")){
JsonObject asset=el.getAsJsonObject();
- if("mastodos.apk".equals(asset.get("name")) && "application/vnd.android.package-archive".equals(asset.get("content_type").getAsString()) && "uploaded".equals(asset.get("state").getAsString())){
+ if("megalodon.apk".equals(asset.get("name")) && "application/vnd.android.package-archive".equals(asset.get("content_type").getAsString()) && "uploaded".equals(asset.get("state").getAsString())){
long size=asset.get("size").getAsLong();
String url=asset.get("browser_download_url").getAsString();
diff --git a/mastodon/src/main/ic_launcher-playstore.png b/mastodon/src/main/ic_launcher-playstore.png
index fe0cfb502..ffc0e5991 100644
Binary files a/mastodon/src/main/ic_launcher-playstore.png and b/mastodon/src/main/ic_launcher-playstore.png differ
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 b14600f0a..5360153ef 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,9 +11,9 @@ public class CreateOAuthApp extends MastodonAPIRequest{
}
private static class Request{
- public String clientName="Mastodos";
+ public String clientName="Megalodon";
public String redirectUris=AccountSessionManager.REDIRECT_URI;
public String scopes=AccountSessionManager.SCOPE;
- public String website="https://sk22.github.io/mastodos";
+ public String website="https://sk22.github.io/megalodon";
}
}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
index 9cc1be62e..26edd22cf 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
@@ -5,7 +5,6 @@ import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
import android.app.Activity;
-import android.content.res.ColorStateList;
import android.content.res.Configuration;
import android.os.Build;
import android.os.Bundle;
@@ -18,7 +17,7 @@ import android.view.ViewGroup;
import android.widget.Button;
import android.widget.FrameLayout;
import android.widget.ImageButton;
-import android.widget.ImageView;
+import android.widget.TextView;
import android.widget.Toolbar;
import com.squareup.otto.Subscribe;
@@ -42,6 +41,7 @@ import org.joinmastodon.android.utils.StatusFilterPredicate;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
+import java.util.Locale;
import java.util.Set;
import java.util.stream.Collectors;
@@ -56,7 +56,7 @@ import me.grishka.appkit.utils.V;
public class HomeTimelineFragment extends StatusListFragment{
private ImageButton fab;
- private ImageView toolbarLogo;
+ private TextView toolbarLogo;
private Button toolbarShowNewPostsBtn;
private boolean newPostsBtnShown;
private AnimatorSet currentNewPostsAnim;
@@ -315,10 +315,9 @@ public class HomeTimelineFragment extends StatusListFragment{
}
private void updateToolbarLogo(){
- toolbarLogo=new ImageView(getActivity());
- toolbarLogo.setScaleType(ImageView.ScaleType.CENTER);
- toolbarLogo.setImageResource(R.drawable.logo);
- toolbarLogo.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(getActivity(), android.R.attr.textColorPrimary)));
+ toolbarLogo =new TextView(getActivity());
+ toolbarLogo.setText(getString(R.string.app_name).toLowerCase(Locale.getDefault()));
+ toolbarLogo.setTextAppearance(R.style.app_title);
toolbarShowNewPostsBtn=new Button(getActivity());
toolbarShowNewPostsBtn.setTextAppearance(R.style.m3_title_medium);
diff --git a/mastodon/src/main/res/drawable-v24/ic_launcher_monochrome.xml b/mastodon/src/main/res/drawable-v24/ic_launcher_monochrome.xml
index d79529585..0a4d6a75f 100644
--- a/mastodon/src/main/res/drawable-v24/ic_launcher_monochrome.xml
+++ b/mastodon/src/main/res/drawable-v24/ic_launcher_monochrome.xml
@@ -1,10 +1,5 @@
-
-
+
+
+
diff --git a/mastodon/src/main/res/drawable/ic_ntf_logo.xml b/mastodon/src/main/res/drawable/ic_ntf_logo.xml
index b6bdf73b5..d7eb886b3 100644
--- a/mastodon/src/main/res/drawable/ic_ntf_logo.xml
+++ b/mastodon/src/main/res/drawable/ic_ntf_logo.xml
@@ -1,10 +1,10 @@
-
-
+
+
+
+
+
+
+
+
diff --git a/mastodon/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/mastodon/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 31cfbe12f..4ae7d1237 100644
--- a/mastodon/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/mastodon/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -2,9 +2,4 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/mastodon/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/mastodon/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 31cfbe12f..4ae7d1237 100644
--- a/mastodon/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/mastodon/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -2,9 +2,4 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/mastodon/src/main/res/mipmap-hdpi/ic_launcher.png b/mastodon/src/main/res/mipmap-hdpi/ic_launcher.png
index 12352d8f6..55af9215f 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 867d85d37..a79022bf1 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 a79401703..9e024340c 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 07cce5c8c..55af9215f 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 b4773de48..388c2fd40 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 bb3570725..4f282a2d6 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 9ad01b61f..b92a5e951 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 d0717a6a4..388c2fd40 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 ff289fb79..5e3fb9363 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 84665c145..d4fe1f161 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 f17fe66a3..0088e7f47 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 c1d757078..5e3fb9363 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 8a721e0ea..494ce52ca 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 29af9b212..c98dfb772 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 a3fdc13ab..87d7d55f2 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 e7a08954b..494ce52ca 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 71ae9633d..87a264032 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 86a97a9cf..31afbe6c8 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 0d5c85c77..375093648 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 1994cdd41..87a264032 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-de-rDE/strings.xml b/mastodon/src/main/res/values-de-rDE/strings.xml
index 8af6df01b..7c0b6d815 100644
--- a/mastodon/src/main/res/values-de-rDE/strings.xml
+++ b/mastodon/src/main/res/values-de-rDE/strings.xml
@@ -275,7 +275,7 @@
DatenschutzbestimmungenGefährlichesMedienpuffer leeren
- Mastodos v%1$s (%2$d)
+ Megalodon v%1$s (%2$d)Medienpuffer geleertBist du dir sicher, dass du dich abmelden möchtest?Inhaltswarnung
@@ -396,9 +396,9 @@
Dein Gerät hat gerade keinen Zugang zum InternetWird verarbeitet…
- Mastodos %s ist zum Herunterladen bereit.
+ Megalodon %s ist zum Herunterladen bereit.
- Mastodos %s wurde heruntergeladen und ist bereit zum Installieren.
+ Megalodon %s wurde heruntergeladen und ist bereit zum Installieren.Download (%s)Installieren
@@ -411,7 +411,7 @@
Folgeanfrage ablehnenListen mit %sMastodon und Ihre Privatsphäre
- Obwohl die Mastodon-App keine Daten sammelt, kann der Server, über den Sie sich anmelden, eine andere Richtlinie haben. Nehmen Sie sich eine Minute Zeit, um die Mastodon-Datenschutzrichtlinien und die Datenschutzrichtlinien Ihres Servers zu lesen und zu akzeptieren.
+ Obwohl die Megalodon-App keine Daten sammelt, kann der Server, über den Sie sich anmelden, eine andere Richtlinie haben. Nehmen Sie sich eine Minute Zeit, um die Mastodon-Datenschutzrichtlinien und die Datenschutzrichtlinien Ihres Servers zu lesen und zu akzeptieren.Ich stimme zuInhaltswarnungen immer ausklappenLaufschrift in Titelleisten deaktivieren
diff --git a/mastodon/src/main/res/values/strings.xml b/mastodon/src/main/res/values/strings.xml
index 5998bc24e..35e5bee33 100644
--- a/mastodon/src/main/res/values/strings.xml
+++ b/mastodon/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
- Mastodos
+ MegalodonGet startedLog in
@@ -279,7 +279,7 @@
Privacy policyThe spicy zoneClear media cache
- Mastodos v%1$s (%2$d)
+ Megalodon v%1$s (%2$d)Media cache clearedAre you sure you want to sign out?Sensitive content
@@ -403,16 +403,16 @@
Your device lost connection to the internetProcessing…
- Mastodos %s is ready to download.
+ Megalodon %s is ready to download.
- Mastodos %s is downloaded and ready to install.
+ Megalodon %s is downloaded and ready to install.Download (%s)InstallCheck for updateNo update availableMastodon and your privacy
- Although the Mastodon app does not collect any data, the server you sign up through may have a different policy. Take a minute to review and agree to the Mastodon app privacy policy and your server\'s privacy policy.
+ Although the Megalodon app does not collect any data, the server you sign up through may have a different policy. Take a minute to review and agree to the Mastodon app privacy policy and your server\'s privacy policy.I AgreeListsFavorited posts
diff --git a/mastodon/src/main/res/values/styles.xml b/mastodon/src/main/res/values/styles.xml
index 314e07986..44d7e574c 100644
--- a/mastodon/src/main/res/values/styles.xml
+++ b/mastodon/src/main/res/values/styles.xml
@@ -295,6 +295,12 @@
?android:textColorPrimary
+
+