Merge pull request #38 from RIP95/master

Create bg for phone from asset. Recreate small Amadeus icon. Remove r…

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

@@ -3,51 +3,7 @@
     android:id="@+id/activity_launch"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:background="@drawable/gradient_background"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin">
-
-    <ImageView
-        android:id="@+id/imageView_cancel"
-        android:layout_width="180.0dip"
-        android:layout_height="40.0dip"
-        android:layout_below="@+id/textView_call"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="51dp"
-        android:adjustViewBounds="false"
-        android:cropToPadding="false"
-        android:src="@drawable/cancel_unselect" />
-
-    <TextView
-        android:id="@+id/textView_call"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/imageView_connect"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_marginBottom="41dp"
-        android:layout_marginLeft="14dp"
-        android:layout_marginStart="14dp"
-        android:fontFamily="Droid"
-        android:text="@string/call"
-        android:textAppearance="@style/TextAppearance.AppCompat"
-        android:textColor="#ffdec752"
-        android:textSize="22.0sp"
-        android:typeface="monospace" />
-
-    <ImageView
-        android:id="@+id/imageView_connect"
-        android:layout_width="180.0dip"
-        android:layout_height="40.0dip"
-        android:layout_alignLeft="@+id/imageView_cancel"
-        android:layout_alignParentBottom="true"
-        android:layout_alignStart="@+id/imageView_cancel"
-        android:layout_marginBottom="136dp"
-        android:adjustViewBounds="false"
-        android:cropToPadding="false"
-        android:src="@drawable/connect_unselect" />
+    android:background="@drawable/gradient_background" >
 
     <ImageView
         android:id="@+id/imageView_logo"
@@ -59,4 +15,42 @@
         android:adjustViewBounds="true"
         android:src="@drawable/logo39" />
 
+    <TextView
+        android:id="@+id/textView_call"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="39dp"
+        android:layout_marginLeft="22dp"
+        android:layout_marginStart="22dp"
+        android:fontFamily="Droid"
+        android:text="@string/call"
+        android:textAppearance="@style/TextAppearance.AppCompat"
+        android:textColor="#ffdec752"
+        android:textSize="22.0sp"
+        android:typeface="monospace"
+        android:layout_above="@+id/imageView_connect"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true" />
+
+    <ImageView
+        android:id="@+id/imageView_connect"
+        android:layout_width="180.0dip"
+        android:layout_height="40.0dip"
+        android:layout_alignLeft="@+id/imageView_cancel"
+        android:layout_alignParentBottom="true"
+        android:layout_alignStart="@+id/imageView_cancel"
+        android:layout_marginBottom="136dp"
+        android:adjustViewBounds="false"
+        android:src="@drawable/connect_unselect" />
+
+    <ImageView
+        android:id="@+id/imageView_cancel"
+        android:layout_width="180.0dip"
+        android:layout_height="40.0dip"
+        android:layout_below="@+id/textView_call"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="51dp"
+        android:adjustViewBounds="false"
+        android:src="@drawable/cancel_unselect" />
+
 </RelativeLayout>

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

@@ -2,19 +2,14 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/activity_main"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="@color/colorPrimary"
-    android:paddingBottom="0.0dip"
-    android:paddingLeft="0.0dip"
-    android:paddingRight="0.0dip"
-    android:paddingTop="0.0dip">
+    android:layout_height="fill_parent" >
 
     <ImageView
         android:id="@+id/imageView_bg"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:scaleType="centerCrop"
-        android:src="@drawable/bg" />
+        android:src="@drawable/bg1" />
 
     <ImageView
         android:id="@+id/imageView_kurisu"
@@ -25,17 +20,15 @@
 
     <ImageView
         android:id="@+id/imageView_logo_small"
-        android:layout_width="35dp"
-        android:layout_height="35dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/amadeus_icon_smaller"
+        android:layout_marginRight="10dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginBottom="26dp"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
-        android:layout_marginBottom="33.0dip"
-        android:layout_marginEnd="35.0dip"
-        android:layout_marginRight="35.0dip"
-        android:scaleX="2.5"
-        android:scaleY="2.5"
-        android:src="@drawable/amadeus_icon_smaller" />
+        android:layout_alignParentEnd="true" />
 
     <ImageView
         android:id="@+id/imageView_subtitles"
@@ -46,14 +39,6 @@
         android:layout_alignParentStart="true"
         android:scaleType="centerCrop"
         android:src="@drawable/subtitle_frame_big" />
-    <!--<ImageView
-        android:id="@+id/imageView_subtitles"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:src="@drawable/subtitle_frame" />-->
 
     <TextView
         android:id="@+id/textView_subtitles"
@@ -68,7 +53,6 @@
         android:gravity="start"
         android:shadowColor="#000"
         android:shadowRadius="2"
-        android:text=""
         android:textAlignment="gravity"
         android:textAppearance="@style/TextAppearance.AppCompat"
         android:textColor="#FFF"