New logo

32 files changed, 57 insertions, 36 deletions

diff --git a/app/src/main/res/drawable-hdpi-v11/notification_icon.png b/app/src/main/res/drawable-hdpi-v11/notification_icon.png
index 07ad40657..6101d016f 100644
--- a/app/src/main/res/drawable-hdpi-v11/notification_icon.png
+++ b/app/src/main/res/drawable-hdpi-v11/notification_icon.png
diff --git a/app/src/main/res/drawable-hdpi-v9/notification_icon.png b/app/src/main/res/drawable-hdpi-v9/notification_icon.png
index af20f7240..113b5daf4 100644
--- a/app/src/main/res/drawable-hdpi-v9/notification_icon.png
+++ b/app/src/main/res/drawable-hdpi-v9/notification_icon.png
diff --git a/app/src/main/res/drawable-hdpi/ic_g_translate.png b/app/src/main/res/drawable-hdpi/ic_g_translate.png
new file mode 100644
index 000000000..857418ff8
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_g_translate.png
diff --git a/app/src/main/res/drawable-hdpi/notification_icon.png b/app/src/main/res/drawable-hdpi/notification_icon.png
index 4737c6d71..7e7c1d644 100644
--- a/app/src/main/res/drawable-hdpi/notification_icon.png
+++ b/app/src/main/res/drawable-hdpi/notification_icon.png
diff --git a/app/src/main/res/drawable-ldpi/ic_g_translate.png b/app/src/main/res/drawable-ldpi/ic_g_translate.png
new file mode 100644
index 000000000..e19363c59
--- /dev/null
+++ b/app/src/main/res/drawable-ldpi/ic_g_translate.png
diff --git a/app/src/main/res/drawable-mdpi-v11/notification_icon.png b/app/src/main/res/drawable-mdpi-v11/notification_icon.png
index 59d8a8af9..af17ced8f 100644
--- a/app/src/main/res/drawable-mdpi-v11/notification_icon.png
+++ b/app/src/main/res/drawable-mdpi-v11/notification_icon.png
diff --git a/app/src/main/res/drawable-mdpi-v9/notification_icon.png b/app/src/main/res/drawable-mdpi-v9/notification_icon.png
index 221ecd751..b42dbc67c 100644
--- a/app/src/main/res/drawable-mdpi-v9/notification_icon.png
+++ b/app/src/main/res/drawable-mdpi-v9/notification_icon.png
diff --git a/app/src/main/res/drawable-mdpi/ic_g_translate.png b/app/src/main/res/drawable-mdpi/ic_g_translate.png
new file mode 100644
index 000000000..cea69475c
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_g_translate.png
diff --git a/app/src/main/res/drawable-mdpi/notification_icon.png b/app/src/main/res/drawable-mdpi/notification_icon.png
index e8b774a9e..a133f0ad1 100644
--- a/app/src/main/res/drawable-mdpi/notification_icon.png
+++ b/app/src/main/res/drawable-mdpi/notification_icon.png
diff --git a/app/src/main/res/drawable-xhdpi-v11/notification_icon.png b/app/src/main/res/drawable-xhdpi-v11/notification_icon.png
index 1d2eb3988..a8d3ec889 100644
--- a/app/src/main/res/drawable-xhdpi-v11/notification_icon.png
+++ b/app/src/main/res/drawable-xhdpi-v11/notification_icon.png
diff --git a/app/src/main/res/drawable-xhdpi-v9/notification_icon.png b/app/src/main/res/drawable-xhdpi-v9/notification_icon.png
index a8f08407c..175c697f3 100644
--- a/app/src/main/res/drawable-xhdpi-v9/notification_icon.png
+++ b/app/src/main/res/drawable-xhdpi-v9/notification_icon.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_g_translate.png b/app/src/main/res/drawable-xhdpi/ic_g_translate.png
new file mode 100644
index 000000000..e5bb40459
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_g_translate.png
diff --git a/app/src/main/res/drawable-xhdpi/notification_icon.png b/app/src/main/res/drawable-xhdpi/notification_icon.png
index d237fbc95..f67de817a 100644
--- a/app/src/main/res/drawable-xhdpi/notification_icon.png
+++ b/app/src/main/res/drawable-xhdpi/notification_icon.png
diff --git a/app/src/main/res/drawable-xxhdpi-v11/notification_icon.png b/app/src/main/res/drawable-xxhdpi-v11/notification_icon.png
index c107bbdd5..bc3f8add1 100644
--- a/app/src/main/res/drawable-xxhdpi-v11/notification_icon.png
+++ b/app/src/main/res/drawable-xxhdpi-v11/notification_icon.png
diff --git a/app/src/main/res/drawable-xxhdpi-v9/notification_icon.png b/app/src/main/res/drawable-xxhdpi-v9/notification_icon.png
index 07e6b5dd9..e13d3477f 100644
--- a/app/src/main/res/drawable-xxhdpi-v9/notification_icon.png
+++ b/app/src/main/res/drawable-xxhdpi-v9/notification_icon.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_g_translate.png b/app/src/main/res/drawable-xxhdpi/ic_g_translate.png
new file mode 100644
index 000000000..75328d007
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_g_translate.png
diff --git a/app/src/main/res/drawable-xxhdpi/notification_icon.png b/app/src/main/res/drawable-xxhdpi/notification_icon.png
index e822ba7a7..54a25836a 100644
--- a/app/src/main/res/drawable-xxhdpi/notification_icon.png
+++ b/app/src/main/res/drawable-xxhdpi/notification_icon.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_g_translate.png b/app/src/main/res/drawable-xxxhdpi/ic_g_translate.png
new file mode 100644
index 000000000..69ba150df
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_g_translate.png
diff --git a/app/src/main/res/drawable/background_splash.xml b/app/src/main/res/drawable/background_splash.xml
index 1204da0ab..2e5929437 100644
--- a/app/src/main/res/drawable/background_splash.xml
+++ b/app/src/main/res/drawable/background_splash.xml
@@ -18,7 +18,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-        android:drawable="@color/splashc"/>
+        android:drawable="?attr/colorPrimary"/>
 
     <item>
         <bitmap
diff --git a/app/src/main/res/drawable/mastodonlogo.png b/app/src/main/res/drawable/mastodonlogo.png
index 3a2574151..9f81bb9ad 100644
--- a/app/src/main/res/drawable/mastodonlogo.png
+++ b/app/src/main/res/drawable/mastodonlogo.png
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index bd68ccf16..59c430b0c 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -132,4 +132,16 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content" />
     </LinearLayout>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:padding="10dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:text="@string/thanks_text"
+            android:layout_marginTop="20dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 15c4bf863..32278450b 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -28,10 +28,10 @@
         >
         <ImageView
             android:layout_marginTop="20dp"
-            android:layout_width="100dp"
+            android:layout_width="150dp"
             android:layout_gravity="center_horizontal"
             android:src="@drawable/mastodonlogo"
-            android:layout_height="100dp"
+            android:layout_height="150dp"
             tools:ignore="ContentDescription" />
         <LinearLayout
             android:layout_width="match_parent"
@@ -41,7 +41,6 @@
             android:orientation="vertical"
             android:layout_height="wrap_content">
             <EditText
-                android:visibility="gone"
                 android:id="@+id/login_instance"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -82,19 +81,6 @@
                 android:textSize="20sp"
                 android:text="@string/login" />
             <TextView
-                android:id="@+id/other_instance"
-                android:textAllCaps="false"
-                android:gravity="center"
-                android:layout_marginTop="20dp"
-                android:drawablePadding="10dp"
-                android:padding="20dp"
-                android:textSize="16sp"
-                android:layout_gravity="center"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textColor="?attr/colorAccent"
-                android:text="@string/other_instance" />
-            <TextView
                 android:id="@+id/login_two_step"
                 android:textAllCaps="false"
                 android:gravity="center"
diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml
index f74800d10..c30e6606c 100644
--- a/app/src/main/res/layout/drawer_status.xml
+++ b/app/src/main/res/layout/drawer_status.xml
@@ -33,31 +33,59 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="5dp"
+            android:layout_marginRight="5dp"
             android:orientation="horizontal"
             android:baselineAligned="false">
             <RelativeLayout
-                android:layout_height="60dp"
+                android:layout_height="wrap_content"
                 android:layout_width="60dp"
-                android:layout_gravity="center_horizontal|top"
-                android:gravity="center_horizontal|top">
+                >
                 <ImageView
                     android:layout_width="50dp"
                     android:layout_height="50dp"
-                    android:layout_alignParentStart="true"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentTop="true"
+                    android:layout_marginTop="5dp"
+                    android:layout_centerHorizontal="true"
                     android:id="@+id/status_account_profile"
                     tools:ignore="ContentDescription" />
                 <ImageView
+                    android:layout_width="45dp"
+                    android:layout_height="45dp"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginStart="5dp"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentLeft="true"
+                    android:layout_centerHorizontal="true"
+                    android:visibility="gone"
                     android:id="@+id/status_account_profile_boost"
+                    tools:ignore="ContentDescription" />
+                <ImageView
+                    android:id="@+id/status_account_profile_boost_by"
                     android:layout_height="30dp"
                     android:layout_width="30dp"
+                    android:layout_marginTop="25dp"
                     android:layout_alignParentEnd="true"
                     android:layout_alignParentRight="true"
-                    android:layout_alignParentBottom="true"
                     style="?attr/shapeBorder"
                     android:visibility="gone"
                     tools:ignore="ContentDescription" />
+                <Button
+                    android:id="@+id/status_translate"
+                    android:layout_width="50dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="70dp"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginStart="5dp"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentLeft="true"
+                    android:scaleType="center"
+                    android:drawablePadding="0dp"
+                    android:paddingStart="17dp"
+                    android:paddingLeft="17dp"
+                    android:drawableStart="@drawable/ic_translate"
+                    android:drawableLeft="@drawable/ic_translate"
+                    tools:ignore="ContentDescription" />
             </RelativeLayout>
             <LinearLayout
                 android:layout_marginStart="5dp"
@@ -347,15 +375,6 @@
                 <ImageView
                     android:layout_marginRight="20dp"
                     android:layout_marginEnd="20dp"
-                    android:id="@+id/status_translate"
-                    android:layout_gravity="center_vertical"
-                    android:layout_width="25dp"
-                    android:layout_height="25dp"
-                    android:src="@drawable/ic_translate"
-                    tools:ignore="ContentDescription" />
-                <ImageView
-                    android:layout_marginRight="20dp"
-                    android:layout_marginEnd="20dp"
                     android:id="@+id/status_privacy"
                     android:layout_gravity="center_vertical"
                     android:layout_width="25dp"
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index de155a4e8..15aa80470 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-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 6ba15a802..d5574f61f 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-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index fc67785cd..a90353bc6 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-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index b7d9703f7..b70f9b2ba 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-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 78be62aef..96a09883b 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/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index de7ba5828..238886d4a 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -312,4 +312,6 @@
         L\'application offre la possibilité de traduire les pouets en utilisant les paramètres régionaux de l\'appareil et l\'API de Yandex.\n
         Yandex a sa propre politique de confidentialité qui peut être consultée à l\'adresse suivante : https://yandex.ru/legal/confidential/?lang=en
     </string>
+
+    <string name="thanks_text">Merci à Stéphane pour le logo.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index dfdd144fd..629faa4c1 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -8,7 +8,7 @@
     <!-- DARK -->
     <color name="colorPrimaryD">#616161</color>
     <color name="colorPrimaryDarkD">#212121</color>
-    <color name="colorAccentD">#009688</color>
+    <color name="colorAccentD">#4db6ac</color>
 
     <!-- Header Profile-->
     <color name="header1">#0288D1</color>
@@ -38,5 +38,4 @@
     <color name="red_1">#F44336</color>
     <color name="black">#000</color>
 
-
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 938325d08..eea6eda8f 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -5,7 +5,7 @@
     <dimen name="activity_padding_header">10dp</dimen>
     <dimen name="nav_header_vertical_spacing">16dp</dimen>
     <dimen name="nav_header_height">160dp</dimen>
-    <dimen name="fab_margin">16dp</dimen>
+    <dimen name="fab_margin">5dp</dimen>
     <dimen name="drawer_padding">2dp</dimen>
     <dimen name="toot_padding">20dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f4fa9c848..490be97cc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -318,4 +318,7 @@
         The application offers the ability to translate toots using the locale of the device and the Yandex API.\n
         Yandex has its proper privacy-policy which can be found here: https://yandex.ru/legal/confidential/?lang=en
     </string>
+
+
+    <string name="thanks_text">Thank you to Stéphane for the logo.</string>
 </resources>
\ No newline at end of file