From 3d8ece763bd51582b76fc8a615244fb66db3b444 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20M=C3=BCller?= Date: Thu, 16 Nov 2017 18:20:17 +0100 Subject: [PATCH] Clean up --- .../java/at/bitfire/gfxtablet/CanvasView.java | 21 +++++------------- .../java/at/bitfire/gfxtablet/NetEvent.java | 17 +++++++------- .../at/bitfire/gfxtablet/NetworkClient.java | 6 ++--- .../at/bitfire/gfxtablet/NetworkServer.java | 9 +++----- .../bitfire/gfxtablet/SettingsActivity.java | 4 ---- .../ic_arrow_expand_white_48dp.png | Bin 469 -> 0 bytes .../ic_arrow_expand_white_48dp.png | Bin 373 -> 0 bytes .../ic_arrow_expand_white_48dp.png | Bin 653 -> 0 bytes .../ic_arrow_expand_white_48dp.png | Bin 1019 -> 0 bytes .../app/src/main/res/menu/activity_canvas.xml | 1 - 10 files changed, 19 insertions(+), 39 deletions(-) delete mode 100644 app-android/app/src/main/res/drawable-hdpi/ic_arrow_expand_white_48dp.png delete mode 100644 app-android/app/src/main/res/drawable-mdpi/ic_arrow_expand_white_48dp.png delete mode 100644 app-android/app/src/main/res/drawable-xhdpi/ic_arrow_expand_white_48dp.png delete mode 100644 app-android/app/src/main/res/drawable-xxhdpi/ic_arrow_expand_white_48dp.png diff --git a/app-android/app/src/main/java/at/bitfire/gfxtablet/CanvasView.java b/app-android/app/src/main/java/at/bitfire/gfxtablet/CanvasView.java index f934e98..6e505b1 100644 --- a/app-android/app/src/main/java/at/bitfire/gfxtablet/CanvasView.java +++ b/app-android/app/src/main/java/at/bitfire/gfxtablet/CanvasView.java @@ -3,40 +3,33 @@ package at.bitfire.gfxtablet; import android.annotation.SuppressLint; import android.content.Context; import android.content.SharedPreferences; -import android.graphics.Color; import android.preference.PreferenceManager; import android.support.annotation.NonNull; import android.util.AttributeSet; import android.util.Log; import android.view.MotionEvent; import android.view.View; - import at.bitfire.gfxtablet.NetEvent.Type; @SuppressLint("ViewConstructor") public class CanvasView extends View implements SharedPreferences.OnSharedPreferenceChangeListener { + final SharedPreferences settings; private static final String TAG = "GfxTablet.CanvasView"; - private enum InRangeStatus { OutOfRange, InRange, FakeInRange } - - final SharedPreferences settings; - NetworkClient netClient; - boolean acceptStylusOnly; - int maxX, maxY; - InRangeStatus inRangeStatus; - + private NetworkClient netClient; + private boolean acceptStylusOnly; + private int maxX, maxY; + private InRangeStatus inRangeStatus; // setup public CanvasView(Context context, AttributeSet attributeSet) { super(context, attributeSet); - // view is disabled until a network client is set setEnabled(false); - settings = PreferenceManager.getDefaultSharedPreferences(context); settings.registerOnSharedPreferenceChangeListener(this); setInputMethods(); @@ -48,7 +41,6 @@ public class CanvasView extends View implements SharedPreferences.OnSharedPrefer setEnabled(true); } - // settings protected void setInputMethods() { acceptStylusOnly = settings.getBoolean(SettingsActivity.KEY_PREF_STYLUS_ONLY, false); @@ -61,9 +53,7 @@ public class CanvasView extends View implements SharedPreferences.OnSharedPrefer } } - // drawing - @Override protected void onSizeChanged(int w, int h, int oldw, int oldh) { Log.i(TAG, "Canvas size changed: " + w + "x" + h + " (before: " + oldw + "x" + oldh + ")"); @@ -148,5 +138,4 @@ public class CanvasView extends View implements SharedPreferences.OnSharedPrefer short normalizePressure(float x) { return (short)(Math.min(Math.max(0, x), 2.0) * Short.MAX_VALUE); } - } diff --git a/app-android/app/src/main/java/at/bitfire/gfxtablet/NetEvent.java b/app-android/app/src/main/java/at/bitfire/gfxtablet/NetEvent.java index 334ac89..60a9de0 100644 --- a/app-android/app/src/main/java/at/bitfire/gfxtablet/NetEvent.java +++ b/app-android/app/src/main/java/at/bitfire/gfxtablet/NetEvent.java @@ -6,40 +6,39 @@ import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; import java.io.IOException; -public class NetEvent { +class NetEvent { enum Type { TYPE_MOTION, TYPE_BUTTON, - - // not specified in protocol, only needed to shut down network thread + // not specified in protocol, only needed to shut down network thread TYPE_DISCONNECT } - static final String signature = "GfxTablet"; - static final short protocol_version = 2; + private static final String signature = "GfxTablet"; + private static final short protocol_version = 2; final Type type; short x, y, pressure; byte button, button_down; - public NetEvent(Type type) { + NetEvent(Type type) { this.type = type; } - public NetEvent(Type type, short x, short y, short pressure) { + NetEvent(Type type, short x, short y, short pressure) { this.type = type; this.x = x; this.y = y; this.pressure = pressure; } - public NetEvent(Type type, short x, short y, short pressure, int button, boolean button_down) { + NetEvent(Type type, short x, short y, short pressure, int button, boolean button_down) { this(type, x, y, pressure); this.button = (byte)button; this.button_down = (byte)(button_down ? 1 : 0); } - public byte[] toByteArray() { + byte[] toByteArray() { if (type == Type.TYPE_DISCONNECT) return null; diff --git a/app-android/app/src/main/java/at/bitfire/gfxtablet/NetworkClient.java b/app-android/app/src/main/java/at/bitfire/gfxtablet/NetworkClient.java index 32a6264..3100339 100644 --- a/app-android/app/src/main/java/at/bitfire/gfxtablet/NetworkClient.java +++ b/app-android/app/src/main/java/at/bitfire/gfxtablet/NetworkClient.java @@ -15,11 +15,11 @@ import at.bitfire.gfxtablet.NetEvent.Type; public class NetworkClient implements Runnable { static final int GFXTABLET_PORT = 40118; - final LinkedBlockingQueue motionQueue = new LinkedBlockingQueue<>(); + private final LinkedBlockingQueue motionQueue = new LinkedBlockingQueue<>(); LinkedBlockingQueue getQueue() { return motionQueue; } InetAddress destAddress; - final SharedPreferences preferences; + private final SharedPreferences preferences; NetworkClient(SharedPreferences preferences) { this.preferences = preferences; @@ -40,7 +40,7 @@ public class NetworkClient implements Runnable { public void run() { try { DatagramSocket socket = new DatagramSocket(); - + while (true) { NetEvent event = motionQueue.take(); diff --git a/app-android/app/src/main/java/at/bitfire/gfxtablet/NetworkServer.java b/app-android/app/src/main/java/at/bitfire/gfxtablet/NetworkServer.java index 8396ba0..55a56cc 100644 --- a/app-android/app/src/main/java/at/bitfire/gfxtablet/NetworkServer.java +++ b/app-android/app/src/main/java/at/bitfire/gfxtablet/NetworkServer.java @@ -3,17 +3,14 @@ package at.bitfire.gfxtablet; import android.content.SharedPreferences; import android.util.Log; import android.util.SparseArray; - -import java.io.File; import java.io.IOException; import java.net.DatagramPacket; import java.net.DatagramSocket; import java.io.FileOutputStream; public class NetworkServer implements Runnable { - static final int GFXTABLET_PORT = 40118; - NetworkClient netClient; - final SharedPreferences preferences; + private static final int GFXTABLET_PORT = 40118; + private final SharedPreferences preferences; NetworkServer(SharedPreferences preferences) { this.preferences = preferences; @@ -36,7 +33,7 @@ public class NetworkServer implements Runnable { DatagramPacket packet = new DatagramPacket(buf, buf.length); socket.receive(packet); int n = buf[60029]; - Log.i("receive:", String.valueOf(n)); + //Log.i("receive:", String.valueOf(n)); if (n != 0){ packets = buf[60030]; buffer.put(n, buf); diff --git a/app-android/app/src/main/java/at/bitfire/gfxtablet/SettingsActivity.java b/app-android/app/src/main/java/at/bitfire/gfxtablet/SettingsActivity.java index 491c69c..a05f211 100644 --- a/app-android/app/src/main/java/at/bitfire/gfxtablet/SettingsActivity.java +++ b/app-android/app/src/main/java/at/bitfire/gfxtablet/SettingsActivity.java @@ -1,7 +1,6 @@ package at.bitfire.gfxtablet; import android.os.Bundle; -import android.support.v7.app.ActionBarActivity; import android.support.v7.app.AppCompatActivity; public class SettingsActivity extends AppCompatActivity { @@ -14,10 +13,7 @@ public class SettingsActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - getSupportActionBar().setDisplayHomeAsUpEnabled(true); - setContentView(R.layout.activity_settings); } - } diff --git a/app-android/app/src/main/res/drawable-hdpi/ic_arrow_expand_white_48dp.png b/app-android/app/src/main/res/drawable-hdpi/ic_arrow_expand_white_48dp.png deleted file mode 100644 index 590f65115b4abcbbec30d1702a4e21b7e4753542..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 469 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!Y)RhkE=uJQvb0|R4%r;B4q#jUruz5AF9c^EF5aPKgV$$nNdk9W0T zf_hob>Xo;c3O}{{*pk4b1O$u3Wv5wpcC_%@@m+rN$~Ifj!)?y??dc4W z<`R7-#=Chk$`*@S-1@hjIaPV>87=lxPEm6&GG&-gN`GtSuzSLu>}^b4Ze0jKpy0)C6|=ANpI~=A%y|BLXtVz6*=!ust?yXeuRN&pDxvX0ZG%$bqH8(KTbR|8 z-ikR`7w$1W)o4^;v)QZBs4#5esRpfrunAg?KNzPng|r!WUg7JIFDyIwQ6ZFJYFyh4 y*G+3q{y#e9$NDxQ2QLOq#w9EQfRMg~t8$B>MBZ)Y0vH5>4_?msQ*_^5?vZ_gQ=9$o3%~NP|%j~%>~{C!UyJ6pLzQBjaRibS9{T@`_21(25&PG^Q3VDJgQu&X%Q~lo FCIIzSi#7lN diff --git a/app-android/app/src/main/res/drawable-xhdpi/ic_arrow_expand_white_48dp.png b/app-android/app/src/main/res/drawable-xhdpi/ic_arrow_expand_white_48dp.png deleted file mode 100644 index 22ccfdef0ea18ccbbaaafb2fe6eb702e87233f99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 653 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoY)RhkE(}8pX7+2iB`GtXjNy5{`F{I+w+qtI;4;%2XE)02)^hPLXYqW=c zA^RCu_VZ8FCo#w;yqzcf=;PWYJ}U~7K=y(`dgAN9ZP%irr3!BEG7dZSdz+C=4Lf6! zfC3wwNSoTwKJ)H2#x!>Rb9>&-{Cx4)&z!ZfSAX)qdA}=NR%vs?7ooJ%>lGB%vh;s) zXVIwRh(GgYp68)?Pxqxqd$lwiZ(P4KLWpzjQ~8_G6%YQu*g17+|Kf>j?)58_GcJ~1 z9q{ks-_xuq(+wuC?P*velx93tXo7E(`?MmaO&%Xk1q3xjH9dc`i77;APx>^m4N*=< z)_h_L^X!=QQHW`gD$Dx6QcR1wx^(QF8oo?@vMpCW?OWa~=XLEf_r8~WB~ZvMwcA&2Ikb#sn7PtefhWaeaq|*lQpNka8`<~h-H)w&-#8F%kpW+NfbN?jZ@GF)!_=qlXLYn40_%>vnZz{ZX?41Wx`Ol1d68b6CqnjxFEe5? zn)ZI;+LnehPtSXK=r3^kX)L70p%M76rR59LsVVjv3->gHJgxRVp{J1gbDoe9w@2*0 z=`CxRyr%r$ay*f9@8%!>86WNW^EAegL!g-fK|o`cp~1C=v8AGa{>GT_YalUCS3j3^ HP6cu_bxCy8vk*`02d69!PN(ctjQh zX%8@VJDF_<5-cllOb60n{S1{~6$2O;nA<#E978H@y}j#L6l^Wv_V9nuo2EjsNmJA1 zKh7xaVB9xlVbHPgyFumN&u2GZUE3_LVt!r-Xa*8!xccy`^ww)pUkvnlYh?0_H?zNt z{-Us=w;{pF!9Y=AhJb(%2ZtI9i!f6YC*#2uu<%d0+6MK!N%#66|B$SmpuK1R^=nbT z6<<1EivE%lfASCC7qyp<_Z`qp?RP&VJ7G(qi|C_?pV(D$B?6~bERkaLly(i#lw0ZN zaEVPYwA+1^=!7i=E~1YozG79;l?c3AvE)WWUR(Tb9~Zxm5oMV|k{5Ote)uG4dF->C zZTE2_JxlQ$QNQ>6%KrZ`(opIB&FXLSz1}leyO|_C%Vn0@dSQ***aqqm|1~px)4D-Y3N()YM&)+d!bF)Ceg-7h~Q*QCFh}1ALe>430hGohVr8#AW zf6uT?dE>-W&0(p{sJeHCR=Uc9C*o87=CFi3S+r?hXG2$P#J0@>7rtKS-oJwtzcgp3kFQ=K2>GLhx zxbgnK&IywPr#_yUQTV!{tRwx)n%it!f^C%3?-?zSeO!5C`s+8hS+^A1@LLz(b_{W7 ze{8f)?v>i@$t~VB_rg9`uKM&zum5qu&fg~*bf$GYe2gPw0A|2!|7witAHu5VOsz55Zy&wjJd++R|dJ0o8?@Bp?|Fc y{vYs*|DV9WKedkCi4ir$qhtgocm#kM4jbZMed|~-|ATZsi0|p@=d#Wzp$PyVcD9`W diff --git a/app-android/app/src/main/res/menu/activity_canvas.xml b/app-android/app/src/main/res/menu/activity_canvas.xml index b7e0818..43e1b33 100644 --- a/app-android/app/src/main/res/menu/activity_canvas.xml +++ b/app-android/app/src/main/res/menu/activity_canvas.xml @@ -14,5 +14,4 @@ android:onClick="showSettings" app:showAsAction="ifRoom" android:title="@string/menu_settings"/> - \ No newline at end of file