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

Commit b9afaf0

Browse files
committed
Also prefix styles just to be safe
1 parent 753a821 commit b9afaf0

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99

1010
allprojects {
1111
group = 'com.soundcloud.android'
12-
version = '0.9.3'
12+
version = '0.9.4'
1313

1414
repositories {
1515
mavenCentral()
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2-
style="@style/DoneCancelBar">
2+
style="@style/Crop.DoneCancelBar">
33

44
<FrameLayout
55
android:id="@+id/btn_cancel"
6-
style="@style/ActionButton">
7-
<TextView style="@style/ActionButtonText.Cancel" />
6+
style="@style/Crop.ActionButton">
7+
<TextView style="@style/Crop.ActionButtonText.Cancel" />
88
</FrameLayout>
99

1010
<FrameLayout
1111
android:id="@+id/btn_done"
12-
style="@style/ActionButton">
13-
<TextView style="@style/ActionButtonText.Done" />
12+
style="@style/Crop.ActionButton">
13+
<TextView style="@style/Crop.ActionButtonText.Done" />
1414
</FrameLayout>
1515

1616
</LinearLayout>

lib/src/main/res/values/styles.xml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<resources xmlns:tools="http://schemas.android.com/tools">
22

3-
<style name="DoneCancelBar">
3+
<style name="Crop"></style>
4+
5+
<style name="Crop.DoneCancelBar">
46
<item name="android:layout_width">match_parent</item>
57
<item name="android:layout_height">@dimen/crop__bar_height</item>
68
<item name="android:orientation">horizontal</item>
@@ -10,14 +12,14 @@
1012
<item name="android:background">@color/crop__button_bar</item>
1113
</style>
1214

13-
<style name="ActionButton">
15+
<style name="Crop.ActionButton">
1416
<item name="android:layout_width">0dp</item>
1517
<item name="android:layout_height">match_parent</item>
1618
<item name="android:layout_weight">1</item>
1719
<item name="android:background">@drawable/crop__selectable_background</item>
1820
</style>
1921

20-
<style name="ActionButtonText">
22+
<style name="Crop.ActionButtonText">
2123
<item name="android:layout_width">wrap_content</item>
2224
<item name="android:layout_height">wrap_content</item>
2325
<item name="android:layout_gravity">center</item>
@@ -29,12 +31,12 @@
2931
<item name="android:textSize">13sp</item>
3032
</style>
3133

32-
<style name="ActionButtonText.Done">
34+
<style name="Crop.ActionButtonText.Done">
3335
<item name="android:drawableLeft">@drawable/crop__ic_done</item>
3436
<item name="android:text">@string/crop__done</item>
3537
</style>
3638

37-
<style name="ActionButtonText.Cancel">
39+
<style name="Crop.ActionButtonText.Cancel">
3840
<item name="android:drawableLeft">@drawable/crop__ic_cancel</item>
3941
<item name="android:text">@string/crop__cancel</item>
4042
</style>

0 commit comments

Comments
 (0)