Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

## 0.0.23 #104

Merged
merged 2 commits into from
Dec 5, 2023
Merged

## 0.0.23 #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33d4bdb
Adding onboardingSimpShareView
codingiswhyicry Dec 1, 2023
33721b1
Adding OnboardingSimpView and example app addition
codingiswhyicry Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .DS_Store
View file
Open in desktop
Binary file not shown.
10 changes: 4 additions & 6 deletions Example App/lib/src/Core/Interactions/Actions/ActionsSubview.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
);
}

Expand All @@ -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),
Expand Down
3 changes: 2 additions & 1 deletion Example App/lib/src/Core/Interactions/Interactions/InteractionsSubview.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
],
Expand Down
11 changes: 5 additions & 6 deletions Example App/lib/src/Core/Interactions/Sensations/SensationsSubview.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
);
}

Expand Down Expand Up @@ -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),
Expand Down
1 change: 0 additions & 1 deletion Example App/lib/src/Core/Landing/Resource Generation/GenerationLandingView.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: () {
Expand Down
3 changes: 2 additions & 1 deletion Example App/lib/src/Core/UI Components/Components/ComponentsSubView.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
5 changes: 3 additions & 2 deletions Example App/lib/src/Core/UI Components/Elements/ElementsList.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion Example App/lib/src/Core/UI Components/Elements/ElementsSubView.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
27 changes: 14 additions & 13 deletions Example App/lib/src/Core/UI Components/Views/ViewSubView.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -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);
Expand Down
18 changes: 17 additions & 1 deletion Example App/lib/src/Core/UI Components/Views/ViewsList.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -27,7 +31,7 @@ Map<String, List<viewMetaData>> aureusViewsCategory = {
),
viewMetaData(
viewTitle: "Landing Page",
view: LandingPage(),
view: views.onboardingLandingView,
),
],
"Safety Plan": [
Expand Down Expand Up @@ -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 */
Expand Down
Loading
Loading