Merge pull request #104 from Astra-Labs/Amanda

## 0.0.23
Astra-Labs · Dec 5, 2023 · 9f9f78a · 9f9f78a
2 parents bb662ec + 33721b1
commit 9f9f78a
Show file tree

Hide file tree

Showing 28 changed files with 376 additions and 100 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Example App/lib/src/Core/Interactions/Actions/ActionsSubview.dart b/Example App/lib/src/Core/Interactions/Actions/ActionsSubview.dart
@@ -13,12 +13,10 @@ class _ActionsSubviewState extends State<ActionsSubview> {
   var actionsList = ContainerActionsList();
 
   Widget returnCard(String title, VoidCallback action) {
-    return GestureDetector(
+    return StandardCardElement(
+      decorationVariant: decorationPriority.standard,
+      cardLabel: title,
       onTap: action,
-      child: StandardCardElement(
-        decorationVariant: decorationPriority.standard,
-        cardLabel: title,
-      ),
     );
   }
 
@@ -43,7 +41,7 @@ class _ActionsSubviewState extends State<ActionsSubview> {
     ];
 
     var viewBuilder = ContainerWrapperElement(children: [
-      HeadingOneText("Actions", decorationPriority.standard),
+      HeadingOneText(data: "Actions", textColor: decorationPriority.standard),
       SizedBox(height: 10),
       DividerElement(),
       SizedBox(height: 10),

diff --git a/Example App/lib/src/Core/Interactions/Interactions/InteractionsSubview.dart b/Example App/lib/src/Core/Interactions/Interactions/InteractionsSubview.dart
@@ -52,7 +52,8 @@ class _InteractionsSubviewState extends State<InteractionsSubview> {
 
     var viewBuilder = ContainerWrapperElement(
       children: [
-        HeadingOneText("Interactions", decorationPriority.standard),
+        HeadingOneText(
+            data: "Interactions", textColor: decorationPriority.standard),
         SizedBox(height: 10),
         interactions.buttonBackingTest,
       ],

diff --git a/Example App/lib/src/Core/Interactions/Sensations/SensationsSubview.dart b/Example App/lib/src/Core/Interactions/Sensations/SensationsSubview.dart
@@ -11,12 +11,10 @@ class SensationsSubview extends StatefulWidget {
 
 class _SensationsSubviewState extends State<SensationsSubview> {
   Widget returnCard(String title, VoidCallback action) {
-    return GestureDetector(
+    return StandardCardElement(
+      decorationVariant: decorationPriority.standard,
+      cardLabel: title,
       onTap: action,
-      child: StandardCardElement(
-        decorationVariant: decorationPriority.standard,
-        cardLabel: title,
-      ),
     );
   }
 
@@ -60,7 +58,8 @@ class _SensationsSubviewState extends State<SensationsSubview> {
 
     var viewBuilder = ContainerWrapperElement(
       children: [
-        HeadingOneText("Sensations", decorationPriority.standard),
+        HeadingOneText(
+            data: "Sensations", textColor: decorationPriority.standard),
         SizedBox(height: 10),
         DividerElement(),
         SizedBox(height: 10),

diff --git a/Example App/lib/src/Core/Landing/Resource Generation/GenerationLandingView.dart b/Example App/lib/src/Core/Landing/Resource Generation/GenerationLandingView.dart
@@ -5,7 +5,6 @@ class GenerationLandingPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    var screenSize = MediaQuery.of(context).size;
     var generationToolCarousel = ToolDetailView(
       parentTool: GenerationTool(),
       onUseTool: () {

diff --git a/Example App/lib/src/Core/UI Components/Components/ComponentsSubView.dart b/Example App/lib/src/Core/UI Components/Components/ComponentsSubView.dart
@@ -39,7 +39,8 @@ class _ComponentsSubviewState extends State<ComponentsSubview> {
         });
 
     var viewBuilder = ContainerWrapperElement(children: [
-      HeadingOneText("Components", decorationPriority.standard),
+      HeadingOneText(
+          data: "Components", textColor: decorationPriority.standard),
       SizedBox(height: 10),
       componentList
     ], containerVariant: wrapperVariants.stackScroll);

diff --git a/Example App/lib/src/Core/UI Components/Elements/ElementsList.dart b/Example App/lib/src/Core/UI Components/Elements/ElementsList.dart
@@ -96,7 +96,8 @@ Map<String, Widget> aureusElements = {
 
 //where all text related items in aureus are initiated for testing
 
-Text text1 = HeadingOneText('Heading One', decorationPriority.standard);
+Widget text1 =
+    HeadingOneText(data: 'Heading One', textColor: decorationPriority.standard);
 Text text2 = HeadingTwoText('Heading Two', decorationPriority.standard);
 Text text3 = HeadingThreeText('Heading Three', decorationPriority.standard);
 Text text4 = HeadingFourText('Heading Four', decorationPriority.standard);
@@ -108,7 +109,7 @@ Text text9 = ButtonTwoText('Button Two', decorationPriority.standard);
 Text text10 = TagOneText('Tag One', decorationPriority.standard);
 Text text11 = TagTwoText('Tag Two', decorationPriority.standard);
 
-List<Text> textTesting = [
+List<Widget> textTesting = [
   text1,
   text2,
   text3,

diff --git a/Example App/lib/src/Core/UI Components/Elements/ElementsSubView.dart b/Example App/lib/src/Core/UI Components/Elements/ElementsSubView.dart
@@ -39,7 +39,7 @@ class _ElementsSubviewState extends State<ElementsSubview> {
         });
 
     var viewBuilder = ContainerWrapperElement(children: [
-      HeadingOneText("Elements", decorationPriority.standard),
+      HeadingOneText(data: "Elements", textColor: decorationPriority.standard),
       SizedBox(height: 10),
       elementsList
     ], containerVariant: wrapperVariants.stackScroll);

diff --git a/Example App/lib/src/Core/UI Components/Views/ViewSubView.dart b/Example App/lib/src/Core/UI Components/Views/ViewSubView.dart
@@ -18,18 +18,19 @@ class _ViewsSubviewState extends State<ViewsSubview> {
 
       // Iterating through the top level of categories to make a sub-carousel
       for (var viewData in viewRow.value) {
-        var cardElement = Focus(
-            child: GestureDetector(
-                onTap: () => {
-                      Navigator.push(
-                          context,
-                          MaterialPageRoute(
-                            builder: (context) => viewData.view,
-                          ))
-                    },
-                child: StandardCardElement(
-                    decorationVariant: decorationPriority.standard,
-                    cardLabel: viewData.viewTitle)));
+        var cardElement = StandardCardElement(
+          decorationVariant: decorationPriority.standard,
+          cardLabel: viewData.viewTitle,
+          onTap: (() {
+            print('i am being tapped');
+            Navigator.push(
+              context,
+              MaterialPageRoute(
+                builder: (context) => viewData.view,
+              ),
+            );
+          }),
+        );
 
         tempCards
             .add(Padding(padding: EdgeInsets.all(8.0), child: cardElement));
@@ -72,7 +73,7 @@ class _ViewsSubviewState extends State<ViewsSubview> {
   @override
   Widget build(BuildContext context) {
     var viewBuilder = ContainerWrapperElement(children: [
-      HeadingOneText("Views", decorationPriority.standard),
+      HeadingOneText(data: "Views", textColor: decorationPriority.standard),
       SizedBox(height: 10),
       viewList(),
     ], containerVariant: wrapperVariants.stackScroll);

diff --git a/Example App/lib/src/Core/UI Components/Views/ViewsList.dart b/Example App/lib/src/Core/UI Components/Views/ViewsList.dart
@@ -15,6 +15,10 @@ Map<String, List<viewMetaData>> aureusViewsCategory = {
       viewTitle: "Onboarding Demo",
       view: views.onboardingDemoView,
     ),
+    viewMetaData(
+      viewTitle: "Onboarding Simp Ask",
+      view: views.simpShareView,
+    ),
   ],
   "Landing": [
     viewMetaData(
@@ -27,7 +31,7 @@ Map<String, List<viewMetaData>> aureusViewsCategory = {
     ),
     viewMetaData(
       viewTitle: "Landing Page",
-      view: LandingPage(),
+      view: views.onboardingLandingView,
     ),
   ],
   "Safety Plan": [
@@ -254,6 +258,18 @@ class exampleAppViews {
     "",
     "",
   ]);
+
+  var simpShareView = OnboardingSimpSharingView(
+    simpMessage: "Hi, will you simp for us by sharing this online?",
+    onSimpAgree: () => {
+      notificationMaster.sendAlertNotificationRequest(
+          'Thank you for agreeing!', Assets.back),
+    },
+    onSimpDeny: () => {
+      notificationMaster.sendAlertNotificationRequest(
+          'Why didnt u agree :-(', Assets.back),
+    },
+  );
 }
 
 /* VIEWS */