Also prefix styles just to be safe

This commit is contained in:
Jamie McDonald 2014-03-17 22:35:05 +01:00
parent 753a821339
commit b9afaf0da5
3 changed files with 13 additions and 11 deletions

View File

@ -9,7 +9,7 @@ buildscript {
allprojects {
group = 'com.soundcloud.android'
version = '0.9.3'
version = '0.9.4'
repositories {
mavenCentral()

View File

@ -1,16 +1,16 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/DoneCancelBar">
style="@style/Crop.DoneCancelBar">
<FrameLayout
android:id="@+id/btn_cancel"
style="@style/ActionButton">
<TextView style="@style/ActionButtonText.Cancel" />
style="@style/Crop.ActionButton">
<TextView style="@style/Crop.ActionButtonText.Cancel" />
</FrameLayout>
<FrameLayout
android:id="@+id/btn_done"
style="@style/ActionButton">
<TextView style="@style/ActionButtonText.Done" />
style="@style/Crop.ActionButton">
<TextView style="@style/Crop.ActionButtonText.Done" />
</FrameLayout>
</LinearLayout>

View File

@ -1,6 +1,8 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="DoneCancelBar">
<style name="Crop"></style>
<style name="Crop.DoneCancelBar">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">@dimen/crop__bar_height</item>
<item name="android:orientation">horizontal</item>
@ -10,14 +12,14 @@
<item name="android:background">@color/crop__button_bar</item>
</style>
<style name="ActionButton">
<style name="Crop.ActionButton">
<item name="android:layout_width">0dp</item>
<item name="android:layout_height">match_parent</item>
<item name="android:layout_weight">1</item>
<item name="android:background">@drawable/crop__selectable_background</item>
</style>
<style name="ActionButtonText">
<style name="Crop.ActionButtonText">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_gravity">center</item>
@ -29,12 +31,12 @@
<item name="android:textSize">13sp</item>
</style>
<style name="ActionButtonText.Done">
<style name="Crop.ActionButtonText.Done">
<item name="android:drawableLeft">@drawable/crop__ic_done</item>
<item name="android:text">@string/crop__done</item>
</style>
<style name="ActionButtonText.Cancel">
<style name="Crop.ActionButtonText.Cancel">
<item name="android:drawableLeft">@drawable/crop__ic_cancel</item>
<item name="android:text">@string/crop__cancel</item>
</style>