logo update

12tp12 · Jun 11, 2017 · eae8139 · eae8139
1 parent 0e97e19
commit eae8139
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 8 deletions.
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/Logo.psd b/Logo.psd
diff --git a/LogoV2.psd b/LogoV2.psd
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -15,6 +15,9 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".LoginActivity">
+
+        </activity>
     </application>
 
 </manifest>
diff --git a/app/src/main/res/drawable/logo.png b/app/src/main/res/drawable/logo.png
diff --git a/app/src/main/res/drawable/logov2.png b/app/src/main/res/drawable/logov2.png
diff --git a/app/src/main/res/drawable/logov3.png b/app/src/main/res/drawable/logov3.png
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
@@ -26,23 +26,21 @@
             android:gravity="start"/>
     </android.support.v7.widget.Toolbar>
 
-    <TextView
-        android:id="@+id/login_welcome"
+    <ImageView
+        android:id="@+id/logo"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:gravity="center"
         android:layout_below="@id/toolbar"
+        android:src="@drawable/logov3"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="32dp"
-        android:layout_marginBottom="@dimen/activity_vertical_margin"
-        android:text="@string/login_welcome"
-        android:textSize="18sp"/>
+        android:layout_marginBottom="16dp"/>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:layout_below="@id/login_welcome"
+        android:layout_below="@id/logo"
         android:layout_marginStart="48dp"
         android:layout_marginEnd="48dp"
         android:layout_marginTop="16dp"
@@ -51,7 +49,8 @@
         <android.support.design.widget.TextInputLayout
             android:id="@+id/email_container"
             android:layout_height="wrap_content"
-            android:layout_width="match_parent">
+            android:layout_width="match_parent"
+            android:layout_marginBottom="8dp">
             <EditText
                 android:id="@+id/email_input"
                 android:layout_width="match_parent"

diff --git a/logov3.psd b/logov3.psd