gwh/droid48-gwh
1
0
Fork 0
Code Pull requests Activity

Better menu action

Browse source
This commit is contained in:
shagr4th 2014-09-20 11:03:29 +02:00
parent 6c2d25db56
commit de5b6e4f94
5 changed files with 29 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
res/drawable-hdpi/ic_action_core_overflow.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 369 B

BIN
res/drawable-mdpi/ic_action_core_overflow.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 269 B

BIN
res/drawable-xhdpi/ic_action_core_overflow.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 425 B

BIN
res/drawable-xxhdpi/ic_action_core_overflow.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 716 B

44
src/org/ab/x48/HPView.java
View file

@ -44,6 +44,7 @@ public class HPView extends SurfaceView implements SurfaceHolder.Callback, Runna
private SurfaceHolder mSurfaceHolder; private SurfaceHolder mSurfaceHolder;
private boolean surfaceValid; private boolean surfaceValid;
private Bitmap annImages []; private Bitmap annImages [];
private Bitmap menuIcon;
boolean ann []; boolean ann [];
int ann_pos [] = { 62, 105, 152, 197, 244, 287 }; int ann_pos [] = { 62, 105, 152, 197, 244, 287 };
private List<Integer> queuedCodes; private List<Integer> queuedCodes;
@ -64,12 +65,18 @@ public class HPView extends SurfaceView implements SurfaceHolder.Callback, Runna
int hidemenu_button []; int hidemenu_button [];
int buttons_coords [][] = new int [MAX_TOUCHES][4]; int buttons_coords [][] = new int [MAX_TOUCHES][4];
int icons_coords [][] = new int [6][2]; int icons_coords [][] = new int [6][2];
int lcd_pos_x ;
int lcd_pos_y ;
int lcd_pos_x_end ;
int lcd_pos_y_end ;
int lcd_menuicon_x;
Matrix keyMatrix [] = null; Matrix keyMatrix [] = null;
Matrix matrixScreen; Matrix matrixScreen;
Matrix matrixBack; Matrix matrixBack;
Paint paint; Paint paint;
Paint topBarPaint;
Paint screenPaint = null; Paint screenPaint = null;
Paint asanaHeadGreenPaint; Paint asanaHeadGreenPaint;
@ -89,7 +96,7 @@ public class HPView extends SurfaceView implements SurfaceHolder.Callback, Runna
int systemOptions_x; int systemOptions_x;
int systemOptions_y; int systemOptions_y;
boolean systemOptionDisplayed = true; boolean systemOptionDisplayed = true;
Paint buttonBorderPaint = new Paint(); Paint buttonBorderPaint = new Paint();
String topLefts [] = new String [MAX_TOUCHES]; String topLefts [] = new String [MAX_TOUCHES];
@ -120,6 +127,7 @@ public class HPView extends SurfaceView implements SurfaceHolder.Callback, Runna
annImages [3] = BitmapFactory.decodeResource(x48.getResources(), R.drawable.ann04); annImages [3] = BitmapFactory.decodeResource(x48.getResources(), R.drawable.ann04);
annImages [4] = BitmapFactory.decodeResource(x48.getResources(), R.drawable.ann05); annImages [4] = BitmapFactory.decodeResource(x48.getResources(), R.drawable.ann05);
annImages [5] = BitmapFactory.decodeResource(x48.getResources(), R.drawable.ann06); annImages [5] = BitmapFactory.decodeResource(x48.getResources(), R.drawable.ann06);
menuIcon = BitmapFactory.decodeResource(x48.getResources(), R.drawable.ic_action_core_overflow);
dm = x48.getResources().getDisplayMetrics(); dm = x48.getResources().getDisplayMetrics();
@ -132,7 +140,11 @@ public class HPView extends SurfaceView implements SurfaceHolder.Callback, Runna
paint = new Paint(); paint = new Paint();
paint.setStyle(Style.FILL); paint.setStyle(Style.FILL);
paint.setARGB(128, 250, 250, 250); paint.setARGB(128, 250, 250, 250);
topBarPaint = new Paint();
topBarPaint.setStyle(Style.FILL);
topBarPaint.setARGB(128, 160, 160, 160);
screenPaint = null; screenPaint = null;
screenPaint = new Paint(); screenPaint = new Paint();
@ -583,10 +595,10 @@ public class HPView extends SurfaceView implements SurfaceHolder.Callback, Runna
usable_w = ((float)w) * 5f / 9f; usable_w = ((float)w) * 5f / 9f;
remaning_w = w - usable_w; remaning_w = w - usable_w;
} }
int lcd_pos_x = land?(((int)usable_w-start_w)/2):((w - start_w)/2); lcd_pos_x = land?(((int)usable_w-start_w)/2):((w - start_w)/2);
int lcd_pos_y = 0; lcd_pos_y = 0;
int lcd_pos_x_end = lcd_pos_x+start_w; lcd_pos_x_end = lcd_pos_x+start_w;
int lcd_pos_y_end = lcd_pos_y+start_h; lcd_pos_y_end = lcd_pos_y+start_h;
float regular_key_height = usable_h / (8f + 11f/18f); float regular_key_height = usable_h / (8f + 11f/18f);
float regular_key_height_right = h / 7f; float regular_key_height_right = h / 7f;
float menu_key_height = regular_key_height*11/18; float menu_key_height = regular_key_height*11/18;
@ -898,7 +910,9 @@ public class HPView extends SurfaceView implements SurfaceHolder.Callback, Runna
backCanvas.drawBitmap(keys[k], keyMatrix[k], keyPaint); backCanvas.drawBitmap(keys[k], keyMatrix[k], keyPaint);
} }
} }
}
lcd_menuicon_x = lcd_pos_x_end - menuIcon.getWidth();
}
c.drawBitmap(backBuffer, 0, 0, null); c.drawBitmap(backBuffer, 0, 0, null);
if (data != null) if (data != null)
@ -914,12 +928,9 @@ public class HPView extends SurfaceView implements SurfaceHolder.Callback, Runna
if (ann[i]) if (ann[i])
c.drawBitmap(annImages[i], icons_coords[i][0], icons_coords[i][1], null); c.drawBitmap(annImages[i], icons_coords[i][0], icons_coords[i][1], null);
} }
if (systemOptionDisplayed)
if (systemOptionDisplayed) { c.drawBitmap(menuIcon, lcd_menuicon_x, lcd_pos_y, null);
c.drawText(x48.getString(R.string.show_menu), systemOptions_x, systemOptions_y, systemOptionsPaint);
}
} else { } else {
//Log.i("x48", "null canvas !"); //Log.i("x48", "null canvas !");
@ -974,7 +985,10 @@ public class HPView extends SurfaceView implements SurfaceHolder.Callback, Runna
} }
} }
if (code == -1 && actionCode == MotionEvent.ACTION_DOWN ) { if (code == -1 && actionCode == MotionEvent.ACTION_DOWN ) {
x48.openOptionsMenu(); if (x >= lcd_menuicon_x)
x48.openOptionsMenu();
else
x48.changeKeybLite();
return true; return true;
} }