Skip to content

/SwipeSelector

Browse files

Merge branch 'EmmanuelMess-fixies'

  • Loading branch information...
2 parents 5719577 + 7655f4a commit 9ae93ba3a486e7ce2ace23ffd1d7b496dfce9dc8 @roughike committed
View
6 sample/src/main/AndroidManifest.xml
@@ -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" />
View
6 sample/src/main/res/layout/activity_main.xml
@@ -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>
View
6 sample/src/main/res/values-w820dp/dimens.xml
@@ -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>
View
5 sample/src/main/res/values/dimens.xml
@@ -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>
View
3 sample/src/main/res/values/strings.xml
@@ -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>
View
4 swipe-selector/src/main/res/layout/swipeselector_circle_item.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<ImageView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ 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" />
+ tools:ignore="ContentDescription"/>
View
38 swipe-selector/src/main/res/layout/swipeselector_layout.xml
@@ -1,19 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ 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:id="@+id/swipeselector_layout_circleContainer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true"
- android:id="@+id/swipeselector_layout_circleContainer"
- android:paddingRight="8dp"
+ android:layout_centerHorizontal="true"
+ android:orientation="horizontal"
+ android:paddingBottom="16dp"
android:paddingEnd="8dp"
- android:paddingBottom="16dp"/>
+ android:paddingRight="8dp" />
<com.roughike.swipeselector.WrappingPager
android:id="@+id/swipeselector_layout_swipePager"
@@ -23,32 +25,34 @@
<ImageView
android:id="@+id/swipeselector_layout_leftButton"
- android:background="?attr/selectableItemBackgroundBorderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
+ android:background="?attr/selectableItemBackgroundBorderless"
+ android:contentDescription="@string/move_left"
+ android:paddingBottom="16dp"
+ android:paddingEnd="8dp"
android:paddingLeft="8dp"
- android:paddingStart="8dp"
android:paddingRight="8dp"
- android:paddingEnd="8dp"
- android:paddingTop="16dp"
- android:paddingBottom="16dp" />
+ android:paddingStart="8dp"
+ android:paddingTop="16dp" />
<ImageView
android:id="@+id/swipeselector_layout_rightButton"
- android:background="?attr/selectableItemBackgroundBorderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
+ android:layout_alignParentRight="true"
android:layout_centerVertical="true"
+ android:background="?attr/selectableItemBackgroundBorderless"
+ android:contentDescription="@string/move_right"
+ android:paddingBottom="16dp"
+ android:paddingEnd="8dp"
android:paddingLeft="8dp"
- android:paddingStart="8dp"
android:paddingRight="8dp"
- android:paddingEnd="8dp"
- android:paddingTop="16dp"
- android:paddingBottom="16dp" />
+ android:paddingStart="8dp"
+ android:paddingTop="16dp" />
</RelativeLayout>
View
2 swipe-selector/src/main/res/values/strings.xml
@@ -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>

0 comments on commit 9ae93ba

Please sign in to comment.
Something went wrong with that request. Please try again.