New logo

26 files changed, 54 insertions, 79 deletions

diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png
index e85c8567e..cd989773f 100644
--- a/app/src/main/ic_launcher-web.png
+++ b/app/src/main/ic_launcher-web.png
diff --git a/app/src/main/java/app/fedilab/android/jobs/NotificationsSyncJob.java b/app/src/main/java/app/fedilab/android/jobs/NotificationsSyncJob.java
index a148eb6ea..6e4c0a59b 100644
--- a/app/src/main/java/app/fedilab/android/jobs/NotificationsSyncJob.java
+++ b/app/src/main/java/app/fedilab/android/jobs/NotificationsSyncJob.java
@@ -291,7 +291,7 @@ public class NotificationsSyncJob extends Job {
                                     @Override
                                     public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) {
                                         notify_user(getContext(), account, intent, BitmapFactory.decodeResource(getContext().getResources(),
-                                                R.drawable.mastodonlogo), finalNotifType, finalTitle, message);
+                                                R.drawable.fedilab_logo), finalNotifType, finalTitle, message);
                                         String lastNotif = sharedpreferences.getString(Helper.LAST_NOTIFICATION_MAX_ID + account.getId() + account.getInstance(), null);
                                         if (lastNotif == null || notifications.get(0).getId().compareTo(lastNotif) > 0) {
                                             SharedPreferences.Editor editor = sharedpreferences.edit();
diff --git a/app/src/main/java/app/fedilab/android/services/BackupNotificationInDataBaseService.java b/app/src/main/java/app/fedilab/android/services/BackupNotificationInDataBaseService.java
index 1da3d7bd6..7873a440b 100644
--- a/app/src/main/java/app/fedilab/android/services/BackupNotificationInDataBaseService.java
+++ b/app/src/main/java/app/fedilab/android/services/BackupNotificationInDataBaseService.java
@@ -150,7 +150,7 @@ public class BackupNotificationInDataBaseService extends IntentService {
             String title = getString(R.string.data_backup_toots, account.getAcct());
             if (finalToastMessage) {
                 Helper.notify_user(getApplicationContext(), account, mainActivity, BitmapFactory.decodeResource(getResources(),
-                        R.drawable.mastodonlogo), Helper.NotifType.BACKUP, title, message);
+                        R.drawable.fedilab_logo), Helper.NotifType.BACKUP, title, message);
             }
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/app/src/main/java/app/fedilab/android/services/BackupStatusInDataBaseService.java b/app/src/main/java/app/fedilab/android/services/BackupStatusInDataBaseService.java
index 711f85db8..9831f3012 100644
--- a/app/src/main/java/app/fedilab/android/services/BackupStatusInDataBaseService.java
+++ b/app/src/main/java/app/fedilab/android/services/BackupStatusInDataBaseService.java
@@ -150,7 +150,7 @@ public class BackupStatusInDataBaseService extends IntentService {
             String title = getString(R.string.data_backup_toots, account.getAcct());
             if (finalToastMessage) {
                 Helper.notify_user(getApplicationContext(), account, mainActivity, BitmapFactory.decodeResource(getResources(),
-                        R.drawable.mastodonlogo), Helper.NotifType.BACKUP, title, message);
+                        R.drawable.fedilab_logo), Helper.NotifType.BACKUP, title, message);
             }
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/app/src/main/java/app/fedilab/android/services/BackupStatusService.java b/app/src/main/java/app/fedilab/android/services/BackupStatusService.java
index 31f18aab7..4a4a33fb9 100644
--- a/app/src/main/java/app/fedilab/android/services/BackupStatusService.java
+++ b/app/src/main/java/app/fedilab/android/services/BackupStatusService.java
@@ -189,7 +189,7 @@ public class BackupStatusService extends IntentService {
             intentOpen.setDataAndType(uri, "text/csv");
             String title = getString(R.string.data_export_toots, account.getAcct());
             Helper.notify_user(getApplicationContext(), account, intentOpen, BitmapFactory.decodeResource(getResources(),
-                    R.drawable.mastodonlogo), Helper.NotifType.BACKUP, title, message);
+                    R.drawable.fedilab_logo), Helper.NotifType.BACKUP, title, message);
         } catch (Exception e) {
             e.printStackTrace();
             message = getString(R.string.data_export_error, account.getAcct());
diff --git a/app/src/main/java/app/fedilab/android/services/LiveNotificationDelayedService.java b/app/src/main/java/app/fedilab/android/services/LiveNotificationDelayedService.java
index 28d438928..497872620 100644
--- a/app/src/main/java/app/fedilab/android/services/LiveNotificationDelayedService.java
+++ b/app/src/main/java/app/fedilab/android/services/LiveNotificationDelayedService.java
@@ -347,7 +347,7 @@ public class LiveNotificationDelayedService extends Service {
                                             @Override
                                             public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) {
                                                 Helper.notify_user(getApplicationContext(), account, intent, BitmapFactory.decodeResource(getResources(),
-                                                        R.drawable.mastodonlogo), finalNotifType, "@" + notification.getAccount().getAcct(), finalMessage);
+                                                        R.drawable.fedilab_logo), finalNotifType, "@" + notification.getAccount().getAcct(), finalMessage);
                                                 return false;
                                             }
                                         })
diff --git a/app/src/main/java/app/fedilab/android/services/LiveNotificationService.java b/app/src/main/java/app/fedilab/android/services/LiveNotificationService.java
index ffac498ab..2b9c52d9d 100644
--- a/app/src/main/java/app/fedilab/android/services/LiveNotificationService.java
+++ b/app/src/main/java/app/fedilab/android/services/LiveNotificationService.java
@@ -434,7 +434,7 @@ public class LiveNotificationService extends Service implements NetworkStateRece
                                                     @Override
                                                     public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) {
                                                         Helper.notify_user(getApplicationContext(), account, intent, BitmapFactory.decodeResource(getResources(),
-                                                                R.drawable.mastodonlogo), finalNotifType, "@" + notification.getAccount().getAcct(), finalMessage);
+                                                                R.drawable.fedilab_logo), finalNotifType, "@" + notification.getAccount().getAcct(), finalMessage);
                                                         return false;
                                                     }
                                                 })
diff --git a/app/src/main/res/drawable/background_splash.xml b/app/src/main/res/drawable/background_splash.xml
index 7b36af3d2..37ac1ab38 100644
--- a/app/src/main/res/drawable/background_splash.xml
+++ b/app/src/main/res/drawable/background_splash.xml
@@ -21,6 +21,6 @@
     <item>
         <bitmap
             android:gravity="center"
-            android:src="@drawable/mastodonlogo" />
+            android:src="@drawable/fedilab_logo" />
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/fedilab_logo.xml b/app/src/main/res/drawable/fedilab_logo.xml
new file mode 100644
index 000000000..5a94c5794
--- /dev/null
+++ b/app/src/main/res/drawable/fedilab_logo.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="1024dp"
+    android:height="1024dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:pathData="M752.89,204.37c0,0 0,275.59 0,351.76c0,96.04 -49.77,129.51 -121.52,129.51c-71.75,0 -359.77,0 -359.77,0V204.37H752.89z"
+      android:fillColor="#FF8515"/>
+  <path
+      android:pathData="M271.63,582.08l0,120.11l481.29,-497.79l-481.29,0z"
+      android:fillColor="#FFCC16"/>
+  <path
+      android:pathData="M752.89,401.3l-218.3,284.35l-113.57,0l231.73,-267.83z"
+      android:fillColor="#FF5615"/>
+  <path
+      android:pathData="M271.63,778.98l0,40.63l481.29,-418.3l-481.29,0z"
+      android:fillColor="#FFCC16"/>
+  <path
+      android:pathData="M624.84,401.31l128.08,-196.91l-190.37,196.9z"
+      android:fillColor="#FF5615"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
index a24166cae..288712850 100644
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,70 +1,24 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="108dp"
     android:height="108dp"
-    android:viewportWidth="357.55405"
-    android:viewportHeight="357.55405">
-    <group
-        android:translateX="46.482025"
-        android:translateY="46.482025">
-        <path
-            android:fillColor="#c5ab63"
-            android:pathData="m70.935,100.888a21.594,21.594 0,0 1,-9.236 9.193l50.704,50.902 12.224,-6.195zM137.811,168.025 L125.587,174.219 151.277,200.011a21.594,21.594 0,0 1,9.237 -9.194z"
-            android:strokeWidth="3.7795" />
-        <path
-            android:fillColor="#0a9ee6"
-            android:pathData="m196.484,121.029 l-28.704,14.547 2.116,13.538 32.478,-16.46a21.594,21.594 0,0 1,-5.89 -11.624zM151.118,144.021 L83.25,178.417a21.594,21.594 0,0 1,5.891 11.626l64.094,-32.483z"
-            android:strokeWidth="3.7795" />
-        <path
-            android:fillColor="#0a9ee6"
-            android:pathData="m129.266,59.296 l-32.749,63.932 9.669,9.706 34.674,-67.69a21.594,21.594 0,0 1,-11.594 -5.949zM87.999,139.86 L71.411,172.243a21.594,21.594 0,0 1,11.593 5.949l14.663,-28.626z"
-            android:strokeWidth="3.7795" />
-        <path
-            android:fillColor="#c5ac64"
-            android:pathData="m61.427,110.223a21.594,21.594 0,0 1,-10.788 2.255,21.594 21.594,0 0,1 -2.085,-0.218l9.686,61.956a21.594,21.594 0,0 1,10.788 -2.255,21.594 21.594,0 0,1 2.083,0.218z"
-            android:strokeWidth="3.7795" />
-        <path
-            android:fillColor="#0a9ee6"
-            android:pathData="m89.166,190.348a21.594,21.594 0,0 1,0.226 4.35,21.594 21.594,0 0,1 -2.278,8.519l61.944,9.94a21.594,21.594 0,0 1,-0.227 -4.35,21.594 21.594,0 0,1 2.279,-8.519z"
-            android:strokeWidth="3.7795" />
-        <path
-            android:fillColor="#0a9ee6"
-            android:pathData="m202.561,132.881 l-28.592,55.817a21.594,21.594 0,0 1,11.595 5.95l28.592,-55.817a21.594,21.594 0,0 1,-11.595 -5.95z"
-            android:strokeWidth="3.7795" />
-        <path
-            android:fillColor="#c5ac64"
-            android:pathData="m163.578,53.934a21.594,21.594 0,0 1,-9.237 9.194l44.279,44.449a21.594,21.594 45,0 1,9.237 -9.194z"
-            android:strokeWidth="3.7795" />
-        <path
-            android:fillColor="#0a9ee6"
-            android:pathData="m123.147,47.444 l-55.974,28.366a21.594,21.594 0,0 1,5.891 11.624l55.974,-28.368a21.594,21.594 0,0 1,-5.89 -11.623z"
-            android:strokeWidth="3.7795" />
-        <path
-            android:fillColor="#c5ac64"
-            android:pathData="m154.235,63.178a21.594,21.594 135,0 1,-10.965 2.345,21.594 21.594,45 0,1 -1.89,-0.198l4.958,31.749 13.529,2.171zM149.22,115.531 L160.943,190.596a21.594,21.594 0,0 1,10.63 -2.176,21.594 21.594,0 0,1 2.259,0.248l-11.082,-70.964z"
-            android:strokeWidth="3.7795" />
-        <path
-            android:fillColor="#c5ab63"
-            android:pathData="m73.126,87.672a21.594,21.594 0,0 1,0.238 4.418,21.594 21.594,0 0,1 -2.244,8.457l31.774,5.103 6.245,-12.195zM127.583,96.417 L121.337,108.614 196.411,120.671a21.594,21.594 0,0 1,-0.218 -4.3,21.594 21.594,135 0,1 2.304,-8.564z"
-            android:strokeWidth="3.7795" />
-        <path
-            android:fillColor="#c5ac64"
-            android:pathData="M144.457,43.962m-19.602,-1.068a19.631,19.631 48.118,1 1,39.203 2.135a19.631,19.631 48.118,1 1,-39.203 -2.135"
-            android:strokeWidth="3.7795" />
-        <path
-            android:fillColor="#0a9ee6"
-            android:pathData="M217.745,117.549m-19.602,-1.068a19.631,19.631 48.118,1 1,39.203 2.135a19.631,19.631 48.118,1 1,-39.203 -2.135"
-            android:strokeWidth="3.7795" />
-        <path
-            android:fillColor="#0a9ee6"
-            android:pathData="M170.398,209.982m-19.602,-1.068a19.631,19.631 48.118,1 1,39.203 2.135a19.631,19.631 48.118,1 1,-39.203 -2.135"
-            android:strokeWidth="3.7795" />
-        <path
-            android:fillColor="#c5ab63"
-            android:pathData="M67.833,193.523m-19.602,-1.068a19.631,19.631 48.118,1 1,39.203 2.135a19.631,19.631 48.118,1 1,-39.203 -2.135"
-            android:strokeWidth="3.7795" />
-        <path
-            android:fillColor="#0a9ee6"
-            android:pathData="M51.81,90.919m-19.602,-1.068a19.631,19.631 48.118,1 1,39.203 2.135a19.631,19.631 48.118,1 1,-39.203 -2.135"
-            android:strokeWidth="3.7795" />
-    </group>
+    android:viewportWidth="1312.8206"
+    android:viewportHeight="1312.8206">
+  <group android:translateX="144.41026"
+      android:translateY="144.41026">
+    <path
+        android:pathData="M752.89,204.37c0,0 0,275.59 0,351.76c0,96.04 -49.77,129.51 -121.52,129.51c-71.75,0 -359.77,0 -359.77,0V204.37H752.89z"
+        android:fillColor="#FF8515"/>
+    <path
+        android:pathData="M271.63,582.08l0,120.11l481.29,-497.79l-481.29,0z"
+        android:fillColor="#FFCC16"/>
+    <path
+        android:pathData="M752.89,401.3l-218.3,284.35l-113.57,0l231.73,-267.83z"
+        android:fillColor="#FF5615"/>
+    <path
+        android:pathData="M271.63,778.98l0,40.63l481.29,-418.3l-481.29,0z"
+        android:fillColor="#FFCC16"/>
+    <path
+        android:pathData="M624.84,401.31l128.08,-196.91l-190.37,196.9z"
+        android:fillColor="#FF5615"/>
+  </group>
 </vector>
diff --git a/app/src/main/res/drawable/mastodon_icon.png b/app/src/main/res/drawable/mastodon_icon.png
index 920488763..81db3c279 100644
--- a/app/src/main/res/drawable/mastodon_icon.png
+++ b/app/src/main/res/drawable/mastodon_icon.png
diff --git a/app/src/main/res/drawable/mastodonlogo.png b/app/src/main/res/drawable/mastodonlogo.png
deleted file mode 100644
index a962ef7e7..000000000
--- a/app/src/main/res/drawable/mastodonlogo.png
+++ /dev/null
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index d30067375..303d3a08b 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -29,7 +29,7 @@
             android:layout_marginTop="20dp"
             android:layout_width="150dp"
             android:layout_gravity="center_horizontal"
-            android:src="@drawable/mastodonlogo"
+            android:src="@drawable/fedilab_logo"
             android:layout_height="150dp"
             android:contentDescription="@string/app_logo" />
 
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index ac94b34f5..7353dbd1f 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index ac94b34f5..7353dbd1f 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 25d9a349b..f2f1e8f4a 100644
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
index d3381a897..d6050eb22 100644
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 4b8c1aef8..b87b45c17 100644
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
index 17e79382d..2cb90427a 100644
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 3303cf6e8..4c3bc67c1 100644
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
index ba66fcf4a..79e7b4395 100644
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 220a0623c..385730f00 100644
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
index 45ffc88b6..bfd3e9df7 100644
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 45e73ea6c..23ad2214c 100644
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
index ec4877298..835af1ac0 100644
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
index edb92f1b6..c5d5899fd 100644
--- a/app/src/main/res/values/ic_launcher_background.xml
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#14161B</color>
+    <color name="ic_launcher_background">#FFFFFF</color>
 </resources>
\ No newline at end of file