Merge pull request #202 from Adventech/tm/feat/logo_update

Update logo assets

app/src/main/res/drawable/ss_splash_background.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (c) 2020. Adventech <[email protected]>
   ~
   ~ Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -22,9 +21,9 @@
   -->
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/ss_blue"/>
+    <item android:drawable="@color/ss_blue" />
 
-    <item>
+    <item android:right="24dp">
         <bitmap
             android:gravity="center"
             android:src="@drawable/ic_sspm_splash" />

app/src/main/res/layout/ss_login_logo.xml

@@ -27,15 +27,14 @@
 
     <ImageView
         android:id="@+id/ss_login_app_logo"
-        android:layout_width="@dimen/ss_login_app_logo_size"
-        android:layout_height="@dimen/ss_login_app_logo_size"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:contentDescription="@string/blank"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/logo_sspm"
-        app:tint="?attr/colorPrimary" />
+        app:srcCompat="@drawable/ic_logo_sspm_scaled" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/ss_login_app_name"
@@ -45,7 +44,7 @@
         android:layout_marginTop="@dimen/ss_login_app_name_margin_top"
         android:text="@string/ss_app_name"
         android:textAppearance="?attr/textAppearanceHeadline6"
-        android:textColor="?attr/colorPrimary"
+        android:textColor="?attr/colorOnBackground"
         android:textSize="@dimen/ss_login_app_name_font_size"
         app:fontFamily="@font/lato_bold"
         app:layout_constraintBottom_toBottomOf="parent"

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/white"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_logo_sspm"/>
 </adaptive-icon>

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/white"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_logo_sspm"/>
 </adaptive-icon>

app/src/main/res/values/dimens.xml

@@ -23,7 +23,6 @@
 <resources>
 
     <!-- LOGIN SCREEN RELATED -->
-    <dimen name="ss_login_app_logo_size">82dp</dimen>
     <dimen name="ss_login_app_name_font_size">20sp</dimen>
     <dimen name="ss_login_app_name_margin_top">15dp</dimen>
     <dimen name="ss_login_loading_size">48dp</dimen>

common/design/src/main/res/drawable-night/ic_logo_sspm_scaled.xml

@@ -0,0 +1,31 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+
+    <group
+        android:pivotX="54"
+        android:pivotY="54"
+        android:scaleX="2.0"
+        android:scaleY="2.0">
+        <group
+            android:scaleX="0.19228487"
+            android:scaleY="0.19228487"
+            android:translateX="21.6"
+            android:translateY="34.9638">
+            <path
+                android:fillColor="#FFFFFF"
+                android:fillType="evenOdd"
+                android:pathData="M143.94,46.215a54.208,54.208 0,0 0,-16.617 13.14h9.39c2.014,-4.938 4.441,-9.37 7.227,-13.14M164.129,40.936c-7.182,1.915 -13.624,8.721 -18.238,18.421h18.238V40.936M48.282,85.896h58.488a61.83,61.83 0,0 1,2.212 -9.997h8.736a52.92,52.92 0,0 0,-2.589 9.997h15.555c0.269,-3.44 0.714,-6.774 1.301,-9.997h8.509a88.744,88.744 0,0 0,-1.473 9.997h25.107v-9.997h8.273v9.997h25.112a89.2,89.2 0,0 0,-1.475 -9.997h8.51a97.88,97.88 0,0 1,1.297 9.997h15.559a53.126,53.126 0,0 0,-4.326 -14.223,52.12 52.12,0 0,0 -2.077,-4.047H22.551v8.273h25.731v9.997M209.207,59.355a54.208,54.208 0,0 0,-16.617 -13.14c2.786,3.77 5.217,8.202 7.231,13.14h9.386M172.402,40.936v18.421h18.238c-4.614,-9.7 -11.056,-16.506 -18.238,-18.421" />
+            <path
+                android:fillColor="#FFFFFF"
+                android:fillType="evenOdd"
+                android:pathData="M285.437,0.603h-87.113c-8.709,0 -16.759,2.065 -22.876,6.536 -2.953,2.156 -5.355,4.947 -7.095,8.214 -1.74,-3.267 -4.143,-6.058 -7.096,-8.214C155.153,2.668 147.09,0.603 138.381,0.603H51.269c-1.997,0.06 -2.977,1.729 -2.988,2.988v55.766h68.631c11.179,-16.435 30.024,-27.252 51.354,-27.252 34.221,0 62.063,27.838 62.063,62.063 0,34.221 -27.842,62.064 -62.063,62.064 -21.322,0 -40.14,-10.825 -51.318,-27.248h10.433c4.591,5.39 10.192,9.893 16.558,13.136 -2.783,-3.766 -5.209,-8.197 -7.223,-13.136h9.2c4.611,9.691 11.036,16.502 18.215,18.417v-18.417h8.269v18.417c7.178,-1.915 13.604,-8.726 18.215,-18.417h9.2c-2.014,4.939 -4.44,9.37 -7.223,13.136 7.781,-3.963 14.433,-9.794 19.459,-16.859 0.107,-0.15 0.219,-0.297 0.325,-0.447a55.065,55.065 0,0 0,2.624 -4.103H22.55v8.269h25.731v47.896c0,1.562 1.422,2.985 2.988,2.985h87.112c7.271,0 13.901,0.983 18.579,3.361 4.682,2.383 7.528,5.78 8.404,11.952 0.036,1.554 1.435,2.616 2.989,2.616 1.553,0 2.965,-1.062 2.989,-2.616 0.871,-6.172 3.722,-9.569 8.399,-11.952 4.682,-2.378 11.309,-3.361 18.583,-3.361h87.113c1.565,0 2.988,-1.423 2.988,-2.985V3.591c0,-1.565 -1.423,-2.988 -2.988,-2.988" />
+            <path
+                android:fillColor="#FFFFFF"
+                android:fillType="evenOdd"
+                android:pathData="M48.282,112.439h60.671c-0.999,-3.227 -1.708,-6.572 -2.168,-9.997h8.369c0.539,3.443 1.371,6.798 2.532,9.997h14.286a99.396,99.396 0,0 1,-1.276 -9.997h8.325a89.91,89.91 0,0 0,1.454 9.997h23.653v-9.997h8.273v9.997h23.657c0.662,-3.212 1.141,-6.561 1.455,-9.997h8.324c-0.273,3.428 -0.689,6.777 -1.276,9.997h14.286a53.445,53.445 0,0 0,3.02 -14.041c0.123,-1.396 0.191,-2.803 0.191,-4.23H0.425v8.274h47.857v9.997" />
+        </group>
+    </group>
+</vector>

common/design/src/main/res/drawable/ic_logo_sspm.xml

@@ -1,41 +1,24 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="108dp"
     android:height="108dp"
-    android:viewportWidth="576"
-    android:viewportHeight="576">
-    <path
-        android:fillColor="#385bb2"
-        android:fillType="nonZero"
-        android:pathData="m259.92,226.953c-8.504,4.333 -16.02,10.323 -22.156,17.52l12.52,-0c2.685,-6.584 5.921,-12.493 9.636,-17.52"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillColor="#385bb2"
-        android:fillType="nonZero"
-        android:pathData="m286.839,219.915c-9.576,2.553 -18.165,11.628 -24.317,24.561l24.317,-0l0,-24.561"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillColor="#385bb2"
-        android:fillType="nonZero"
-        android:pathData="M132.375,279.861L210.36,279.861c0.612,-4.572 1.623,-9.021 2.949,-13.329l11.648,-0c-1.553,4.271 -2.739,8.721 -3.452,13.329l20.74,-0c0.359,-4.587 0.952,-9.032 1.735,-13.329l11.345,-0c-0.881,4.281 -1.553,8.732 -1.964,13.329l33.476,-0l0,-13.329l11.031,-0l0,13.329l33.483,-0c-0.413,-4.597 -1.085,-9.048 -1.967,-13.329l11.347,-0c0.783,4.297 1.375,8.743 1.729,13.329l20.745,-0c-1.037,-6.675 -3.013,-13.028 -5.768,-18.964 -0.844,-1.839 -1.769,-3.64 -2.769,-5.396l-1.543,-0 -14.92,-0 -11.692,-0 -28.645,-0 -11.031,-0 -28.64,-0 -11.697,-0 -16.459,-0 -12.473,-0 -85.193,-0 -34.307,-0l0,11.031l34.307,-0l0,13.329"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillColor="#385bb2"
-        android:fillType="nonZero"
-        android:pathData="m346.943,244.473c-6.136,-7.197 -13.652,-13.187 -22.156,-17.52 3.715,5.027 6.956,10.936 9.641,17.52l12.515,-0"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillColor="#385bb2"
-        android:fillType="nonZero"
-        android:pathData="m297.869,219.915l0,24.561l24.317,-0c-6.152,-12.933 -14.741,-22.008 -24.317,-24.561"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillColor="#385bb2"
-        android:fillType="nonZero"
-        android:pathData="m448.583,166.137l-116.151,-0c-11.612,-0 -22.345,2.753 -30.501,8.715 -3.937,2.875 -7.14,6.596 -9.46,10.952 -2.32,-4.356 -5.524,-8.077 -9.461,-10.952 -8.139,-5.961 -18.889,-8.715 -30.501,-8.715l-116.149,-0c-2.663,0.08 -3.969,2.305 -3.985,3.984l0,74.355l91.509,-0c14.905,-21.913 40.032,-36.336 68.472,-36.336 45.628,-0 82.751,37.117 82.751,82.751 0,45.628 -37.123,82.752 -82.751,82.752 -28.429,-0 -53.52,-14.433 -68.424,-36.331l13.911,-0c6.121,7.187 13.589,13.191 22.077,17.515 -3.711,-5.021 -6.945,-10.929 -9.631,-17.515l12.267,-0c6.148,12.921 14.715,22.003 24.287,24.556l0,-24.556L297.867,337.312l0,24.556c9.571,-2.553 18.139,-11.635 24.287,-24.556l12.267,-0c-2.685,6.585 -5.92,12.493 -9.631,17.515 10.375,-5.284 19.244,-13.059 25.945,-22.479 0.143,-0.2 0.292,-0.396 0.433,-0.596 1.237,-1.776 2.421,-3.589 3.499,-5.471l-10.236,-0 -6.227,-0 -11.691,-0L297.867,326.281 286.841,326.281 258.196,326.281 246.504,326.281 230.045,326.281 217.573,326.281 132.374,326.281 98.067,326.281l0,11.025l34.307,-0l0,63.861c0,2.083 1.897,3.98 3.985,3.98l116.149,-0c9.695,-0 18.535,1.311 24.772,4.481 6.243,3.177 10.037,7.707 11.205,15.936 0.048,2.072 1.913,3.488 3.985,3.488 2.071,-0 3.953,-1.416 3.985,-3.488 1.161,-8.229 4.963,-12.759 11.199,-15.936 6.243,-3.171 15.079,-4.481 24.777,-4.481l116.151,-0c2.087,-0 3.984,-1.897 3.984,-3.98l0,-231.047c0,-2.087 -1.897,-3.984 -3.984,-3.984"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillColor="#385bb2"
-        android:fillType="nonZero"
-        android:pathData="m132.375,315.252l80.895,-0c-1.332,-4.303 -2.277,-8.763 -2.891,-13.329l11.159,-0c0.719,4.591 1.828,9.064 3.376,13.329l19.048,-0c-0.781,-4.293 -1.343,-8.759 -1.701,-13.329l11.1,-0c0.416,4.581 1.056,9.047 1.939,13.329l31.537,-0l0,-13.329l11.031,-0l0,13.329l31.543,-0c0.883,-4.283 1.521,-8.748 1.94,-13.329l11.099,-0c-0.364,4.571 -0.919,9.036 -1.701,13.329l19.048,-0c2.145,-5.921 3.515,-12.2 4.027,-18.721 0.164,-1.861 0.255,-3.737 0.255,-5.64l-15.847,-0 -5.327,-0 -11.031,-0 -34.005,-0 -11.031,-0 -34.007,-0 -11.024,-0 -21.172,-0 -11.032,-0L132.375,290.891 68.567,290.891l0,11.032l63.809,-0l0,13.329"
-        android:strokeColor="#00000000" />
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <group
+        android:scaleX="0.19228487"
+        android:scaleY="0.19228487"
+        android:translateX="21.6"
+        android:translateY="34.9638">
+        <path
+            android:fillColor="#2E5797"
+            android:fillType="evenOdd"
+            android:pathData="M143.94,46.215a54.208,54.208 0,0 0,-16.617 13.14h9.39c2.014,-4.938 4.441,-9.37 7.227,-13.14M164.129,40.936c-7.182,1.915 -13.624,8.721 -18.238,18.421h18.238V40.936M48.282,85.896h58.488a61.83,61.83 0,0 1,2.212 -9.997h8.736a52.92,52.92 0,0 0,-2.589 9.997h15.555c0.269,-3.44 0.714,-6.774 1.301,-9.997h8.509a88.744,88.744 0,0 0,-1.473 9.997h25.107v-9.997h8.273v9.997h25.112a89.2,89.2 0,0 0,-1.475 -9.997h8.51a97.88,97.88 0,0 1,1.297 9.997h15.559a53.126,53.126 0,0 0,-4.326 -14.223,52.12 52.12,0 0,0 -2.077,-4.047H22.551v8.273h25.731v9.997M209.207,59.355a54.208,54.208 0,0 0,-16.617 -13.14c2.786,3.77 5.217,8.202 7.231,13.14h9.386M172.402,40.936v18.421h18.238c-4.614,-9.7 -11.056,-16.506 -18.238,-18.421" />
+        <path
+            android:fillColor="#2E5797"
+            android:fillType="evenOdd"
+            android:pathData="M285.437,0.603h-87.113c-8.709,0 -16.759,2.065 -22.876,6.536 -2.953,2.156 -5.355,4.947 -7.095,8.214 -1.74,-3.267 -4.143,-6.058 -7.096,-8.214C155.153,2.668 147.09,0.603 138.381,0.603H51.269c-1.997,0.06 -2.977,1.729 -2.988,2.988v55.766h68.631c11.179,-16.435 30.024,-27.252 51.354,-27.252 34.221,0 62.063,27.838 62.063,62.063 0,34.221 -27.842,62.064 -62.063,62.064 -21.322,0 -40.14,-10.825 -51.318,-27.248h10.433c4.591,5.39 10.192,9.893 16.558,13.136 -2.783,-3.766 -5.209,-8.197 -7.223,-13.136h9.2c4.611,9.691 11.036,16.502 18.215,18.417v-18.417h8.269v18.417c7.178,-1.915 13.604,-8.726 18.215,-18.417h9.2c-2.014,4.939 -4.44,9.37 -7.223,13.136 7.781,-3.963 14.433,-9.794 19.459,-16.859 0.107,-0.15 0.219,-0.297 0.325,-0.447a55.065,55.065 0,0 0,2.624 -4.103H22.55v8.269h25.731v47.896c0,1.562 1.422,2.985 2.988,2.985h87.112c7.271,0 13.901,0.983 18.579,3.361 4.682,2.383 7.528,5.78 8.404,11.952 0.036,1.554 1.435,2.616 2.989,2.616 1.553,0 2.965,-1.062 2.989,-2.616 0.871,-6.172 3.722,-9.569 8.399,-11.952 4.682,-2.378 11.309,-3.361 18.583,-3.361h87.113c1.565,0 2.988,-1.423 2.988,-2.985V3.591c0,-1.565 -1.423,-2.988 -2.988,-2.988" />
+        <path
+            android:fillColor="#2E5797"
+            android:fillType="evenOdd"
+            android:pathData="M48.282,112.439h60.671c-0.999,-3.227 -1.708,-6.572 -2.168,-9.997h8.369c0.539,3.443 1.371,6.798 2.532,9.997h14.286a99.396,99.396 0,0 1,-1.276 -9.997h8.325a89.91,89.91 0,0 0,1.454 9.997h23.653v-9.997h8.273v9.997h23.657c0.662,-3.212 1.141,-6.561 1.455,-9.997h8.324c-0.273,3.428 -0.689,6.777 -1.276,9.997h14.286a53.445,53.445 0,0 0,3.02 -14.041c0.123,-1.396 0.191,-2.803 0.191,-4.23H0.425v8.274h47.857v9.997" />
+    </group>
 </vector>