From 26b7462117ecdbad34f705e2921e1f8ff95b03ec Mon Sep 17 00:00:00 2001
From: Jille Timmermans <jille@quis.cx>
Date: Sat, 14 Dec 2013 17:44:10 +0100
Subject: [PATCH] Renamed shuffle to random

---
 art/{shuffle_off.xcf => random_off.xcf}             | Bin
 art/{shuffle_on.xcf => random_on.xcf}               | Bin
 res/drawable/{shuffle_off.png => random_off.png}    | Bin
 res/drawable/{shuffle_on.png => random_on.png}      | Bin
 .../{shuffle_selector.xml => random_selector.xml}   |   6 +++---
 res/layout/main.xml                                 |   6 +++---
 src/bitendian/bitmpc/activity/BitMPC.java           |   6 +++---
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename art/{shuffle_off.xcf => random_off.xcf} (100%)
 rename art/{shuffle_on.xcf => random_on.xcf} (100%)
 rename res/drawable/{shuffle_off.png => random_off.png} (100%)
 rename res/drawable/{shuffle_on.png => random_on.png} (100%)
 rename res/drawable/{shuffle_selector.xml => random_selector.xml} (81%)

diff --git a/art/shuffle_off.xcf b/art/random_off.xcf
similarity index 100%
rename from art/shuffle_off.xcf
rename to art/random_off.xcf
diff --git a/art/shuffle_on.xcf b/art/random_on.xcf
similarity index 100%
rename from art/shuffle_on.xcf
rename to art/random_on.xcf
diff --git a/res/drawable/shuffle_off.png b/res/drawable/random_off.png
similarity index 100%
rename from res/drawable/shuffle_off.png
rename to res/drawable/random_off.png
diff --git a/res/drawable/shuffle_on.png b/res/drawable/random_on.png
similarity index 100%
rename from res/drawable/shuffle_on.png
rename to res/drawable/random_on.png
diff --git a/res/drawable/shuffle_selector.xml b/res/drawable/random_selector.xml
similarity index 81%
rename from res/drawable/shuffle_selector.xml
rename to res/drawable/random_selector.xml
index fee06e5..579b5e4 100644
--- a/res/drawable/shuffle_selector.xml
+++ b/res/drawable/random_selector.xml
@@ -1,4 +1,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_selected="false" android:drawable="@drawable/shuffle_off"/>
-	<item android:state_selected="true" android:drawable="@drawable/shuffle_on"/>
-</selector> 
\ No newline at end of file
+	<item android:state_selected="false" android:drawable="@drawable/random_off"/>
+	<item android:state_selected="true" android:drawable="@drawable/random_on"/>
+</selector> 
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 8563683..94febfe 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -107,10 +107,10 @@
 			android:layout_height="wrap_content" android:layout_alignParentRight="true">
 			<ImageView android:layout_width="wrap_content"
 				android:layout_height="wrap_content" android:src="@drawable/repeat_selector"
-				android:id="@+id/repeat_icon" android:layout_toLeftOf="@+id/shuffle_icon" />
+				android:id="@+id/repeat_icon" android:layout_toLeftOf="@+id/random_icon" />
 			<ImageView android:layout_width="wrap_content"
-				android:layout_height="wrap_content" android:src="@drawable/shuffle_selector"
-				android:id="@id/shuffle_icon" android:layout_marginLeft="10sp"
+				android:layout_height="wrap_content" android:src="@drawable/random_selector"
+				android:id="@id/random_icon" android:layout_marginLeft="10sp"
 				android:layout_gravity="right" android:layout_alignParentRight="true" />
 		</LinearLayout>
 	</RelativeLayout>
diff --git a/src/bitendian/bitmpc/activity/BitMPC.java b/src/bitendian/bitmpc/activity/BitMPC.java
index acef80c..8a497bc 100644
--- a/src/bitendian/bitmpc/activity/BitMPC.java
+++ b/src/bitendian/bitmpc/activity/BitMPC.java
@@ -317,7 +317,7 @@ public void onProgressChanged(SeekBar _seekBar, int _progress, boolean _fromUser
 		// repeat
 		findViewById(R.id.repeat_icon).setOnClickListener(new OnClickListener() { public void onClick(View v) { handler.repeat(); } });
 		
-		findViewById(R.id.shuffle_icon).setOnClickListener(new OnClickListener() { public void onClick(View v) { handler.random(); } });
+		findViewById(R.id.random_icon).setOnClickListener(new OnClickListener() { public void onClick(View v) { handler.random(); } });
 		
 		findViewById(R.id.playlist_current).setOnClickListener(new OnClickListener() { public void onClick(View v) { playlist.setSelection(handler.getPlaylistAdapter().getSelected()); } });
 		
@@ -335,7 +335,7 @@ public boolean onLongClick(View v) {
 		
 		image.setOnTouchListener(vibration_listener);
 		findViewById(R.id.repeat_icon).setOnTouchListener(vibration_listener);
-		findViewById(R.id.shuffle_icon).setOnTouchListener(vibration_listener);
+		findViewById(R.id.random_icon).setOnTouchListener(vibration_listener);
 		
 	}
 	
@@ -528,7 +528,7 @@ void disableProgressBar() {
 	}
 
 	void selectRandom(boolean _random) {
-		ImageView image = (ImageView) findViewById(R.id.shuffle_icon);
+		ImageView image = (ImageView) findViewById(R.id.random_icon);
 		image.setSelected(_random);
 	}