This commit is contained in:
Irwan Cahyono 2025-04-11 13:09:55 +07:00
parent b0d343e6fc
commit 6dbb7f4ca9
4 changed files with 55 additions and 54 deletions

View File

@ -1,11 +1,11 @@
import 'package:flutter/material.dart';
import 'package:freekake/components/bottom_navbar.dart';
import 'package:freekake/components/menu_button.dart';
import 'package:freekake/components/scan_button.dart';
import 'package:freekake/screen/Home_screen.dart';
import 'package:freekake/screen/koleksi_screen.dart';
import 'package:freekake/screen/pustaka_screen.dart';
import 'package:freekake/screen/saya/profile_screen.dart';
import 'package:furibase/components/bottom_navbar.dart';
import 'package:furibase/components/menu_button.dart';
import 'package:furibase/components/scan_button.dart';
import 'package:furibase/screen/Home_screen.dart';
import 'package:furibase/screen/koleksi_screen.dart';
import 'package:furibase/screen/pustaka_screen.dart';
import 'package:furibase/screen/saya/profile_screen.dart';
import 'package:freekake/providers/menu_selection_provider.dart';
import 'package:provider/provider.dart';
@ -51,7 +51,7 @@ class _MainMenuState extends State<MainMenu> {
children: [
MenuButton(
label: "E-furibuddy",
icon: 'assets/assets/icons/furrybuddy.svg',
icon: 'icons/furrybuddy.svg',
onPress:
() => {
Navigator.push(
@ -62,7 +62,7 @@ class _MainMenuState extends State<MainMenu> {
),
MenuButton(
label: "Koleksi",
icon: 'assets/assets/icons/Koleksi.svg',
icon: 'icons/koleksi.svg',
onPress:
() => {
Navigator.push(
@ -74,15 +74,25 @@ class _MainMenuState extends State<MainMenu> {
SizedBox(width: 100),
MenuButton(
label: "Pustaka",
icon: 'assets/icons/Pustaka.svg',
onPress: () => _onItemTapped(context, 2),
isSelected: selectedIndex == 2,
icon: 'icons/Pustaka.svg',
onPress:
() => {
Navigator.push(
context,
MaterialPageRoute(builder: (context) => PustakaScreen()),
),
},
),
MenuButton(
label: "Saya",
icon: 'assets/icons/Saya.svg',
onPress: () => _onItemTapped(context, 3),
isSelected: selectedIndex == 3,
icon: 'icons/Saya.svg',
onPress:
() => {
Navigator.push(
context,
MaterialPageRoute(builder: (context) => ProfileScreen()),
),
},
),
],
),

View File

@ -7,9 +7,8 @@ class ScanButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Container(
width: 76,
height: 76,
return Expanded(
child: Container(
decoration: BoxDecoration(
shape: BoxShape.circle,
color: const Color.fromARGB(223, 67, 63, 179),
@ -27,6 +26,7 @@ class ScanButton extends StatelessWidget {
),
onPressed: () {},
),
),
);
}
}

View File

@ -1,5 +1,4 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:furibase/components/navbar_container.dart';
import 'package:furibase/providers/character_provider.dart';

View File

@ -7,6 +7,14 @@ import 'package:freekake/components/scan_button.dart';
import 'package:freekake/components/topbar_container.dart';
import 'package:freekake/helpers/color_helper.dart';
import 'package:freekake/screen/pustaka/list_education.dart';
import 'package:freekake/components/bottom_navbar.dart';
import 'package:freekake/components/buildcard_info.dart';
import 'package:freekake/components/collection_container.dart';
import 'package:freekake/components/main_menu.dart';
import 'package:freekake/components/scan_button.dart';
import 'package:freekake/components/topbar_container.dart';
import 'package:freekake/helpers/color_helper.dart';
import 'package:freekake/screen/pustaka/list_education.dart';
class PustakaScreen extends StatefulWidget {
const PustakaScreen({super.key});
@ -22,26 +30,10 @@ class _PustakaScreenState extends State<PustakaScreen> {
String _searchQuery = "";
final List<Map<String, dynamic>> _collections = [
{
"label": "Kesehatan",
"image": "assets/icons/healthy.svg",
"color": "#cdd0ee",
},
{
"label": "Gizi",
"image": "assets/icons/Nutrition.svg",
"color": "#e8e29a",
},
{
"label": "Pendidikan",
"image": "assets/icons/Education.svg",
"color": "#efd8c6",
},
{
"label": "Keselamatan",
"image": "assets/icons/Safety.svg",
"color": "#cef1da",
},
{"label": "Kesehatan", "image": "assets/icons/healthy.svg", "color": "#cdd0ee"},
{"label": "Gizi", "image": "assets/icons/Nutrition.svg", "color": "#e8e29a"},
{"label": "Pendidikan", "image": "assets/icons/Education.svg", "color": "#efd8c6"},
{"label": "Keselamatan", "image": "assets/icons/Safety.svg", "color": "#cef1da"},
];
void _onMenuTapped(int index) {