[Picross-commit] SF.net SVN: picross:[129] branches/engine_split/android

[<yva...@us...>]

Revision: 129
          http://sourceforge.net/p/picross/code/129
Author:   yvan_norsa
Date:     2013-01-18 07:36:06 +0000 (Fri, 18 Jan 2013)
Log Message:
-----------
used lint

Modified Paths:
--------------
    branches/engine_split/android/AndroidManifest.xml
    branches/engine_split/android/src/picross/specific/ui/MenuUI.java

Removed Paths:
-------------
    branches/engine_split/android/res/layout/

Modified: branches/engine_split/android/AndroidManifest.xml
===================================================================
--- branches/engine_split/android/AndroidManifest.xml	2013-01-17 15:13:54 UTC (rev 128)
+++ branches/engine_split/android/AndroidManifest.xml	2013-01-18 07:36:06 UTC (rev 129)
@@ -3,7 +3,12 @@
       package="picross.specific.activities"
       android:versionCode="1"
       android:versionName="1.0">
-    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
+    <uses-sdk
+        android:minSdkVersion="17"
+        android:targetSdkVersion="17" />
+
+    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher"
+                 android:allowBackup="false">
         <activity android:name="PicrossMainActivity"
                   android:label="@string/app_name">
             <intent-filter>

Modified: branches/engine_split/android/src/picross/specific/ui/MenuUI.java
===================================================================
--- branches/engine_split/android/src/picross/specific/ui/MenuUI.java	2013-01-17 15:13:54 UTC (rev 128)
+++ branches/engine_split/android/src/picross/specific/ui/MenuUI.java	2013-01-18 07:36:06 UTC (rev 129)
@@ -101,6 +101,10 @@
 
     private List<PicrossLabel> buttons;
 
+    private Paint buttonPaint;
+    private Rect textBounds;
+
+
     /*** Constructor ***/
 
     /** Constructor. */
@@ -122,6 +126,12 @@
         //this.surface.addCallback(this);
 
         this.buttons = new ArrayList<PicrossLabel>();
+
+        this.buttonPaint = new Paint();
+        this.buttonPaint.setColor(Color.WHITE);
+        this.buttonPaint.setTextSize(20);
+
+        this.textBounds = new Rect();
     }
 
     @Override
@@ -132,10 +142,6 @@
             return;
         }
 
-        Paint paint = new Paint();
-        paint.setColor(Color.WHITE);
-        paint.setTextSize(20);
-
         canvas.drawBitmap(this.image, 0, 0, null);
 
         //for (PicrossLabel button : this.buttons) {
@@ -145,13 +151,12 @@
             canvas.drawBitmap(button.getIcon(), button.getX(), button.getY(), null);
 
             if (button instanceof PicrossButton && ((PicrossButton) button).getText() != null) {
-                Rect textBounds = new Rect();
-                paint.getTextBounds(((PicrossButton) button).getText(), 0, ((PicrossButton) button).getText().length(), textBounds);
-                int textWidth = (int) textBounds.width();
-                int textHeight = (int) textBounds.height();
+                this.buttonPaint.getTextBounds(((PicrossButton) button).getText(), 0, ((PicrossButton) button).getText().length(), this.textBounds);
+                int textWidth = (int) this.textBounds.width();
+                int textHeight = (int) this.textBounds.height();
 
                 canvas.drawText(((PicrossButton) button).getText(), button.getX() + (button.getWidth() / 2) - (textWidth / 2), button.getY()
-                                + (button.getHeight() / 2) + (textHeight / 2), paint);
+                                + (button.getHeight() / 2) + (textHeight / 2), this.buttonPaint);
             }
         }
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.