Merge pull request #1 from barkr-osu/d-stels

Merge logo+icon
barkr-osu · Mar 29, 2017 · 53a65fd · 53a65fd
2 parents 5b6d2cf + 749816b
commit 53a65fd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -4,7 +4,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/icon"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">

diff --git a/app/src/main/res/drawable/icon.png b/app/src/main/res/drawable/icon.png
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/layout/activity_menu.xml b/app/src/main/res/layout/activity_menu.xml
@@ -7,6 +7,11 @@
     android:gravity="center"
     >
 
+    <ImageView
+        android:layout_width="240dp"
+        android:layout_height="364dp"
+        android:src = "@drawable/logo"/>
+
     <android.support.v7.widget.AppCompatButton
         android:id="@+id/alarm_button"
         android:layout_width="wrap_content"