adds dataset selection menus.

Signed-off-by: Paul Dubs <[email protected]>

Author: RobAltena

android-examples/app/src/main/AndroidManifest.xml

@@ -8,7 +8,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme"
+        android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
         android:fullBackupContent="@xml/backup_descriptor">
         <activity android:name="com.example.androidDl4jClassifier.MainActivity">
             <intent-filter>

android-examples/app/src/main/java/com/example/androidDl4jClassifier/MainActivity.java

@@ -3,6 +3,9 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
 
 public class MainActivity extends AppCompatActivity {
 
@@ -15,7 +18,38 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
     }
 
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_linear:
+                // User chose linear dataset.
+                return true;
+
+            case R.id.action_moon:
+                // User chose moon dataset.
+                return true;
+
+            case R.id.action_saturn:
+                // User chose moon dataset.
+                return true;
+
+            default:
+                // If we got here, the user's action was not recognized.
+                // Invoke the superclass to handle it.
+                return super.onOptionsItemSelected(item);
+
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        getMenuInflater().inflate(R.menu.menu_main, menu);
+        return true;
+    }
+
     public static MainActivity getInstance(){
         return instance;
     }
+
 }

android-examples/app/src/main/java/com/example/androidDl4jClassifier/ScatterView.java

@@ -42,7 +42,7 @@ public class ScatterView extends View {
 
     private final int nPointsPerAxis = 100;
     private INDArray xyGrid; //x,y grid to calculate the output image. Needs to be calculated once, then re-used.
-    INDArray modelOut = null;
+    private INDArray modelOut = null;
 
     public ScatterView(Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);

android-examples/app/src/main/res/layout/activity_main.xml

@@ -6,10 +6,12 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+
     <view
         class="com.example.androidDl4jClassifier.ScatterView"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>

android-examples/app/src/main/res/menu/menu_main.xml

@@ -0,0 +1,16 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_linear"
+        android:orderInCategory="100"
+        android:title="@string/action_linear"
+        app:showAsAction="never" />
+    <item
+        android:orderInCategory="101"
+        android:id="@+id/action_moon"
+        android:title="@string/action_moon" />
+    <item
+        android:orderInCategory="102"
+        android:id="@+id/action_saturn"
+        android:title="@string/action_saturn" />
+</menu>

android-examples/app/src/main/res/values/colors.xml

@@ -1,6 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#6200EE</color>
-    <color name="colorPrimaryDark">#3700B3</color>
-    <color name="colorAccent">#03DAC5</color>
-</resources>
+<resources />

android-examples/app/src/main/res/values/strings.xml

@@ -1,3 +1,6 @@
 <resources>
     <string name="app_name">Android DL4j classifier</string>
+    <string name="action_linear">Linear</string>
+    <string name="action_moon">Moon</string>
+    <string name="action_saturn">Saturn</string>
 </resources>

android-examples/app/src/main/res/values/styles.xml

@@ -1,11 +1,5 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
 
 </resources>