Merge pull request #29 from sumit-coder/ui_work

UI work

Author: sumit-coder

lib/views/screens/home_screen/home_screen.dart

@@ -22,7 +22,7 @@ class MyHomePage extends StatefulWidget {
 }
 
 class _MyHomePageState extends State<MyHomePage> {
- SideTabType activeButton = SideTabType.components;
+ SideTabType activeButton = SideTabType.explore;
 
  Widget switchTabs(SideTabType newActiveTab) {
  switch (newActiveTab) {

lib/views/screens/tabs/code_snippet_tab/widgets/add_code_snippet_alert.dart

@@ -30,7 +30,7 @@ class AddCodeSnippetAlert extends StatelessWidget {
  Row(
  mainAxisAlignment: MainAxisAlignment.spaceBetween,
  children: [
- Text('Add Component', style: themeData.textTheme.titleMedium),
+ Text('Add Snippet', style: themeData.textTheme.titleMedium),
  ButtonTapEffect(
  onTap: () {
  Navigator.pop(context);
@@ -66,7 +66,7 @@ class AddCodeSnippetAlert extends StatelessWidget {
  snippetTabProvider.getActiveSnippetsCollectionData();
  }
  },
- buttonTitle: "Add Component",
+ buttonTitle: "Add Snippet",
  )
  ],
  ),

lib/views/screens/tabs/code_snippet_tab/widgets/code_snippet_list_view.dart

@@ -63,15 +63,15 @@ class _CodeSnippetsListViewState extends State<CodeSnippetsListView> {
  },
  title: snippetTabProvider.snippetsCollectionData[i].data['title'],
  tags: snippetTabProvider.snippetsCollectionData[i].data['tags'],
- snippetsCount: snippetTabProvider.snippetsCollectionData[i].data['snippetsCount'],
+ snippetsCount: snippetTabProvider.snippetsCollectionData[i].$createdAt.split("T").first,
  ),
  SnippetsCollectionCard(
  onTap: () {
  snippetTabProvider.changeCollectionView(true, 0);
  },
  title: 'Flutter Code Snippets Demo',
  tags: 'Flutter,Demo',
- snippetsCount: 50,
+ snippetsCount: "today",
  ),
  ],
  ),
@@ -91,7 +91,7 @@ class SnippetsCollectionCard extends StatelessWidget {
  final VoidCallback onTap;
  final String title;
  final String tags;
- final int snippetsCount;
+ final String snippetsCount;
 
  @override
  Widget build(BuildContext context) {
@@ -126,7 +126,7 @@ class SnippetsCollectionCard extends StatelessWidget {
  style: themeData.textTheme.titleSmall,
  ),
  SizedBox(height: MySpaceSystem.spaceX2),
- Text('$snippetsCount Snippets', style: themeData.textTheme.bodyMedium),
+ Text('$snippetsCount', style: themeData.textTheme.bodyMedium),
  ],
  ),
  ],

lib/views/screens/tabs/code_snippet_tab/widgets/code_snippet_view.dart

@@ -37,7 +37,7 @@ class _CodeSnippetViewState extends State<CodeSnippetView> {
  return Column(
  children: [
  SendBackBarWithTitle(
- title: "Flutter Code Snippets",
+ title: snippetTabProvider.snippetsCollectionData[snippetTabProvider.indexOfClickedSnippetCollection].data['title'],
  onTap: () {
  snippetTabProvider.changeCollectionView(false, -1);
  snippetTabProvider.makeActiveSnippetsCollectionDataToEmpty();
@@ -115,9 +115,9 @@ class AddCodeSnippetCard extends StatelessWidget {
  size: 34,
  color: themeData.colorScheme.secondary,
  ),
- SizedBox(width: MySpaceSystem.spaceX2),
+ SizedBox(width: MySpaceSystem.spaceX1),
  Text(
- 'Snippet Collection',
+ 'Snippet',
  style: themeData.textTheme.bodyLarge!.copyWith(
  color: themeData.colorScheme.secondary,
  ),

lib/views/screens/tabs/components_tab/widgets/components_view.dart

@@ -54,7 +54,7 @@ class _ComponentViewState extends State<ComponentView> {
  child: Column(
  children: [
  SendBackBarWithTitle(
- title: "Flutter Code Snippets",
+ title: componentTabProvider.componentsCollectionData[componentTabProvider.activeComponentCollectionIndex].data['title'],
  onTap: () {
  // snippetTabProvider.changeCollectionView(false);
  componentTabProvider.changeOpenActiveComponentCollectionView(false, -1);

lib/views/screens/tabs/explore_tab/explore_tab.dart

@@ -72,7 +72,7 @@ class _ExploreViewState extends State<ExploreView> {
  child: exploreTapProvider.showListItemView ? ExploreListItemView() : ExploreListView(),
  ),
  ],
- ).animate().scaleXY(begin: 0.1).move(begin: const Offset(-300, -100)).flipH(begin: -0.1),
+ ),
  ),
  );
  }

lib/views/screens/tabs/settings_tab/settings_tab.dart

@@ -53,6 +53,7 @@ class SettingsTab extends StatelessWidget {
  Text("Default Name", style: MyTextTypeSystem.titleMediumDark),
  const SizedBox(height: MySpaceSystem.spaceX),
  Text(authService.currentUser.email, style: MyTextTypeSystem.titleLargeDark),
+ // Text("currentUser@gmail.com (dummy email for demo)", style: MyTextTypeSystem.titleLargeDark),
  ],
  ),
  ],

lib/views/welcome_screen.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 
+import '../theme/my_colors.dart';
 import '../theme/my_design_system.dart';
 
 class WelcomeScreen extends StatelessWidget {
@@ -9,43 +10,44 @@ class WelcomeScreen extends StatelessWidget {
  Widget build(BuildContext context) {
  return Scaffold(
  body: Stack(
- children: [
- Positioned(
- top: 100,
- left: 100,
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Text(
- "Help Me Design",
- style: MyTextTypeSystem.titleXXLargeDark.copyWith(fontSize: 54),
- ),
- SizedBox(height: MySpaceSystem.spaceX2),
- SizedBox(
- width: 600,
- child: Text(
- "Help me Design App for to Help Developer Design and save there Reusable Code, Work in Progress",
- style: MyTextTypeSystem.titleLargeDark,
- ),
- ),
- TextButton(
- onPressed: () {
- // DatabasesService.update.component(
- // componentId: "648584fa8a857a7282d8",
- // code: "Code",
- // codeLanguage: null,
- // previewType: "",
- // previewUrl: null,
- // );
- },
- child: Text(
- "hy",
- style: MyTextTypeSystem.bodyLarge,
- ),
- ),
- ],
- ),
- ),
+ children: const [
+ Positioned(child: Center(child: CircularProgressIndicator(color: DesignSystemColors.secondaryColorDark))),
+ // Positioned(
+ // top: 100,
+ // left: 100,
+ // child: Column(
+ // crossAxisAlignment: CrossAxisAlignment.start,
+ // children: [
+ // Text(
+ // "Help Me Design",
+ // style: MyTextTypeSystem.titleXXLargeDark.copyWith(fontSize: 54),
+ // ),
+ // SizedBox(height: MySpaceSystem.spaceX2),
+ // SizedBox(
+ // width: 600,
+ // child: Text(
+ // "Help me Design App for to Help Developer Design and save there Reusable Code, Work in Progress",
+ // style: MyTextTypeSystem.titleLargeDark,
+ // ),
+ // ),
+ // TextButton(
+ // onPressed: () {
+ // // DatabasesService.update.component(
+ // // componentId: "648584fa8a857a7282d8",
+ // // code: "Code",
+ // // codeLanguage: null,
+ // // previewType: "",
+ // // previewUrl: null,
+ // // );
+ // },
+ // child: Text(
+ // "hy",
+ // style: MyTextTypeSystem.bodyLarge,
+ // ),
+ // ),
+ // ],
+ // ),
+ // ),
  ],
  ),
  );

lib/views/widgets/form_widgets/buttons/simple_button.dart

@@ -32,3 +32,9 @@ class SimpleButton extends StatelessWidget {
  );
  }
 }
+
+class Button {
+ final Function onTap;
+
+ Button(this.onTap);
+}