summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Mork <bjorn@mork.no>2019-06-02 08:35:41 +0200
committerBjørn Mork <bjorn@mork.no>2019-06-02 08:35:41 +0200
commit926d5e0c71bae1a550ce3ec593534a751ae43a03 (patch)
treea3b7872299419d8a786469647c91a3849fa4e72f
parent807b2df1d6e9a808f56c96e1bea563991f236a48 (diff)
add a button click method for startScannerActivity too
Signed-off-by: Bjørn Mork <bjorn@mork.no>
-rw-r--r--Defogger/res/layout/activity_main.xml1
-rw-r--r--Defogger/src/no/mork/android/defogger/MainActivity.java16
2 files changed, 7 insertions, 10 deletions
diff --git a/Defogger/res/layout/activity_main.xml b/Defogger/res/layout/activity_main.xml
index 59c6bf6..e6d815e 100644
--- a/Defogger/res/layout/activity_main.xml
+++ b/Defogger/res/layout/activity_main.xml
@@ -15,6 +15,7 @@
android:id="@+id/start_scan"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:onClick="startScannerActivity"
android:text="@string/start_scan"/>
<TextView
android:layout_width="match_parent"
diff --git a/Defogger/src/no/mork/android/defogger/MainActivity.java b/Defogger/src/no/mork/android/defogger/MainActivity.java
index 29e63bf..3808499 100644
--- a/Defogger/src/no/mork/android/defogger/MainActivity.java
+++ b/Defogger/src/no/mork/android/defogger/MainActivity.java
@@ -61,16 +61,6 @@ public class MainActivity extends Activity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
-
- Button start_scan = (Button) findViewById(R.id.start_scan);
- start_scan.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- disconnectDevice();
- Intent intent = new Intent(view.getContext(), ScannerActivity.class);
- startActivityForResult(intent, REQUEST_GET_DEVICE);
- }
- });
EditText cmd = (EditText) findViewById(R.id.command);
cmd.setOnEditorActionListener(new OnEditorActionListener() {
@@ -149,6 +139,12 @@ public class MainActivity extends Activity {
}
}
+ public void startScannerActivity(View view) {
+ disconnectDevice();
+ Intent intent = new Intent(view.getContext(), ScannerActivity.class);
+ startActivityForResult(intent, REQUEST_GET_DEVICE);
+ }
+
// utilities
private Map<String,String> splitKV(String kv, String splitter)
{