Skip to content
This repository has been archived by the owner on Jan 7, 2023. It is now read-only.

Commit

Permalink
Also prefix styles just to be safe
Browse files Browse the repository at this point in the history
  • Loading branch information
jdamcd committed Mar 17, 2014
1 parent 753a821 commit b9afaf0
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 11 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {

allprojects {
group = 'com.soundcloud.android'
version = '0.9.3'
version = '0.9.4'

repositories {
mavenCentral()
Expand Down
10 changes: 5 additions & 5 deletions lib/src/main/res/layout/crop__layout_done_cancel.xml
Original file line number Diff line number Diff line change
@@ -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>
12 changes: 7 additions & 5 deletions lib/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down

0 comments on commit b9afaf0

Please sign in to comment.