Merge branch 'fixies' of git://github.com/EmmanuelMess/SwipeSelector …

…into EmmanuelMess-fixies
roughike · ce8ec2177c01fe086d61f6ed06ed19204359bfd8 · roughike committed Mar 10, 2016 · Mar 10, 2016 · ce8ec21
2 parents 5719577 + f488107
commit ce8ec2177c01fe086d61f6ed06ed19204359bfd8
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.swipeselector">
+          xmlns:tools="http://schemas.android.com/tools"
+          package="com.example.swipeselector">
 
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        tools:ignore="AllowBackup,GoogleAppIndexingWarning">
         <activity android:name="com.example.swipeselector.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -16,7 +16,7 @@
             android:layout_marginLeft="16dp"
             android:layout_marginRight="16dp"
             android:layout_marginTop="16dp"
-            android:text="Example Pizza"
+            android:text="@string/pizza"
             android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
         <TextView
@@ -25,7 +25,7 @@
             android:layout_marginLeft="16dp"
             android:layout_marginRight="16dp"
             android:layout_marginBottom="16dp"
-            android:text="Mamma mia! Now you can order Example Pizzas delicious pizzas also by mobile.\n\nChoose a size, toppings and delivery method and you're good to go!"
+            android:text="@string/pizza_order"
             android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
 
         <View
@@ -79,7 +79,7 @@
             android:layout_margin="16dp"
             android:background="@color/colorAccent"
             android:textColor="#FFFFFF"
-            android:text="I'm hungry, make me some pizza!"/>
+            android:text="@string/pizza_make"/>
 
     </LinearLayout>
 
@@ -1,6 +0,0 @@
-<resources>
-    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
-         (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>
-</resources>
@@ -1,5 +0,0 @@
-<resources>
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
-</resources>
@@ -1,3 +1,6 @@
 <resources>
     <string name="app_name">SwipeSelector Demo</string>
+    <string name="pizza">Example Pizza</string>
+    <string name="pizza_order">Mamma mia! Now you can order Example Pizzas delicious pizzas also by mobile.\n\nChoose a size, toppings and delivery method and you\'re good to go!</string>
+    <string name="pizza_make">I\'m hungry, make me some pizza!</string>
 </resources>
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageView
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_marginLeft="8dp"
     android:layout_marginStart="8dp"
     android:layout_width="6dp"
     android:layout_height="6dp"
-    xmlns:android="http://schemas.android.com/apk/res/android" />
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="ContentDescription"/>
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:animateLayoutChanges="true">
+    android:animateLayoutChanges="true"
+                tools:ignore="UnusedAttribute">
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -34,7 +36,8 @@
         android:paddingRight="8dp"
         android:paddingEnd="8dp"
         android:paddingTop="16dp"
-        android:paddingBottom="16dp" />
+        android:paddingBottom="16dp"
+        android:contentDescription="@string/move_left"/>
 
     <ImageView
         android:id="@+id/swipeselector_layout_rightButton"
@@ -49,6 +52,7 @@
         android:paddingRight="8dp"
         android:paddingEnd="8dp"
         android:paddingTop="16dp"
-        android:paddingBottom="16dp" />
+        android:paddingBottom="16dp"
+        android:contentDescription="@string/move_right"/>
 
 </RelativeLayout>
@@ -1,3 +1,5 @@
 <resources>
     <string name="app_name">SwipeSelector</string>
+    <string name="move_left">Move left</string>
+    <string name="move_right">Move right</string>
 </resources>