diff --git a/Frontend/lib/mih_packages/about_mih/app_tools/mih_info.dart b/Frontend/lib/mih_packages/about_mih/app_tools/mih_info.dart index 6eb89b5b..e919d4d0 100644 --- a/Frontend/lib/mih_packages/about_mih/app_tools/mih_info.dart +++ b/Frontend/lib/mih_packages/about_mih/app_tools/mih_info.dart @@ -572,118 +572,113 @@ class _MihInfoState extends State { @override Widget build(BuildContext context) { return MihAppToolBody( - borderOn: false, + borderOn: true, bodyItem: getBody(), ); } Widget getBody() { return MihSingleChildScroll( - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 10.0), - child: Column( - children: [ - SizedBox( - width: 165, - child: Image( - image: MzanziInnovationHub.of(context)!.theme.altLogoImage()), + child: Column( + children: [ + SizedBox( + width: 165, + child: Image( + image: MzanziInnovationHub.of(context)!.theme.altLogoImage()), + ), + const SizedBox( + height: 10, + ), + const Text( + "Mzansi Innovation Hub", + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 30, ), - const SizedBox( - height: 10, - ), - const Text( - "Mzansi Innovation Hub", - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 30, - ), - ), - const Padding( - padding: EdgeInsets.symmetric(vertical: 10.0), - child: Divider(), - ), - // const SizedBox( - // height: 10, - // ), - Wrap( + ), + const Padding( + padding: EdgeInsets.symmetric(vertical: 10.0), + child: Divider(), + ), + // const SizedBox( + // height: 10, + // ), + Wrap( + alignment: WrapAlignment.start, + crossAxisAlignment: WrapCrossAlignment.start, + spacing: 10, + runSpacing: 10, + children: [ + ourVision(), + ourMission(), + ], + ), + const SizedBox( + height: 10, + ), + Wrap( alignment: WrapAlignment.start, crossAxisAlignment: WrapCrossAlignment.start, spacing: 10, runSpacing: 10, children: [ - ourVision(), - ourMission(), - ], - ), - const SizedBox( - height: 10, - ), - Wrap( - alignment: WrapAlignment.start, - crossAxisAlignment: WrapCrossAlignment.start, - spacing: 10, - runSpacing: 10, - children: [ - SizedBox( - width: 300, - height: 50, - child: MIHButton( - onTap: () { - installMihTrigger(); - }, - buttonText: getInstallButtonText(), - buttonColor: MzanziInnovationHub.of(context)! - .theme - .secondaryColor(), - textColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), - ), + SizedBox( + width: 300, + height: 50, + child: MIHButton( + onTap: () { + installMihTrigger(); + }, + buttonText: getInstallButtonText(), + buttonColor: + MzanziInnovationHub.of(context)!.theme.secondaryColor(), + textColor: + MzanziInnovationHub.of(context)!.theme.primaryColor(), ), - SizedBox( - width: 300, - height: 50, - child: MIHButton( - onTap: () { - launchSocialUrl( - Uri.parse( - "https://www.youtube.com/playlist?list=PLuT35kJIui0H5kXjxNOZlHoOPZbQLr4qh", - ), - ); - }, - buttonText: "MIH Beginners Guide", - buttonColor: MzanziInnovationHub.of(context)! - .theme - .secondaryColor(), - textColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), - ), + ), + SizedBox( + width: 300, + height: 50, + child: MIHButton( + onTap: () { + launchSocialUrl( + Uri.parse( + "https://www.youtube.com/playlist?list=PLuT35kJIui0H5kXjxNOZlHoOPZbQLr4qh", + ), + ); + }, + buttonText: "MIH Beginners Guide", + buttonColor: + MzanziInnovationHub.of(context)!.theme.secondaryColor(), + textColor: + MzanziInnovationHub.of(context)!.theme.primaryColor(), ), - ]), - const SizedBox( - height: 10, - ), - const Padding( - padding: EdgeInsets.symmetric(vertical: 10.0), - child: Divider(), - ), - Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisSize: MainAxisSize.max, - // spacing: 10, - // runSpacing: 10, - children: [ - founderTitle(), - founderBio(), - ], - ), - const Padding( - padding: EdgeInsets.symmetric(vertical: 10.0), - child: Divider(), - ), - mihSocials(), - ], - ), + ), + ]), + const SizedBox( + height: 10, + ), + const Padding( + padding: EdgeInsets.symmetric(vertical: 10.0), + child: Divider(), + ), + Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisSize: MainAxisSize.max, + // spacing: 10, + // runSpacing: 10, + children: [ + founderTitle(), + founderBio(), + ], + ), + const Padding( + padding: EdgeInsets.symmetric(vertical: 10.0), + child: Divider(), + ), + mihSocials(), + ], ), ); } diff --git a/Frontend/lib/mih_packages/about_mih/app_tools/mih_privacy_policy.dart b/Frontend/lib/mih_packages/about_mih/app_tools/mih_privacy_policy.dart index b6d53a6c..c00f1385 100644 --- a/Frontend/lib/mih_packages/about_mih/app_tools/mih_privacy_policy.dart +++ b/Frontend/lib/mih_packages/about_mih/app_tools/mih_privacy_policy.dart @@ -9,18 +9,15 @@ class MihPrivacyPolicy extends StatelessWidget { @override Widget build(BuildContext context) { return MihAppToolBody( - borderOn: false, + borderOn: true, bodyItem: getBody(context), ); } Widget getBody(BuildContext context) { return MihSingleChildScroll( - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 10.0), - child: Column( - children: PolicyAndTermsText().getPrivacyPolicyText(context), - ), + child: Column( + children: PolicyAndTermsText().getPrivacyPolicyText(context), ), ); } diff --git a/Frontend/lib/mih_packages/about_mih/app_tools/mih_terms_of_service.dart b/Frontend/lib/mih_packages/about_mih/app_tools/mih_terms_of_service.dart index e6ed6f71..0b816977 100644 --- a/Frontend/lib/mih_packages/about_mih/app_tools/mih_terms_of_service.dart +++ b/Frontend/lib/mih_packages/about_mih/app_tools/mih_terms_of_service.dart @@ -9,18 +9,15 @@ class MIHTermsOfService extends StatelessWidget { @override Widget build(BuildContext context) { return MihAppToolBody( - borderOn: false, + borderOn: true, bodyItem: getBody(context), ); } Widget getBody(BuildContext context) { return MihSingleChildScroll( - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 10.0), - child: Column( - children: PolicyAndTermsText().getTermsOfServiceText(context), - ), + child: Column( + children: PolicyAndTermsText().getTermsOfServiceText(context), ), ); } diff --git a/Frontend/pubspec.lock b/Frontend/pubspec.lock index 8294055c..e35c45df 100644 --- a/Frontend/pubspec.lock +++ b/Frontend/pubspec.lock @@ -173,10 +173,10 @@ packages: dependency: transitive description: name: built_value - sha256: "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2" + sha256: ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4 url: "https://pub.dev" source: hosted - version: "8.9.3" + version: "8.9.5" characters: dependency: transitive description: @@ -285,10 +285,10 @@ packages: dependency: transitive description: name: device_info_plus - sha256: "72d146c6d7098689ff5c5f66bcf593ac11efc530095385356e131070333e64da" + sha256: "306b78788d1bb569edb7c55d622953c2414ca12445b41c9117963e03afc5c513" url: "https://pub.dev" source: hosted - version: "11.3.0" + version: "11.3.3" device_info_plus_platform_interface: dependency: transitive description: @@ -317,10 +317,10 @@ packages: dependency: transitive description: name: dio_web_adapter - sha256: e485c7a39ff2b384fa1d7e09b4e25f755804de8384358049124830b04fc4f93a + sha256: "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" equatable: dependency: transitive description: @@ -357,10 +357,10 @@ packages: dependency: transitive description: name: ffi - sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" + sha256: "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418" url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.1.4" file: dependency: transitive description: @@ -373,10 +373,10 @@ packages: dependency: "direct main" description: name: file_picker - sha256: "6f6bfa8797f296965bdc3e1f702574ab49a540c19b9237b401e7c2b25dfe594c" + sha256: "8d938fd5c11dc81bf1acd4f7f0486c683fe9e79a0b13419e27730f9ce4d8a25b" url: "https://pub.dev" source: hosted - version: "9.0.0" + version: "9.2.1" fixnum: dependency: transitive description: @@ -466,10 +466,10 @@ packages: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e" + sha256: "5a1e6fb2c0561958d7e4c33574674bda7b77caaca7a33b758876956f2902eea3" url: "https://pub.dev" source: hosted - version: "2.0.24" + version: "2.0.27" flutter_swipe_detector: dependency: "direct main" description: @@ -524,58 +524,58 @@ packages: dependency: "direct main" description: name: geolocator - sha256: d2ec66329cab29cb297d51d96c067d457ca519dca8589665fa0b82ebacb7dbe4 + sha256: afebc912cbe6496e8823e064ca519afb5610072bb9c4a9feea715f6feb4f7f28 url: "https://pub.dev" source: hosted - version: "13.0.2" + version: "13.0.3" geolocator_android: dependency: transitive description: name: geolocator_android - sha256: "7aefc530db47d90d0580b552df3242440a10fe60814496a979aa67aa98b1fd47" + sha256: fcb1760a50d7500deca37c9a666785c047139b5f9ee15aa5469fae7dbbe3170d url: "https://pub.dev" source: hosted - version: "4.6.1" + version: "4.6.2" geolocator_apple: dependency: transitive description: name: geolocator_apple - sha256: c4ecead17985ede9634f21500072edfcb3dba0ef7b97f8d7bc556d2d722b3ba3 + sha256: dbdd8789d5aaf14cf69f74d4925ad1336b4433a6efdf2fce91e8955dc921bf22 url: "https://pub.dev" source: hosted - version: "2.3.9" + version: "2.3.13" geolocator_platform_interface: dependency: transitive description: name: geolocator_platform_interface - sha256: "386ce3d9cce47838355000070b1d0b13efb5bc430f8ecda7e9238c8409ace012" + sha256: "30cb64f0b9adcc0fb36f628b4ebf4f731a2961a0ebd849f4b56200205056fe67" url: "https://pub.dev" source: hosted - version: "4.2.4" + version: "4.2.6" geolocator_web: dependency: transitive description: name: geolocator_web - sha256: "2ed69328e05cd94e7eb48bb0535f5fc0c0c44d1c4fa1e9737267484d05c29b5e" + sha256: e54434b2ce9c677759a188d7e32e950802f79a9e9f45728239404bece0f1bd8d url: "https://pub.dev" source: hosted - version: "4.1.1" + version: "4.1.2" geolocator_windows: dependency: transitive description: name: geolocator_windows - sha256: "53da08937d07c24b0d9952eb57a3b474e29aae2abf9dd717f7e1230995f13f0e" + sha256: "4862e798b8a84ec300531888e7acd137b74637636069df230d79fabd110e2734" url: "https://pub.dev" source: hosted - version: "0.2.3" + version: "0.2.4" gif_view: dependency: "direct main" description: name: gif_view - sha256: d2441d98bcd56b3fd00e869513aeaefa56849ab62f63675e7d55f5fa4517f27e + sha256: "7665fe9ba03ffcad823c13564baed36513143403dc9b68f89adc9f8d7cbdb384" url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.0.1" glob: dependency: transitive description: @@ -724,10 +724,10 @@ packages: dependency: transitive description: name: local_auth_android - sha256: "6763aaf8965f21822624cb2fd3c03d2a8b3791037b5efb0fe4b13e110f5afc92" + sha256: "0abe4e72f55c785b28900de52a2522c86baba0988838b5dc22241b072ecccd74" url: "https://pub.dev" source: hosted - version: "1.0.46" + version: "1.0.48" local_auth_darwin: dependency: transitive description: @@ -780,10 +780,10 @@ packages: dependency: "direct main" description: name: math_expressions - sha256: e32d803d758ace61cc6c4bdfed1226ff60a6a23646b35685670d28b5616139f8 + sha256: "218dc65bed4726562bb31c53d8daa3cc824664b26fb72d77bc592757edf74ba0" url: "https://pub.dev" source: hosted - version: "2.6.0" + version: "2.7.0" meta: dependency: transitive description: @@ -804,10 +804,10 @@ packages: dependency: "direct main" description: name: mobile_scanner - sha256: "91d28b825784e15572fdc39165c5733099ce0e69c6f6f0964ebdbf98a62130fd" + sha256: "9cb9e371ee9b5b548714f9ab5fd33b530d799745c83d5729ecd1e8ab2935dbd1" url: "https://pub.dev" source: hosted - version: "6.0.6" + version: "6.0.7" mutex: dependency: transitive description: @@ -844,10 +844,10 @@ packages: dependency: transitive description: name: package_config - sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67" + sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.2.0" path: dependency: transitive description: @@ -908,10 +908,10 @@ packages: dependency: transitive description: name: petitparser - sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 + sha256: "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646" url: "https://pub.dev" source: hosted - version: "6.0.2" + version: "6.1.0" photo_view: dependency: transitive description: @@ -964,10 +964,10 @@ packages: dependency: transitive description: name: pub_semver - sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd" + sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585" url: "https://pub.dev" source: hosted - version: "2.1.5" + version: "2.2.0" pubspec_parse: dependency: transitive description: @@ -1012,10 +1012,10 @@ packages: dependency: transitive description: name: shared_preferences_android - sha256: a768fc8ede5f0c8e6150476e14f38e2417c0864ca36bb4582be8e21925a03c22 + sha256: "3ec7210872c4ba945e3244982918e502fa2bfb5230dff6832459ca0e1879b7ad" url: "https://pub.dev" source: hosted - version: "2.4.6" + version: "2.4.8" shared_preferences_foundation: dependency: transitive description: @@ -1153,66 +1153,66 @@ packages: dependency: "direct main" description: name: syncfusion_flutter_core - sha256: "634adbc5c7d41e31513e9e3d60213bbc6aedff6e90ddb23b6495bfc0a23a260e" + sha256: f1d2b52697543e13bdefdc62d15868124a265987577f53224a7dbe176c8448f0 url: "https://pub.dev" source: hosted - version: "28.2.6" + version: "28.2.12" syncfusion_flutter_pdf: dependency: transitive description: name: syncfusion_flutter_pdf - sha256: "8abac029cfda7f0b228bcc69d3a08a292753536a5e1a0bf26842bf220facc95f" + sha256: f5e02ac4264bc69eeffa3ec54c9c0ad6e8a9f9161b105451b4a83dd1a317eaf9 url: "https://pub.dev" source: hosted - version: "28.2.6" + version: "28.2.12" syncfusion_flutter_pdfviewer: dependency: "direct main" description: name: syncfusion_flutter_pdfviewer - sha256: "4c30ffa01620a1e758215597d975b15c11192d0839fd4d8c681573281eca197c" + sha256: "95e678444ff9571c4d33b8443037cdcc9e34faf1c53af7724043266b2d2df5df" url: "https://pub.dev" source: hosted - version: "28.2.6" + version: "28.2.12" syncfusion_flutter_signaturepad: dependency: transitive description: name: syncfusion_flutter_signaturepad - sha256: "83a591601111fe48557778db25f7173731db03d68b8dc9fec957fc6f2caa1fe6" + sha256: "30de4c9f77d1b75850697262bf9ce30b46a8d4401cec91dae95c4ee4e589d857" url: "https://pub.dev" source: hosted - version: "28.2.6" + version: "28.2.12" syncfusion_pdfviewer_macos: dependency: transitive description: name: syncfusion_pdfviewer_macos - sha256: "90b34cca5502b6178cd00df35d77940509bb425d0d579878056f9272ca313b88" + sha256: c76af8dc3e8df38be3f5d7a78f4bae5ff9f5d73706da997d8428e087af418102 url: "https://pub.dev" source: hosted - version: "28.2.6" + version: "28.2.12" syncfusion_pdfviewer_platform_interface: dependency: transitive description: name: syncfusion_pdfviewer_platform_interface - sha256: c1c45a6d744fe0a9b457579129bbfd4984a87e004f3ed6a88da56e1163a3ac6f + sha256: a9c102d1edd68fbe449e37021f5b82a8e32339023112807a828fb4e585e077cc url: "https://pub.dev" source: hosted - version: "28.2.6" + version: "28.2.12" syncfusion_pdfviewer_web: dependency: transitive description: name: syncfusion_pdfviewer_web - sha256: e580bd7398c6680794832a496948dc92a8db1acbbc60b26956884625ce85c08e + sha256: "6f2bf5c385e003e8f7312c445240c8648045400de9d7050df9d9a4b191c02568" url: "https://pub.dev" source: hosted - version: "28.2.6" + version: "28.2.12" syncfusion_pdfviewer_windows: dependency: transitive description: name: syncfusion_pdfviewer_windows - sha256: ef9482bfd10be1b0321034984b4daad7a8a6be8b34b3b384eb7d067e25547a19 + sha256: cf638a7d64bdd4120a8e27d944cb966a05a409ee3d0c24fa63e83341a535d6fb url: "https://pub.dev" source: hosted - version: "28.2.6" + version: "28.2.12" table_calendar: dependency: "direct main" description: @@ -1289,10 +1289,10 @@ packages: dependency: transitive description: name: url_launcher_android - sha256: "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193" + sha256: "1d0eae19bd7606ef60fe69ef3b312a437a16549476c42321d5dc1506c9ca3bf4" url: "https://pub.dev" source: hosted - version: "6.3.14" + version: "6.3.15" url_launcher_ios: dependency: transitive description: @@ -1385,10 +1385,10 @@ packages: dependency: transitive description: name: web - sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb + sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" web_socket: dependency: transitive description: @@ -1417,10 +1417,10 @@ packages: dependency: transitive description: name: webview_flutter_android - sha256: "512c26ccc5b8a571fd5d13ec994b7509f142ff6faf85835e243dde3538fdc713" + sha256: e09150b28a07933839adef0e4a088bb43e8c8d9e6b93025b01882d4067a58ab0 url: "https://pub.dev" source: hosted - version: "4.3.2" + version: "4.3.4" webview_flutter_platform_interface: dependency: transitive description: @@ -1433,26 +1433,26 @@ packages: dependency: transitive description: name: webview_flutter_wkwebview - sha256: "7310de7efa4e6df8b3d2ff14aef3f290bc00b43363f2d0028845e6de46507fc9" + sha256: c49a98510080378b1525132f407a92c3dcd3b7145bef04fb8137724aadcf1cf0 url: "https://pub.dev" source: hosted - version: "3.18.1" + version: "3.18.4" win32: dependency: transitive description: name: win32 - sha256: daf97c9d80197ed7b619040e86c8ab9a9dad285e7671ee7390f9180cc828a51e + sha256: dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f url: "https://pub.dev" source: hosted - version: "5.10.1" + version: "5.12.0" win32_registry: dependency: transitive description: name: win32_registry - sha256: "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852" + sha256: "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae" url: "https://pub.dev" source: hosted - version: "1.1.5" + version: "2.1.0" xdg_directories: dependency: transitive description: @@ -1494,5 +1494,5 @@ packages: source: hosted version: "3.1.1" sdks: - dart: ">=3.7.0-0 <3.9.0" + dart: ">=3.7.0 <3.9.0" flutter: ">=3.27.0"