diff --git a/lib/components/main_menu.dart b/lib/components/main_menu.dart index 9ceb644..1b1a2f3 100644 --- a/lib/components/main_menu.dart +++ b/lib/components/main_menu.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.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:furibase/providers/menu_selection_provider.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:freekake/providers/menu_selection_provider.dart'; import 'package:provider/provider.dart'; class MainMenu extends StatefulWidget { diff --git a/lib/main.dart b/lib/main.dart index eed7195..9015439 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,10 +1,11 @@ import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; + import 'package:furibase/components/navbar_container.dart'; import 'package:furibase/providers/character_provider.dart'; -import 'package:furibase/providers/menu_selection_provider.dart'; import 'package:furibase/screen/Home_screen.dart'; +import 'package:furibase/screen/drraw_screen.dart'; import 'package:provider/provider.dart'; +import 'package:furibase/providers/menu_selection_provider.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); diff --git a/lib/screen/Home_screen.dart b/lib/screen/Home_screen.dart index 4b51d79..2adc43d 100644 --- a/lib/screen/Home_screen.dart +++ b/lib/screen/Home_screen.dart @@ -83,16 +83,21 @@ class _HomeScreenState extends State { body: Stack( children: [ Positioned.fill( - child: RepaintBoundary( - child: Container( - decoration: const BoxDecoration( - image: const DecorationImage( - image: AssetImage("assets/images/background.jpeg"), - fit: BoxFit.cover, - ), - ), - ), + child: UnityWidget( + onUnityCreated: onUnityCreated, + //isARScene: true, + onUnityMessage: onUnityMessage, + //onUnitySceneLoaded: onUnitySceneLoaded, + fullscreen: false, ), + // child: Container( + // decoration: BoxDecoration( + // image: DecorationImage( + // image: AssetImage("assets/images/background.jpeg"), + // fit: BoxFit.cover, + // ), + // ), + // ), ), // Positioned( // top: 0, @@ -205,39 +210,40 @@ class _HomeScreenState extends State { ], ), ), - Positioned( - bottom: 150, - left: 0, - right: 0, - child: Column( - children: [ - Container( - padding: EdgeInsets.symmetric(horizontal: 20, vertical: 10), - decoration: BoxDecoration( - color: Color.fromARGB(255, 247, 224, 236), - borderRadius: BorderRadius.circular(10), - boxShadow: [ - BoxShadow( - color: Color.fromARGB(255, 214, 213, 121), - blurRadius: 5, - spreadRadius: 2, - ), - ], - ), - child: Text( - "Halo....Jotaslim", - style: TextStyle( - fontSize: 12, - fontWeight: FontWeight.bold, - color: Color(0xFF000000), - ), - ), - ), - SizedBox(height: 10), - setHomeImage("assets/images/luffy.png", 300), - ], - ), - ), + // Positioned( + // bottom: 150, + // left: 0, + // right: 0, + // child: Column( + // children: [ + // Container( + // padding: EdgeInsets.symmetric(horizontal: 20, vertical: 10), + // decoration: BoxDecoration( + // color: Color.fromARGB(255, 247, 224, 236), + // borderRadius: BorderRadius.circular(10), + // boxShadow: [ + // BoxShadow( + // color: Color.fromARGB(255, 214, 213, 121), + // blurRadius: 5, + // spreadRadius: 2, + // ), + // ], + // ), + // child: Text( + // "Halo....Jotaslim", + // style: TextStyle( + // fontSize: 12, + // fontWeight: FontWeight.bold, + // color: Color(0xFF000000), + // ), + // ), + // ), + // SizedBox(height: 10), + // setHomeImage("images/luffy.png", 300), + // // Image.asset("images/luffy.png", width: 300), + // ], + // ), + // ), // BG MEnu Stack( children: [ diff --git a/lib/screen/pustaka_screen.dart b/lib/screen/pustaka_screen.dart index 3a725a3..1dca6a6 100644 --- a/lib/screen/pustaka_screen.dart +++ b/lib/screen/pustaka_screen.dart @@ -200,21 +200,21 @@ class _PustakaScreenState extends State { ), ), ), - // SizedBox( - // child: Padding( - // padding: const EdgeInsets.symmetric( - // horizontal: 5, - // vertical: 1, - // ), - // child: Column( - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // Text("List Topic", style: TextStyle(color: Colors.black)), - // Divider(color: Colors.transparent), - // ], - // ), - // ), - // ), + SizedBox( + child: Padding( + padding: const EdgeInsets.symmetric( + horizontal: 40, + vertical: 1, + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text("Daftar Topik", style: TextStyle(color: Colors.black)), + Divider(color: Colors.transparent), + ], + ), + ), + ), // Horizontal Scroll List Padding( padding: EdgeInsets.symmetric(horizontal: 5, vertical: 5),