diff --git a/lib/components/scan_button.dart b/lib/components/scan_button.dart index 075b425..0580f19 100644 --- a/lib/components/scan_button.dart +++ b/lib/components/scan_button.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; -import 'package:furibase/screen/camera_screen.dart'; +import 'package:freekake/screen/camera_screen.dart'; class ScanButton extends StatelessWidget { const ScanButton({super.key}); @@ -44,4 +44,4 @@ class ScanButton extends StatelessWidget { ), ); } -} +} \ No newline at end of file diff --git a/lib/main.dart b/lib/main.dart index 9b89bff..4a6af0a 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:freekake/components/navbar_container.dart'; import 'package:freekake/providers/character_provider.dart'; +import 'package:freekake/providers/menu_selection_provider.dart'; import 'package:freekake/screen/Home_screen.dart'; -import 'package:freekake/screen/drraw_screen.dart'; import 'package:provider/provider.dart'; import 'package:furibase/providers/menu_selection_provider.dart'; @@ -31,7 +31,7 @@ class MyApp extends StatelessWidget { ], child: MaterialApp( debugShowCheckedModeBanner: false, - title: 'AR Character App', + title: 'Freekake', theme: ThemeData.dark(), home: // DrawScreen(), diff --git a/lib/screen/Home_screen.dart b/lib/screen/Home_screen.dart index 2adc43d..d03de02 100644 --- a/lib/screen/Home_screen.dart +++ b/lib/screen/Home_screen.dart @@ -4,7 +4,6 @@ import 'package:freekake/components/bottom_navbar.dart'; import 'package:freekake/components/buildcard_info.dart'; import 'package:freekake/components/main_menu.dart'; import 'package:freekake/components/scan_button.dart'; -import 'package:freekake/components/topbar_container.dart'; import 'package:flutter_unity_widget/flutter_unity_widget.dart'; class HomeScreen extends StatefulWidget { @@ -105,89 +104,89 @@ class _HomeScreenState extends State { // right: 0, // child: SizedBox(height: 120, child: TopbarContainer()), // ), - Positioned( - right: 0, - top: 100, - child: Padding( - padding: EdgeInsets.only(right: 20), - child: Container( - width: 40, - height: 40, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(1), - color: Color.fromARGB(1, 209, 174, 174).withAlpha(0), - ), - child: Center( - child: DropdownButtonHideUnderline( - child: DropdownButton2( - customButton: Container( - height: 50, - width: 50, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(10), - image: const DecorationImage( - image: AssetImage('assets/images/luffy-u.png'), - fit: BoxFit.cover, - ), - ), - ), - openWithLongPress: false, - items: [ - ..._MenuItems.firstItems.map( - (item) => DropdownMenuItem<_MenuItem>( - value: item, - child: _MenuItems.buildItem(item), - ), - ), - // const DropdownMenuItem( - // enabled: false, - // // height: 8, - // child: Divider(), - // ), - // ..._MenuItems.secondItems.map( - // (item) => DropdownMenuItem<_MenuItem>( - // value: item, - // // height: 48, - // child: _MenuItems.buildItem(item), - // ), - // ), - ], - onChanged: (value) { - if (value != null) { - _MenuItems.onChanged(context, value); - } else { - print("null"); - } - }, - buttonStyleData: ButtonStyleData( - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(40), - ), - ), - dropdownStyleData: DropdownStyleData( - width: 140, - padding: EdgeInsets.zero, - maxHeight: 150, - // padding: const EdgeInsets.symmetric(vertical: 6), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(4), - color: Color.fromRGBO(2, 104, 17, 1).withAlpha(50), - ), - offset: const Offset(40, -4), - ), - menuItemStyleData: MenuItemStyleData( - height: 35, - padding: EdgeInsets.symmetric(horizontal: 10), - ), - // menuItemStyleData: const MenuItemStyleData( - // padding: EdgeInsets.only(left: 16, right: 16), - // ), - ), - ), - ), - ), - ), - ), + // Positioned( + // right: 0, + // top: 100, + // child: Padding( + // padding: EdgeInsets.only(right: 20), + // child: Container( + // width: 40, + // height: 40, + // decoration: BoxDecoration( + // borderRadius: BorderRadius.circular(1), + // color: Color.fromARGB(1, 209, 174, 174).withAlpha(0), + // ), + // child: Center( + // child: DropdownButtonHideUnderline( + // child: DropdownButton2( + // customButton: Container( + // height: 50, + // width: 50, + // decoration: BoxDecoration( + // borderRadius: BorderRadius.circular(10), + // image: const DecorationImage( + // image: AssetImage('assets/images/luffy-u.png'), + // fit: BoxFit.cover, + // ), + // ), + // ), + // openWithLongPress: false, + // items: [ + // ..._MenuItems.firstItems.map( + // (item) => DropdownMenuItem<_MenuItem>( + // value: item, + // child: _MenuItems.buildItem(item), + // ), + // ), + // // const DropdownMenuItem( + // // enabled: false, + // // // height: 8, + // // child: Divider(), + // // ), + // // ..._MenuItems.secondItems.map( + // // (item) => DropdownMenuItem<_MenuItem>( + // // value: item, + // // // height: 48, + // // child: _MenuItems.buildItem(item), + // // ), + // // ), + // ], + // onChanged: (value) { + // if (value != null) { + // _MenuItems.onChanged(context, value); + // } else { + // print("null"); + // } + // }, + // buttonStyleData: ButtonStyleData( + // decoration: BoxDecoration( + // borderRadius: BorderRadius.circular(40), + // ), + // ), + // dropdownStyleData: DropdownStyleData( + // width: 140, + // padding: EdgeInsets.zero, + // maxHeight: 150, + // // padding: const EdgeInsets.symmetric(vertical: 6), + // decoration: BoxDecoration( + // borderRadius: BorderRadius.circular(4), + // color: Color.fromRGBO(2, 104, 17, 1).withAlpha(50), + // ), + // offset: const Offset(40, -4), + // ), + // menuItemStyleData: MenuItemStyleData( + // height: 35, + // padding: EdgeInsets.symmetric(horizontal: 10), + // ), + // // menuItemStyleData: const MenuItemStyleData( + // // padding: EdgeInsets.only(left: 16, right: 16), + // // ), + // ), + // ), + // ), + // ), + // ), + // ), Positioned( top: 10, left: 10,