[Sample app] Fix loop button position (#2288)
I think Android studio stupidly moved it when reformatting the XML file
#2285 (files)
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index d9bb782..0e53a14 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -67,6 +67,7 @@
<match>
<AND>
<NAME>xmlns:android</NAME>
+ <XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
@@ -77,6 +78,7 @@
<match>
<AND>
<NAME>xmlns:.*</NAME>
+ <XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
@@ -88,6 +90,7 @@
<match>
<AND>
<NAME>.*:id</NAME>
+ <XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
@@ -98,6 +101,7 @@
<match>
<AND>
<NAME>.*:name</NAME>
+ <XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
@@ -108,6 +112,7 @@
<match>
<AND>
<NAME>name</NAME>
+ <XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
@@ -118,6 +123,7 @@
<match>
<AND>
<NAME>style</NAME>
+ <XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
@@ -128,6 +134,7 @@
<match>
<AND>
<NAME>.*</NAME>
+ <XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
@@ -138,53 +145,12 @@
<rule>
<match>
<AND>
- <NAME>.*:layout_width</NAME>
+ <NAME>.*</NAME>
+ <XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <NAME>.*:layout_height</NAME>
- <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <NAME>.*:layout_.*</NAME>
- <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
- </AND>
- </match>
- <order>BY_NAME</order>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <NAME>.*:width</NAME>
- <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
- </AND>
- </match>
- <order>BY_NAME</order>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <NAME>.*:height</NAME>
- <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
- </AND>
- </match>
- <order>BY_NAME</order>
+ <order>ANDROID_ATTRIBUTE_ORDER</order>
</rule>
</section>
<section>
@@ -192,17 +158,7 @@
<match>
<AND>
<NAME>.*</NAME>
- <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
- </AND>
- </match>
- <order>BY_NAME</order>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <NAME>.*</NAME>
+ <XML_ATTRIBUTE />
<XML_NAMESPACE>.*</XML_NAMESPACE>
</AND>
</match>
diff --git a/sample/src/main/res/layout/control_bar_player_controls.xml b/sample/src/main/res/layout/control_bar_player_controls.xml
index 96b8e86..0babd82 100644
--- a/sample/src/main/res/layout/control_bar_player_controls.xml
+++ b/sample/src/main/res/layout/control_bar_player_controls.xml
@@ -35,16 +35,8 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:orientation="horizontal"
- android:paddingBottom="12dp"
- android:paddingTop="12dp">
-
- <ImageButton
- android:id="@+id/loopButton"
- android:layout_width="64dp"
- android:layout_height="32dp"
- android:layout_gravity="center_vertical"
- android:background="?attr/selectableItemBackgroundBorderless"
- app:srcCompat="@drawable/ic_loop" />
+ android:paddingTop="12dp"
+ android:paddingBottom="12dp">
<RelativeLayout
android:layout_width="wrap_content"
@@ -78,6 +70,14 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1" />
+
+ <ImageButton
+ android:id="@+id/loopButton"
+ android:layout_width="64dp"
+ android:layout_height="32dp"
+ android:layout_gravity="center_vertical"
+ android:background="?attr/selectableItemBackgroundBorderless"
+ app:srcCompat="@drawable/ic_loop" />
</LinearLayout>
<TextView
