Renamed shuffle to random

Jille · Dec 14, 2013 · 26b7462 · 26b7462
1 parent 9dd10be
commit 26b7462
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/art/shuffle_off.xcf → art/random_off.xcf b/art/shuffle_off.xcf → art/random_off.xcf
diff --git a/art/shuffle_on.xcf → art/random_on.xcf b/art/shuffle_on.xcf → art/random_on.xcf
diff --git a/res/drawable/shuffle_off.png → res/drawable/random_off.png b/res/drawable/shuffle_off.png → res/drawable/random_off.png
diff --git a/res/drawable/shuffle_on.png → res/drawable/random_on.png b/res/drawable/shuffle_on.png → res/drawable/random_on.png
diff --git a/res/drawable/shuffle_selector.xml → res/drawable/random_selector.xml b/res/drawable/shuffle_selector.xml → 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> 
+	<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
@@ -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
@@ -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);
 	}