android wip: semi-working Toast

Signed-off-by: Bjørn Mork <bjorn@mork.no>

6 files changed, 43 insertions, 17 deletions

diff --git a/Defogger/AndroidManifest.xml b/Defogger/AndroidManifest.xml
index afae1b1..49e15fc 100644
--- a/Defogger/AndroidManifest.xml
+++ b/Defogger/AndroidManifest.xml
@@ -7,13 +7,14 @@
   <!-- minimum required for EC signing key support -->
   <uses-sdk a:minSdkVersion="18" />
 
+  <!-- not yet...
   <uses-permission a:name="android.permission.BLUETOOTH"/>
   <uses-permission a:name="android.permission.BLUETOOTH_ADMIN"/>
   <uses-permission a:name="android.permission.ACCESS_FINE_LOCATION"/>
-
+  -->
   
   <application a:label="Defogger">
-        <activity a:name="no.mork.android.defogger.MainActivity">
+        <activity a:name=".MainActivity">
           <intent-filter>
             <category a:name="android.intent.category.LAUNCHER"/>
             <action a:name="android.intent.action.MAIN"/>
@@ -21,8 +22,8 @@
         </activity>
 
        <activity
-            a:name="no.mork.android.defogger.ClientActivity"
-            a:label="bluetooth_client"
+            a:name=".ScannerActivity"
+            a:label="Scanning"
             a:windowSoftInputMode="stateHidden"/>
 	
   </application>
diff --git a/Defogger/Makefile b/Defogger/Makefile
index 8d102b5..9c4df65 100644
--- a/Defogger/Makefile
+++ b/Defogger/Makefile
@@ -18,7 +18,7 @@ RES=$(addprefix res/,$(RESOURCES))
 
 ## Temp disabled while we have some non-building classess....
 #CLASSES=obj/no/mork/android/defogger/R.class $(patsubst src/%.java,obj/%.class,$(wildcard src/no/mork/android/defogger/util/*.java) $(wildcard src/no/mork/android/defogger/*.java))
-CLASSES=obj/no/mork/android/defogger/R.class $(patsubst src/%.java,obj/%.class,$(wildcard src/no/mork/android/defogger/Main*.java))
+CLASSES=obj/no/mork/android/defogger/R.class $(patsubst src/%.java,obj/%.class,src/no/mork/android/defogger/MainActivity.java src/no/mork/android/defogger/ScannerActivity.java)
 
 
 all: defogger.apk
diff --git a/Defogger/res/layout/activity_main.xml b/Defogger/res/layout/activity_main.xml
index ee9b65f..fee0838 100644
--- a/Defogger/res/layout/activity_main.xml
+++ b/Defogger/res/layout/activity_main.xml
@@ -11,9 +11,9 @@
       tools:context=".MainActivity" />
    
    <Button
-       android:id="@+id/launch_client_button"
+       android:id="@+id/start_scan"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-       android:text="@string/client"/>
+       android:text="@string/start_scan"/>
 
 </RelativeLayout>
diff --git a/Defogger/res/values/strings.xml b/Defogger/res/values/strings.xml
index e700f1a..15139fc 100644
--- a/Defogger/res/values/strings.xml
+++ b/Defogger/res/values/strings.xml
@@ -6,9 +6,9 @@
 
   <!-- Main -->
 
-  <string name="client">Client</string>
+  <string name="start_scan">Scan for camera</string>
 
-  <!-- Client -->
+  <!-- Scanner -->
 
   <string name="bluetooth_client">Bluetooth Client</string>
   <string name="scanning">Scanning</string>
@@ -21,9 +21,5 @@
   <string name="send">Send</string>
   <string name="request_timestamp">Request Timestamp</string>
   
-  <!-- Logs -->
-
-  <string name="logs">Logs</string>
-  <string name="clear">Clear</string>
-
+ 
 </resources>
diff --git a/Defogger/src/no/mork/android/defogger/MainActivity.java b/Defogger/src/no/mork/android/defogger/MainActivity.java
index 97e7ecf..efd7c55 100644
--- a/Defogger/src/no/mork/android/defogger/MainActivity.java
+++ b/Defogger/src/no/mork/android/defogger/MainActivity.java
@@ -1,9 +1,12 @@
 package no.mork.android.defogger;
 
 import android.app.Activity;
+import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
 
-import no.mork.android.defogger.ClientActivity;
+import no.mork.android.defogger.ScannerActivity;
 
 public class MainActivity extends Activity {
    @Override
@@ -11,9 +14,15 @@ public class MainActivity extends Activity {
       super.onCreate(savedInstanceState);
       setContentView(R.layout.activity_main);
 
-      //      binding.launchClientButton.setOnClickListener(v -> startActivity(new Intent(MainActivity.this,
-      //									  ClientActivity.class)));
+      Button start_scan = (Button) findViewById(R.id.start_scan);
+      //      button2 = (Button) findViewById(R.id.button2);
 
+      start_scan.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(view.getContext(), ScannerActivity.class);
+                view.getContext().startActivity(intent);}
+            });
 
    }
 }
diff --git a/Defogger/src/no/mork/android/defogger/ScannerActivity.java b/Defogger/src/no/mork/android/defogger/ScannerActivity.java
new file mode 100644
index 0000000..6298634
--- /dev/null
+++ b/Defogger/src/no/mork/android/defogger/ScannerActivity.java
@@ -0,0 +1,20 @@
+package no.mork.android.defogger;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import android.widget.Toast;
+
+public class ScannerActivity extends Activity {
+   @Override
+   protected void onCreate(Bundle savedInstanceState) {
+      super.onCreate(savedInstanceState);
+
+      Context context = getApplicationContext();
+      CharSequence text = "Hello toast!";
+      int duration = Toast.LENGTH_LONG;
+
+      Toast toast = Toast.makeText(context, text, duration);
+      toast.show();
+   }
+}