android wip: build mainactiviy only

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

5 files changed, 70 insertions, 13 deletions

diff --git a/Defogger/AndroidManifest.xml b/Defogger/AndroidManifest.xml
index 6a32114..afae1b1 100644
--- a/Defogger/AndroidManifest.xml
+++ b/Defogger/AndroidManifest.xml
@@ -1,12 +1,30 @@
 <?xml version='1.0'?>
-<manifest xmlns:a='http://schemas.android.com/apk/res/android' package='no.mork.android.defogger' a:versionCode='0' a:versionName='0'>
+<manifest xmlns:a='http://schemas.android.com/apk/res/android'
+	  package='no.mork.android.defogger'
+	  a:versionCode='0'
+	  a:versionName='0'>
+
+  <!-- minimum required for EC signing key support -->
   <uses-sdk a:minSdkVersion="18" />
-    <application a:label='Defogger'>
-        <activity a:name='no.mork.android.defogger.MainActivity'>
-             <intent-filter>
-                <category a:name='android.intent.category.LAUNCHER'/>
-                <action a:name='android.intent.action.MAIN'/>
-             </intent-filter>
+
+  <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">
+          <intent-filter>
+            <category a:name="android.intent.category.LAUNCHER"/>
+            <action a:name="android.intent.action.MAIN"/>
+          </intent-filter>
         </activity>
-    </application>
+
+       <activity
+            a:name="no.mork.android.defogger.ClientActivity"
+            a:label="bluetooth_client"
+            a:windowSoftInputMode="stateHidden"/>
+	
+  </application>
+
 </manifest>
diff --git a/Defogger/Makefile b/Defogger/Makefile
index 7b18967..8d102b5 100644
--- a/Defogger/Makefile
+++ b/Defogger/Makefile
@@ -16,7 +16,9 @@ SDKCLASSPATH=/usr/lib/android-sdk/platforms/android-$(APIVER)/android.jar
 RESOURCES=layout/activity_main.xml values/strings.xml
 RES=$(addprefix res/,$(RESOURCES))
 
-CLASSES=$(addprefix obj/no/mork/android/defogger/,R.class MainActivity.class)
+## 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))
 
 
 all: defogger.apk
diff --git a/Defogger/res/layout/activity_main.xml b/Defogger/res/layout/activity_main.xml
index 8ed4cd4..ee9b65f 100644
--- a/Defogger/res/layout/activity_main.xml
+++ b/Defogger/res/layout/activity_main.xml
@@ -9,4 +9,11 @@
       android:layout_centerVertical="true"
       android:text="@string/hello_msg"
       tools:context=".MainActivity" />
+   
+   <Button
+       android:id="@+id/launch_client_button"
+       android:layout_width="match_parent"
+       android:layout_height="wrap_content"
+       android:text="@string/client"/>
+
 </RelativeLayout>
diff --git a/Defogger/res/values/strings.xml b/Defogger/res/values/strings.xml
index 55a840d..e700f1a 100644
--- a/Defogger/res/values/strings.xml
+++ b/Defogger/res/values/strings.xml
@@ -1,6 +1,29 @@
 <resources>
-   <string name="app_name">Defogger</string>
-   <string name="hello_msg">Welcome a Beautiful Blue Sky for the modern IP Camera</string>
-   <string name="menu_settings">Settings</string>
-   <string name="title_activity_main">MainActivity</string>
+  <string name="app_name">Defogger</string>
+  <string name="hello_msg">Welcome a Beautiful Blue Sky for the modern IP Camera</string>
+  <string name="menu_settings">Settings</string>
+  <string name="title_activity_main">MainActivity</string>
+
+  <!-- Main -->
+
+  <string name="client">Client</string>
+
+  <!-- Client -->
+
+  <string name="bluetooth_client">Bluetooth Client</string>
+  <string name="scanning">Scanning</string>
+  <string name="start">Start</string>
+  <string name="stop">Stop</string>
+  <string name="ble_servers">BLE Servers</string>
+  <string name="connect">Connect</string>
+  <string name="disconnect">Disonnect</string>
+  <string name="messages">Messages</string>
+  <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 95d1cf5..97e7ecf 100644
--- a/Defogger/src/no/mork/android/defogger/MainActivity.java
+++ b/Defogger/src/no/mork/android/defogger/MainActivity.java
@@ -3,10 +3,17 @@ package no.mork.android.defogger;
 import android.app.Activity;
 import android.os.Bundle;
 
+import no.mork.android.defogger.ClientActivity;
+
 public class MainActivity extends Activity {
    @Override
    protected void onCreate(Bundle savedInstanceState) {
       super.onCreate(savedInstanceState);
       setContentView(R.layout.activity_main);
+
+      //      binding.launchClientButton.setOnClickListener(v -> startActivity(new Intent(MainActivity.this,
+      //									  ClientActivity.class)));
+
+
    }
 }