diff --git a/assets/bg.png b/assets/bg.png new file mode 100644 index 0000000..eed0ad3 Binary files /dev/null and b/assets/bg.png differ diff --git a/lib/homepage.dart b/lib/homepage.dart index aa57964..83ff2ee 100644 --- a/lib/homepage.dart +++ b/lib/homepage.dart @@ -14,7 +14,7 @@ class HomePage extends HookWidget { fit: StackFit.expand, children: [ Image.asset( - "assets/bg.jpg", + "assets/bg.png", fit: BoxFit.cover, color: Colors.black.withOpacity(0.2), colorBlendMode: BlendMode.darken, diff --git a/lib/pages/kategori.dart b/lib/pages/kategori.dart index 732e8d5..230d797 100644 --- a/lib/pages/kategori.dart +++ b/lib/pages/kategori.dart @@ -96,7 +96,7 @@ class _KategoriPageState extends State { fit: StackFit.expand, children: [ Image.asset( - "assets/bg.jpg", + "assets/bg.png", fit: BoxFit.cover, color: Colors.black.withOpacity(0.2), colorBlendMode: BlendMode.darken, diff --git a/lib/pages/mewarna1.dart b/lib/pages/mewarna1.dart index 686f7fa..23feed7 100644 --- a/lib/pages/mewarna1.dart +++ b/lib/pages/mewarna1.dart @@ -10,7 +10,8 @@ import 'package:audioplayers/audioplayers.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter_colorpicker/flutter_colorpicker.dart'; -import 'package:image_gallery_saver/image_gallery_saver.dart'; +import 'package:gallery_saver/gallery_saver.dart'; +// import 'package:image_gallery_saver/image_gallery_saver.dart'; // import 'package:image_gallery_saver/image_gallery_saver.dart'; import 'package:path_provider/path_provider.dart'; import 'dart:ui' as ui; @@ -60,12 +61,39 @@ class _Mewarna1PageState extends State { // // GallerySaver.saveImage(path, albumName: "Download"); // } - Future _saveImage(Uint8List bytes) async { + Future _saveImage(Uint8List bytes, String stat) async { + log(stat); final appStorage = await getApplicationDocumentsDirectory(); final fileName = args['nama']!.toString() + _uuid + '.png'; log(fileName); final file = File('${appStorage.path}/$fileName'); + log(file.toString()); await file.writeAsBytes(bytes); + + if (stat == 'simpan') { + await EasyLoading.show( + status: 'Menyimpan...', + maskType: EasyLoadingMaskType.black, + ); + await GallerySaver.saveImage(file.path, albumName: "Download"); + await EasyLoading.dismiss(); + // create dialog box message "Foto berhasil disimpan" + showDialog( + context: context, + builder: (context) => AlertDialog( + // title: Text('Foto berhasil disimpan di'), + content: const Text('Foto berhasil disimpan di galeri'), + actions: [ + ElevatedButton( + child: const Text('OK'), + onPressed: () { + Navigator.pop(context); + }, + ), + ], + ), + ); + } } Future _capturePng(String stat) async { @@ -86,39 +114,39 @@ class _Mewarna1PageState extends State { _ini = 'ada'; points.clear(); }); - await _saveImage(base64Decode(bs64)); + await _saveImage(base64Decode(bs64), stat); // await _saveNetworkImage(); await EasyLoading.dismiss(); - if (stat == 'simpan') { - // log('simpan'); - await EasyLoading.show( - status: 'Menyimpan Ke Galeri', - maskType: EasyLoadingMaskType.black, - ); - await ImageGallerySaver.saveImage(Uint8List.fromList(pngBytes), - quality: 100, name: args['nama']!.toString() + _uuid); - await EasyLoading.dismiss(); - // create alert dialog - showDialog( - context: context, - builder: (BuildContext context) { - return AlertDialog( - title: const Text('Tersimpan'), - content: const Text('Gambar telah disimpan di galeri'), - actions: [ - ElevatedButton( - child: const Text('OK'), - onPressed: () { - Navigator.of(context).pop(); - }, - ), - ], - ); - }, - ); - } + // if (stat == 'simpan') { + // // log('simpan'); + // await EasyLoading.show( + // status: 'Menyimpan Ke Galeri', + // maskType: EasyLoadingMaskType.black, + // ); + // await ImageGallerySaver.saveImage(Uint8List.fromList(pngBytes), + // quality: 100, name: args['nama']!.toString() + _uuid); + // await EasyLoading.dismiss(); + // // create alert dialog + // showDialog( + // context: context, + // builder: (BuildContext context) { + // return AlertDialog( + // title: const Text('Tersimpan'), + // content: const Text('Gambar telah disimpan di galeri'), + // actions: [ + // ElevatedButton( + // child: const Text('OK'), + // onPressed: () { + // Navigator.of(context).pop(); + // }, + // ), + // ], + // ); + // }, + // ); + // } return pngBytes; // } catch (e) { @@ -206,6 +234,7 @@ class _Mewarna1PageState extends State { // print(colorToHex(color)); setState(() { selectedColor = color.withOpacity(0.01); + // selectedColor = color.withOpacity(0.5); }); }, ), diff --git a/lib/pages/pilihKategori.dart b/lib/pages/pilihKategori.dart index 311826e..5c1dfda 100644 --- a/lib/pages/pilihKategori.dart +++ b/lib/pages/pilihKategori.dart @@ -16,7 +16,7 @@ class PilihKategori extends HookWidget { fit: StackFit.expand, children: [ Image.asset( - "assets/bg.jpg", + "assets/bg.png", fit: BoxFit.cover, color: Colors.black.withOpacity(0.2), colorBlendMode: BlendMode.darken, @@ -30,7 +30,7 @@ class PilihKategori extends HookWidget { //make the button same width SizedBox( // width is half of the screen width - width: MediaQuery.of(context).size.width / 3, + width: MediaQuery.of(context).size.width / 2.7, child: ElevatedButton( child: const Text('Binatang'), onPressed: () { @@ -46,7 +46,7 @@ class PilihKategori extends HookWidget { height: 15, ), SizedBox( - width: MediaQuery.of(context).size.width / 3, + width: MediaQuery.of(context).size.width / 2.7, child: ElevatedButton( child: const Text('Kenderaan'), onPressed: () { @@ -62,9 +62,12 @@ class PilihKategori extends HookWidget { height: 15, ), SizedBox( - width: MediaQuery.of(context).size.width / 3, + width: MediaQuery.of(context).size.width / 2.7, child: ElevatedButton( - child: const Text('Sayur-Sayuran'), + child: const Text( + 'Sayur-Sayuran', + textAlign: TextAlign.center, + ), onPressed: () { Navigator.pushNamed( context, @@ -78,7 +81,7 @@ class PilihKategori extends HookWidget { height: 15, ), SizedBox( - width: MediaQuery.of(context).size.width / 3, + width: MediaQuery.of(context).size.width / 2.7, child: ElevatedButton( child: const Text('Buah-Buahan'), onPressed: () { diff --git a/lib/pages/tentang1.dart b/lib/pages/tentang1.dart index 79a4cf7..840f8d5 100644 --- a/lib/pages/tentang1.dart +++ b/lib/pages/tentang1.dart @@ -49,7 +49,7 @@ class _Tentang1State extends State { fit: StackFit.expand, children: [ Image.asset( - "assets/bg.jpg", + "assets/bg.png", fit: BoxFit.cover, color: Colors.black.withOpacity(0.2), colorBlendMode: BlendMode.darken,