Merge pull request #6 from Dwite/master

Distorted UI elements on large screen #1
eoinfogarty · Aug 17, 2016 · 3658493 · 3658493
2 parents e780bc3 + acfb185
commit 3658493
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 3 deletions.
diff --git a/app/src/main/res/layout/fragment_scene_one.xml b/app/src/main/res/layout/fragment_scene_one.xml
@@ -11,7 +11,8 @@
             android:id="@+id/deviceImage"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_margin="30dp"
+            android:layout_margin="@dimen/deviceImagePadding"
+            android:scaleType="fitXY"
             android:src="@drawable/img_device" />
 
         <LinearLayout

diff --git a/app/src/main/res/layout/fragment_scene_two.xml b/app/src/main/res/layout/fragment_scene_two.xml
@@ -8,8 +8,8 @@
 
         <Space
             android:id="@+id/space"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
+            android:layout_width="@dimen/space_size"
+            android:layout_height="@dimen/space_size"
             android:layout_centerHorizontal="true"
             android:layout_centerVertical="true" />
 
@@ -18,6 +18,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/space"
+            android:layout_marginTop="@dimen/space_margin"
             android:layout_centerHorizontal="true"
             android:src="@drawable/ic_twitter" />
 
@@ -30,6 +31,7 @@
             android:layout_marginRight="42dp"
             android:layout_toLeftOf="@id/twitter_icon"
             android:layout_toStartOf="@id/space"
+            android:layout_marginTop="@dimen/space_margin"
             android:src="@drawable/ic_abema" />
 
         <ImageView
@@ -41,6 +43,7 @@
             android:layout_marginStart="42dp"
             android:layout_toEndOf="@id/twitter_icon"
             android:layout_toRightOf="@id/twitter_icon"
+            android:layout_marginTop="@dimen/space_margin"
             android:src="@drawable/ic_facebook" />
 
     </RelativeLayout>

diff --git a/app/src/main/res/values-w600dp/dimens.xml b/app/src/main/res/values-w600dp/dimens.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="deviceImagePadding">80dp</dimen>
+    <dimen name="space_size">70dp</dimen>
+    <dimen name="space_margin">200dp</dimen>
+</resources>
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
@@ -3,4 +3,8 @@
          (such as screen margins) for screens with more than 820dp of available width. This
          would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
     <dimen name="activity_horizontal_margin">64dp</dimen>
+
+    <dimen name="deviceImagePadding">100dp</dimen>
+    <dimen name="space_size">80dp</dimen>
+    <dimen name="space_margin">240dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -13,4 +13,7 @@
     <dimen name="recommended_indicator_text">14sp</dimen>
     <dimen name="recommended_indicator_margin">24dp</dimen>
     <dimen name="recommended_margin_bottom">4dp</dimen>
+    <dimen name="deviceImagePadding">30dp</dimen>
+    <dimen name="space_size">40dp</dimen>
+    <dimen name="space_margin">0dp</dimen>
 </resources>