diff --git a/IFU-Hybrid/ios/Runner.xcodeproj/project.pbxproj b/IFU-Hybrid/ios/Runner.xcodeproj/project.pbxproj index 62408cd..abea1bb 100644 --- a/IFU-Hybrid/ios/Runner.xcodeproj/project.pbxproj +++ b/IFU-Hybrid/ios/Runner.xcodeproj/project.pbxproj @@ -215,7 +215,7 @@ isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = YES; - LastUpgradeCheck = 1430; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 331C8080294A63A400263BE5 = { diff --git a/IFU-Hybrid/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/IFU-Hybrid/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 87131a0..8e3ca5d 100644 --- a/IFU-Hybrid/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/IFU-Hybrid/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ { late final WebViewController _controller; + final String webUrl = dotenv.env['CONCEPT_WEB_URL']!; @override void initState() { super.initState(); _controller = WebViewController() ..loadRequest( - Uri.parse('https://65d0b72c8f9229857aabbd6b--chic-pudding-3bbe86.netlify.app/'), + Uri.parse(webUrl), ); } diff --git a/IFU-Hybrid/lib/views/solving/solution_screen.dart b/IFU-Hybrid/lib/views/solving/solution_screen.dart index 29d2a5d..a4aa605 100644 --- a/IFU-Hybrid/lib/views/solving/solution_screen.dart +++ b/IFU-Hybrid/lib/views/solving/solution_screen.dart @@ -19,23 +19,8 @@ class SolutionScreen extends BaseScreen { } else if (controller.currentQuestion != null) { return Column( children: [ - const Expanded( - child: Center( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - 'A.', - style: TextStyle( - fontSize: 24, - fontWeight: FontWeight.bold, - color: Colors.black, - ), - ), - SizedBox(height: 30), - ], - ), - ), + SizedBox( + height: MediaQuery.of(context).size.height * 0.3, ), Padding( padding: const EdgeInsets.symmetric(horizontal: 20.0), @@ -45,7 +30,7 @@ class SolutionScreen extends BaseScreen { child: Align( alignment: Alignment.bottomCenter, child: Container( - padding: const EdgeInsets.fromLTRB(20, 20, 20, 140), + padding: const EdgeInsets.fromLTRB(20, 20, 20, 175), child: TextButton( style: TextButton.styleFrom( padding: const EdgeInsets.symmetric( @@ -65,7 +50,7 @@ class SolutionScreen extends BaseScreen { 'Complete', style: TextStyle( color: Color(0xFF2B90D9), - fontSize: 24, + fontSize: 16, fontWeight: FontWeight.bold), ), ), diff --git a/IFU-Hybrid/lib/views/solving/solving_entry_screen.dart b/IFU-Hybrid/lib/views/solving/solving_entry_screen.dart index 6ccb065..9a2de87 100644 --- a/IFU-Hybrid/lib/views/solving/solving_entry_screen.dart +++ b/IFU-Hybrid/lib/views/solving/solving_entry_screen.dart @@ -50,7 +50,7 @@ class SolvingEntryScreen extends BaseScreen { 'Solving', style: TextStyle( color: Color(0xFF2B90D9), - fontSize: 24, + fontSize: 16, fontWeight: FontWeight.bold), ), ), diff --git a/IFU-Hybrid/lib/views/solving/solving_screen.dart b/IFU-Hybrid/lib/views/solving/solving_screen.dart index 927dac6..f50588b 100644 --- a/IFU-Hybrid/lib/views/solving/solving_screen.dart +++ b/IFU-Hybrid/lib/views/solving/solving_screen.dart @@ -20,23 +20,8 @@ class SolvingScreen extends BaseScreen { } else if (controller.currentQuestion != null) { return Column( children: [ - const Expanded( - child: Center( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - 'Q.', - style: TextStyle( - fontSize: 24, - fontWeight: FontWeight.bold, - color: Colors.black, - ), - ), - SizedBox(height: 30), - ], - ), - ), + SizedBox( + height: MediaQuery.of(context).size.height * 0.3, ), Padding( padding: const EdgeInsets.symmetric(horizontal: 20.0), @@ -46,7 +31,7 @@ class SolvingScreen extends BaseScreen { child: Align( alignment: Alignment.bottomCenter, child: Container( - margin: const EdgeInsets.fromLTRB(20, 20, 20, 140), + margin: const EdgeInsets.fromLTRB(20, 20, 20, 175), child: TextButton( style: TextButton.styleFrom( padding: const EdgeInsets.symmetric( @@ -63,7 +48,7 @@ class SolvingScreen extends BaseScreen { 'Solution', style: TextStyle( color: Color(0xFF2B90D9), - fontSize: 24, + fontSize: 16, fontWeight: FontWeight.bold), ), ),