yetangitu/GfxTablet
1
0
Fork 0
mirror of https://github.com/rfc2822/GfxTablet synced 2025-10-03 09:39:16 +02:00
Code Issues Releases Wiki Activity

Visual feedback

Browse source 
and a menu button to clear the screen.
This commit is contained in:
Kevin Li 2013-10-16 19:55:26 -04:00
parent 3833256848
commit eaea2cd919
4 changed files with 62 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app-android/res/menu/activity_canvas.xml
View file

@ -1,13 +1,20 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:showAsAction="never"
android:title="@string/menu_clear"
android:onClick="clearDraw"/>
<item
android:orderInCategory="100"
android:showAsAction="ifRoom"
android:title="@string/menu_settings" android:onClick="showSettings"/>
android:title="@string/menu_settings"
android:onClick="showSettings"/>
<item
android:orderInCategory="100"
android:showAsAction="never"
android:title="@string/menu_about" android:onClick="showAbout"/>
android:title="@string/menu_about"
android:onClick="showAbout"/>
</menu>

13
app-android/res/values/strings.xml
View file

@ -2,12 +2,17 @@
<resources>
<string name="app_name">GfxTablet</string>
<string name="menu_clear">Clear</string>
<string name="menu_settings">Settings</string>
<string name="preferences_host_title">Network host</string>
<string name="stylus_preference">Sense stylus only</string>
<string name="fullscreen_preference">Fullscreen</string>
<string name="menu_about">About / Help</string>
<string name="fullscreen_preference_summary">Title bar will only be hidden when hardware menu button is present</string>
<string name="preferences_host_title">Network host</string>
<string name="stylus_preference">Sense stylus only</string>
<string name="stylus_preference_summary">Ignores touch events from fingers</string>
<string name="fullscreen_preference">Fullscreen</string>
<string name="fullscreen_preference_summary">Title bar will only be hidden when hardware menu button is present</string>
</resources>

4
app-android/src/at/bitfire/gfxtablet/CanvasActivity.java
View file

@ -66,6 +66,10 @@ public class CanvasActivity extends Activity {
startActivityForResult(new Intent(this, SettingsActivity.class), 0);
}
public void clearDraw(MenuItem item) {
this.canvas.clearDraw();
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (resultCode == SettingsActivity.RESULT_RESTART) {

40
app-android/src/at/bitfire/gfxtablet/CanvasView.java
View file

@ -5,6 +5,11 @@ import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.Path;
import android.graphics.PorterDuff.Mode;
import android.os.AsyncTask;
import android.preference.PreferenceManager;
import android.view.MotionEvent;
@ -17,6 +22,12 @@ public class CanvasView extends View implements OnSharedPreferenceChangeListener
NetworkClient netClient;
SharedPreferences settings;
boolean acceptStylusOnly;
Bitmap bitmap;
Canvas canvas;
Path path;
Paint paint_bitmap, paint;
int maxX, maxY;
public CanvasView(Context context, NetworkClient netClient) {
@ -24,7 +35,12 @@ public class CanvasView extends View implements OnSharedPreferenceChangeListener
// disable until networking has been configured
setEnabled(false);
setBackgroundColor(0xFFD0D0D0);
this.path = new Path();
this.paint_bitmap = new Paint(Paint.DITHER_FLAG);
this.paint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG);
this.paint.setColor(0xFF000000);
this.paint.setStyle(Paint.Style.STROKE);
settings = PreferenceManager.getDefaultSharedPreferences(context);
settings.registerOnSharedPreferenceChangeListener(this);
@ -50,8 +66,16 @@ public class CanvasView extends View implements OnSharedPreferenceChangeListener
protected void onSizeChanged (int w, int h, int oldw, int oldh) {
maxX = w;
maxY = h;
this.bitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
this.canvas = new Canvas(this.bitmap);
}
@Override
protected void onDraw(Canvas canvas) {
canvas.drawColor(0xFFD0D0D0);
canvas.drawBitmap(this.bitmap, 0, 0, this.paint_bitmap);
canvas.drawPath(this.path, this.paint);
}
@Override
public boolean onGenericMotionEvent(MotionEvent event) {
@ -79,20 +103,28 @@ public class CanvasView extends View implements OnSharedPreferenceChangeListener
short nx = normalizeX(event.getX(ptr)),
ny = normalizeY(event.getY(ptr)),
npressure = normalizePressure(event.getPressure(ptr));
float x = event.getX();
float y = event.getY();
//Log.i("XorgTablet", String.format("Touch event logged: %f|%f, pressure %f", event.getX(ptr), event.getY(ptr), event.getPressure(ptr)));
switch (event.getActionMasked()) {
case MotionEvent.ACTION_MOVE:
netClient.getQueue().add(new NetEvent(Type.TYPE_MOTION, nx, ny, npressure));
this.path.lineTo(x, y);
break;
case MotionEvent.ACTION_DOWN:
netClient.getQueue().add(new NetEvent(Type.TYPE_BUTTON, nx, ny, npressure, 0, true));
this.path.reset();
this.path.moveTo(x, y);
break;
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_CANCEL:
netClient.getQueue().add(new NetEvent(Type.TYPE_BUTTON, nx, ny, npressure, 0, false));
this.path.lineTo(x, y);
this.canvas.drawPath(this.path, this.paint);
this.path.reset();
break;
}
invalidate();
}
return true;
}
@ -112,6 +144,10 @@ public class CanvasView extends View implements OnSharedPreferenceChangeListener
return (short)(Math.min(Math.max(0, x), 2.0) * Short.MAX_VALUE/2.0);
}
void clearDraw() {
this.canvas.drawColor(0, Mode.CLEAR);
invalidate();
}
private class ConfigureNetworkingTask extends AsyncTask<Void, Void, Boolean> {
@Override