From 2f9c768c0f6c1d76b316df6e633c5c3d398dc176 Mon Sep 17 00:00:00 2001
From: Zhengyu Peng <rookiepeng@users.noreply.github.com>
Date: Sun, 13 Feb 2022 22:51:40 -0500
Subject: [PATCH] update

---
 .../com/rookiedev/hexapod/view/ControlView.kt | 26 -----
 .../main/res/drawable/ic_circle_button.xml    | 41 ++++++++
 .../src/main/res/layout/activity_control.xml  | 96 +++++++++++++++++--
 3 files changed, 127 insertions(+), 36 deletions(-)
 delete mode 100644 software/android/app/src/main/java/com/rookiedev/hexapod/view/ControlView.kt
 create mode 100644 software/android/app/src/main/res/drawable/ic_circle_button.xml

diff --git a/software/android/app/src/main/java/com/rookiedev/hexapod/view/ControlView.kt b/software/android/app/src/main/java/com/rookiedev/hexapod/view/ControlView.kt
deleted file mode 100644
index e802a61..0000000
--- a/software/android/app/src/main/java/com/rookiedev/hexapod/view/ControlView.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.rookiedev.hexapod.view
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.ViewGroup
-
-class ControlView : ViewGroup {
-    private val mContext: Context? = null
-
-    constructor(context: Context) : super(context) {
-        // ...
-    }
-
-    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
-        // ...
-    }
-
-    override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
-        TODO("Not yet implemented")
-    }
-
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec)
-    }
-
-}
diff --git a/software/android/app/src/main/res/drawable/ic_circle_button.xml b/software/android/app/src/main/res/drawable/ic_circle_button.xml
new file mode 100644
index 0000000..19d4f7c
--- /dev/null
+++ b/software/android/app/src/main/res/drawable/ic_circle_button.xml
@@ -0,0 +1,41 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="160dp"
+    android:height="160dp"
+    android:viewportWidth="160"
+    android:viewportHeight="160">
+  <path
+      android:pathData="M79.985,80.036m-56.569,56.569a80,80 0,1 1,113.137 -113.137a80,80 0,1 1,-113.137 113.137"
+      android:strokeLineJoin="round"
+      android:strokeWidth="7.9375"
+      android:fillColor="#000000"
+      android:fillAlpha="0.539162"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M79.985,80.036m-36.534,36.534a51.667,51.667 90,1 1,73.068 -73.068a51.667,51.667 90,1 1,-73.068 73.068"
+      android:strokeLineJoin="round"
+      android:strokeWidth="7.9375"
+      android:fillColor="#000000"
+      android:fillAlpha="0.539162"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M79.985,80.036m-18.458,18.458a26.104,26.104 90,1 1,36.917 -36.917a26.104,26.104 90,1 1,-36.917 36.917"
+      android:strokeLineJoin="round"
+      android:strokeWidth="7.9375"
+      android:fillColor="#000000"
+      android:fillAlpha="0.539162"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M136.163,22.974L22.974,136.163"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.264583"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="butt"/>
+  <path
+      android:pathData="M23.91,22.974L137.098,136.163"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.264583"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="butt"/>
+</vector>
diff --git a/software/android/app/src/main/res/layout/activity_control.xml b/software/android/app/src/main/res/layout/activity_control.xml
index 5ea075e..bc3da58 100644
--- a/software/android/app/src/main/res/layout/activity_control.xml
+++ b/software/android/app/src/main/res/layout/activity_control.xml
@@ -1,18 +1,94 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ControlActivity">
 
-    <view
-        android:id="@+id/view"
-        class="com.rookiedev.hexapod.view.ControlView"
-        android:layout_width="match_parent"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="0dp"
         android:layout_height="match_parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        android:layout_weight="1">
+
+        <Button
+            android:id="@+id/button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Button"
+            app:layout_constraintBottom_toTopOf="@+id/button3"
+            app:layout_constraintEnd_toStartOf="@+id/button2"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <Button
+            android:id="@+id/button2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Button"
+            app:layout_constraintBottom_toTopOf="@+id/button4"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/button"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <Button
+            android:id="@+id/button3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Button"
+            app:layout_constraintBottom_toTopOf="@+id/button5"
+            app:layout_constraintEnd_toStartOf="@+id/button4"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/button" />
+
+        <Button
+            android:id="@+id/button4"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Button"
+            app:layout_constraintBottom_toTopOf="@+id/button6"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/button3"
+            app:layout_constraintTop_toBottomOf="@+id/button2" />
+
+        <Button
+            android:id="@+id/button5"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Button"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/button6"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/button3" />
+
+        <Button
+            android:id="@+id/button6"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Button"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/button5"
+            app:layout_constraintTop_toBottomOf="@+id/button4" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="32dp"
+            android:layout_marginEnd="32dp"
+            android:layout_marginTop="32dp"
+            android:layout_marginBottom="32dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/ic_circle_button" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>
\ No newline at end of file