update: ui fix

hazz01 · Mar 1, 2024 · 2398625 · 2398625
1 parent 0d77e1a
commit 2398625
Show file tree

Hide file tree

Showing 21 changed files with 448 additions and 326 deletions.
diff --git a/images/Pupuk Circle.png b/images/Pupuk Circle.png
diff --git a/images/Pupuk.png b/images/Pupuk.png
diff --git a/images/PupukUrea.png b/images/PupukUrea.png
diff --git a/images/SarumTangan.png b/images/SarumTangan.png
diff --git a/images/Vitamin.png b/images/Vitamin.png
diff --git a/images/garpuTanah.png b/images/garpuTanah.png
diff --git a/images/pupuk CircleOff.png b/images/pupuk CircleOff.png
diff --git a/images/pupukOff.png b/images/pupukOff.png
diff --git a/images/pupukOn (2).png b/images/pupukOn (2).png
diff --git a/images/sekopKeci.png b/images/sekopKeci.png
diff --git a/lib/Cahaya.dart b/lib/Cahaya.dart
@@ -83,12 +83,45 @@ class _CahayaState extends State<Cahaya> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      appBar: AppBar(
+        backgroundColor: Colors.white, // Warna latar belakang AppBar
+        title: const Padding(
+          padding: EdgeInsets.only(bottom: 0),
+          child: Text(
+            'Alat IoT',
+            style: TextStyle(
+              color: Colors.black,
+            ),
+          ),
+        ),
+        leading: IconButton(
+          icon: const Icon(
+            Icons.notifications_none_outlined,
+            color: Colors.black,
+          ),
+          onPressed: () {
+            Navigator.of(context).pop();
+          },
+        ),
+        centerTitle: true,
+        actions: <Widget>[
+          IconButton(
+            onPressed: () {
+              // Tambahkan logika aksi untuk ikon akun di sini
+            },
+            icon: const Icon(
+              Icons.settings,
+              color: Colors.black,
+            ),
+          ),
+        ],
+      ),
       body: Column(
         children: [
           Align(
             alignment: Alignment.bottomCenter,
             child: Container(
-              margin: const EdgeInsets.only(top: 55),
+              margin: const EdgeInsets.only(top: 10),
               child: const Text(
                 'Pencahayaan',
                 style: TextStyle(fontSize: 30, fontWeight: FontWeight.w500),
@@ -117,8 +150,8 @@ class _CahayaState extends State<Cahaya> {
                 color: Colors.black54),
           ),
           Container(
-            padding: const EdgeInsets.fromLTRB(40.0, 30.0, 40.0, 30.0),
-            margin: const EdgeInsets.fromLTRB(40.0, 70.0, 40.0, 40.0),
+            padding: const EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 10.0),
+            margin: const EdgeInsets.fromLTRB(20.0, 50.0, 20.0, 20.0),
             decoration: BoxDecoration(
               color: Colors.white,
               borderRadius: BorderRadius.circular(12.0),
@@ -160,6 +193,8 @@ class _CahayaState extends State<Cahaya> {
                             // final lampPowerRef = database.reference().child('Device1/Lamp');
                             // lampPowerRef.set(value); // Set nilai di Firebase sesuai nilai switch
                           },
+                          activeColor: Colors.yellow,
+                          inactiveThumbColor: Colors.white,
                         ),
                       ),
                     ),
@@ -186,7 +221,7 @@ class _CahayaState extends State<Cahaya> {
                     Container(
                       padding: const EdgeInsets.only(
                           top: 20, left: 0), // Atur jarak antara icon dan teks
-                      child: Text(   
+                      child: Text(
                         lampPower ? 'Lampu Nyala' : 'Lampu Mati',
                         style: TextStyle(
                           fontSize: 16.0,
@@ -221,7 +256,10 @@ class _CahayaState extends State<Cahaya> {
                     ),
                   );
                 },
-                child: const Icon(Icons.circle, color: Colors.black38,),
+                child: const Icon(
+                  Icons.circle,
+                  color: Colors.black38,
+                ),
               ),
               const SizedBox(
                 width: 10,
@@ -237,7 +275,10 @@ class _CahayaState extends State<Cahaya> {
                     ),
                   );
                 },
-                child: const Icon(Icons.circle, color: Colors.black38,),
+                child: const Icon(
+                  Icons.circle,
+                  color: Colors.black38,
+                ),
               ),
               const SizedBox(
                 width: 10,
@@ -253,7 +294,10 @@ class _CahayaState extends State<Cahaya> {
                     ),
                   );
                 },
-                child: const Icon(Icons.circle, color: Colors.black38,),
+                child: const Icon(
+                  Icons.circle,
+                  color: Colors.black38,
+                ),
               ),
               const SizedBox(
                 width: 10,
@@ -269,7 +313,10 @@ class _CahayaState extends State<Cahaya> {
                     ),
                   );
                 },
-                child: const Icon(Icons.circle, color: Colors.green,),
+                child: const Icon(
+                  Icons.circle,
+                  color: Colors.green,
+                ),
               ),
             ],
           ),

diff --git a/lib/Setting.dart b/lib/Setting.dart
@@ -13,28 +13,6 @@ class _SettingsState extends State<Settings> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(
-        centerTitle: true,
-        title: const Text('Setting'),
-        leading: IconButton(
-          icon: const Icon(Icons.notifications_none_outlined),
-          iconSize: 30.0,
-          onPressed: () {},
-        ),
-        actions: [
-          IconButton(
-            icon: const Icon(Icons.settings),
-            onPressed: () {
-              // Navigator.push(
-              // context,
-              // MaterialPageRoute(
-              //   builder: (context) => const setting(),
-              // ),
-              // );
-            },
-          ),
-        ],
-      ),
       body: Center(
         child: Stack(
           alignment: Alignment.center,