Browse Source

@task: device ui

bai 3 years ago
parent
commit
2b1e9c73dc

+ 1 - 1
demo/src/main/AndroidManifest.xml

@@ -32,7 +32,7 @@
             android:name=".activities.poc.DeviceTypeActivity"
             android:exported="true" />
         <activity
-            android:name=".activities.poc.NewDeviceActivity"
+            android:name=".activities.poc.DeviceActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

+ 8 - 6
demo/src/main/java/com/sybotan/android/demo/activities/poc/NewDeviceActivity.kt

@@ -1,27 +1,29 @@
 package com.sybotan.android.demo.activities.poc
 
 import android.os.Bundle
+import android.support.constraint.ConstraintLayout
 import android.support.v7.app.AppCompatActivity
+import android.widget.Button
 import android.widget.Toast
 import com.sybotan.android.demo.R
-import kotlinx.android.synthetic.main.activity_new_device.*
 import org.jetbrains.anko.startActivity
 
-class NewDeviceActivity : AppCompatActivity() {
+class DeviceActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_new_device)
-
+        setContentView(R.layout.activity_device)
+        val deviceCl = findViewById<ConstraintLayout>(R.id.deviceCl)
         deviceCl.setOnClickListener {
             startActivity<DeviceTypeActivity>()
         }
-
+        val infoCl = findViewById<ConstraintLayout>(R.id.infoCl)
         infoCl.setOnClickListener {
             startActivity<RecordInfoActivity>()
         }
 
+        val saveBtn = findViewById<Button>(R.id.saveBtn)
         saveBtn.setOnClickListener {
-            Toast.makeText(this@NewDeviceActivity, "hello", Toast.LENGTH_LONG).show()
+            Toast.makeText(this@DeviceActivity, "hello", Toast.LENGTH_LONG).show()
         }
     }
 

+ 5 - 1
demo/src/main/res/layout/activity_new_device.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".activities.poc.NewDeviceActivity">
+    tools:context=".activities.poc.DeviceActivity">
 
     <android.support.constraint.ConstraintLayout
         android:id="@+id/topBarCl"
@@ -63,6 +63,7 @@
                 android:layout_height="24dp"
                 android:layout_marginStart="16dp"
                 android:src="@drawable/ic_round_check_24"
+                android:visibility="invisible"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
@@ -128,6 +129,7 @@
                 android:layout_height="24dp"
                 android:layout_marginStart="16dp"
                 android:src="@drawable/ic_round_check_24"
+                android:visibility="invisible"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
@@ -192,6 +194,7 @@
                 android:layout_height="24dp"
                 android:layout_marginStart="16dp"
                 android:src="@drawable/ic_round_check_24"
+                android:visibility="invisible"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
@@ -257,6 +260,7 @@
                 android:layout_height="24dp"
                 android:layout_marginStart="16dp"
                 android:src="@drawable/ic_round_check_24"
+                android:visibility="invisible"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"