commit 377e1873d6952d16813e52a2103d4baa9676e169
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Tue Apr 9 22:16:06 2019 +0100

    Rubik App: minor

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 26cafa1..4371c49 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -8,7 +8,12 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
-    <application android:icon="@drawable/icon" android:label="@string/app_name" android:allowBackup="true" android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
+    <application
+        android:icon="@drawable/icon"
+        android:label="@string/app_name"
+        android:allowBackup="true"
+        android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
+
         <activity android:name=".TableOfContents">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/src/main/java/org/distorted/examples/rubik/RubikActivity.java b/src/main/java/org/distorted/examples/rubik/RubikActivity.java
index 8fb7f01..0cf221d 100644
--- a/src/main/java/org/distorted/examples/rubik/RubikActivity.java
+++ b/src/main/java/org/distorted/examples/rubik/RubikActivity.java
@@ -21,11 +21,11 @@ package org.distorted.examples.rubik;
 
 import android.app.Activity;
 import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
 import android.opengl.GLSurfaceView;
 import android.os.Bundle;
 import android.support.v4.content.ContextCompat;
 import android.view.View;
-import android.widget.ImageButton;
 
 import org.distorted.examples.R;
 import org.distorted.library.main.Distorted;
@@ -34,9 +34,9 @@ import org.distorted.library.main.Distorted;
 
 public class RubikActivity extends Activity
 {
-    static final int DEFAULT_CUBE_SIZE = 3;
+            static final int DEFAULT_SIZE  = 3;
     private static final int STARTING_SIZE = 2;
-    private static final int[] button_ids = {R.id.rubikSize2, R.id.rubikSize3, R.id.rubikSize4};
+    private static final int[] button_ids  = {R.id.rubikSize2, R.id.rubikSize3, R.id.rubikSize4};
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -46,7 +46,7 @@ public class RubikActivity extends Activity
       super.onCreate(icicle);
       setContentView(R.layout.rubiklayout);
 
-      markButton(DEFAULT_CUBE_SIZE);
+      markButton(DEFAULT_SIZE);
       }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -98,11 +98,9 @@ public class RubikActivity extends Activity
 
     public void setSize(View v)
       {
-      int size=0;
-      int id = v.getId();
-      int numButtons = button_ids.length;
+      int size=0, id = v.getId();
 
-      for(int b=0; b<numButtons; b++)
+      for(int b=0; b<button_ids.length; b++)
         if( button_ids[b] == id )
           {
           size = b+STARTING_SIZE;
@@ -119,14 +117,18 @@ public class RubikActivity extends Activity
 
    private void markButton(int size)
      {
-     int color, numButtons = button_ids.length;
-     ImageButton[] button = new ImageButton[numButtons];
-
-     for(int b=0; b<numButtons; b++)
+     for(int b=0; b<button_ids.length; b++)
        {
-       button[b] = findViewById(button_ids[b]);
-       color = (b==size-STARTING_SIZE ? R.color.red : R.color.gray);
-       button[b].getBackground().setColorFilter(ContextCompat.getColor(this,color), PorterDuff.Mode.MULTIPLY);
+       Drawable d = findViewById(button_ids[b]).getBackground();
+
+       if( size == b+STARTING_SIZE )
+         {
+         d.setColorFilter(ContextCompat.getColor(this,R.color.red), PorterDuff.Mode.MULTIPLY);
+         }
+       else
+         {
+         d.clearColorFilter();
+         }
        }
      }
 }
diff --git a/src/main/java/org/distorted/examples/rubik/RubikRenderer.java b/src/main/java/org/distorted/examples/rubik/RubikRenderer.java
index 525ba9f..dddc91f 100644
--- a/src/main/java/org/distorted/examples/rubik/RubikRenderer.java
+++ b/src/main/java/org/distorted/examples/rubik/RubikRenderer.java
@@ -72,7 +72,7 @@ class RubikRenderer implements GLSurfaceView.Renderer, EffectListener
 
       mCanRotate = true;
 
-      mCube = new RubikCube( RubikActivity.DEFAULT_CUBE_SIZE, mMove, mScale, mQuatCurrent, mQuatAccumulated);
+      mCube = new RubikCube( RubikActivity.DEFAULT_SIZE, mMove, mScale, mQuatCurrent, mQuatAccumulated);
       }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////