chore: refactor Changed details of design (#69)

* Changed details of design * Resolve comments
xmartlabs · Jan 18, 2023 · 2abf934 · 2abf934
1 parent ffb8639
commit 2abf934
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 25 deletions.
diff --git a/assets/policy_and_terms/privacy_policy.html b/assets/policy_and_terms/privacy_policy.html
@@ -11,7 +11,7 @@
     <title>Privacy policy</title>
 </head>
 
-<body style="padding: 5px; color: #E0F4FF; font-family: Roboto; font-size: 10px;">
+<body style="color: #E0F4FF; font-family: Roboto; font-size: 8px;">
   <h1>Privacy Policy</h1>
   <p>Last updated: November 24, 2022</p>
   <p>This Privacy Policy describes Our policies and procedures on the collection, use and disclosure of Your information

diff --git a/assets/policy_and_terms/terms_and_conditions.html b/assets/policy_and_terms/terms_and_conditions.html
@@ -11,7 +11,7 @@
     <title>Terms and Conditions</title>
 </head>
 
-<body style="padding: 5px; color: #E0F4FF; font-family: Roboto; font-size: 10px;">
+<body style="color: #E0F4FF; font-family: Roboto; font-size: 8px;">
     <h1>Terms and Conditions</h1>
     <p>Last updated: December 28, 2022</p>
     <p>Please read these terms and conditions carefully before using Our Service.</p>

diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
@@ -4,7 +4,7 @@
   "about_button_suggestion": "Any suggestion?",
   "about_button_terms": "Terms and conditions",
   "about_credits": "Credits:",
-  "about_fluttips": "Looking for the best way to get the most out of Flutter in all its different applications and use cases? Look no further than Fluttips! This <link href={OpenSourceProjectUrl}>Open Source Project</link>, launched by the talented team at Xmartlabs, is filled with top-quality data and resources from Vandadnp's GitHub libraries and Flutter & Google video tips.\n\nNurtured with this wealth of knowledge, Fluttips is the ultimate destination for Flutter developers looking to optimize their process and stay up-to-date on the latest trends and news.\n\n So why wait? Start using Fluttips today and take your Flutter skills to the next level!",
+  "about_fluttips": "Looking for the best way to get the most out of Flutter in all its different applications and use cases? Look no further than Fluttips! This <link href={OpenSourceProjectUrl}>Open Source Project</link>, launched by the talented team at Xmartlabs, is filled with top-quality data and resources from Vandadnp's GitHub libraries and Flutter & Google video tips.\n\nNurtured with this wealth of knowledge, Fluttips is the ultimate destination for Flutter developers looking to optimize their process and stay up-to-date on the latest trends and news.\n\nSo why wait? Start using Fluttips today and take your Flutter skills to the next level!",
   "@about_fluttips": {
     "description": "It is the link to the repository",
     "placeholders": {

diff --git a/lib/ui/about/about_screen.dart b/lib/ui/about/about_screen.dart
@@ -36,7 +36,10 @@ class _AboutContentScreen extends StatelessWidget {
             SizedBox(height: 15.h),
             const _CreditsSection(),
             SizedBox(height: 15.h),
-            Divider(color: context.theme.colors.surface),
+            Container(
+              padding: EdgeInsets.only(left: 20.w),
+              child: Divider(color: context.theme.colors.surface),
+            ),
             SizedBox(height: 15.h),
             const _SuggestionSection(),
             SizedBox(height: 20.h),
@@ -119,22 +122,22 @@ class _CreditsSection extends StatelessWidget {
           children: [
             Text(
               context.localizations.about_credits,
-              style: context.theme.textStyles.titleMedium!.copyWith(
+              style: context.theme.textStyles.bodyMedium!.copyWith(
                 color: context.theme.colors.surface,
                 fontWeight: FontWeight.bold,
               ),
             ),
             SizedBox(width: 10.w),
             Text(
               context.localizations.about_images,
-              style: context.theme.textStyles.bodyLarge!.copyWith(
+              style: context.theme.textStyles.bodyMedium!.copyWith(
                 color: context.theme.colors.surface,
               ),
             ),
             InkWell(
               child: Text(
                 context.localizations.about_vandadnp,
-                style: context.theme.textStyles.bodyLarge!.copyWith(
+                style: context.theme.textStyles.bodyMedium!.copyWith(
                   color: context.theme.colors.surface,
                   decoration: TextDecoration.underline,
                 ),
@@ -144,14 +147,14 @@ class _CreditsSection extends StatelessWidget {
             SizedBox(width: 10.w),
             Text(
               context.localizations.about_videos,
-              style: context.theme.textStyles.bodyLarge!.copyWith(
+              style: context.theme.textStyles.bodyMedium!.copyWith(
                 color: context.theme.colors.surface,
               ),
             ),
             InkWell(
               child: Text(
                 context.localizations.about_widgets,
-                style: context.theme.textStyles.bodyLarge!.copyWith(
+                style: context.theme.textStyles.bodyMedium!.copyWith(
                   color: context.theme.colors.surface,
                   decoration: TextDecoration.underline,
                 ),
@@ -226,13 +229,13 @@ class _AboutSection extends StatelessWidget {
                     final String? link = attrs['href'];
                     launchUrl(Uri.parse(link!));
                   },
-                  style: context.theme.textStyles.bodyLarge!.copyWith(
+                  style: context.theme.textStyles.bodyMedium!.copyWith(
                     color: context.theme.colors.surface,
                     decoration: TextDecoration.underline,
                   ),
                 ),
               },
-              style: context.theme.textStyles.bodyLarge!
+              style: context.theme.textStyles.bodyMedium!
                   .copyWith(color: context.theme.colors.surface),
             ),
           ],

diff --git a/lib/ui/favourites/display_list_favorites_tips_screen.dart b/lib/ui/favourites/display_list_favorites_tips_screen.dart
@@ -20,20 +20,21 @@ class DisplayListFavoritesTipsScreen extends StatelessWidget {
         onTap: onTipAppendCallback,
         child: Container(
           alignment: Alignment.centerLeft,
-          padding: EdgeInsets.symmetric(horizontal: 10.w),
-          margin: const EdgeInsets.all(8),
+          padding: EdgeInsets.symmetric(horizontal: 15.w, vertical: 05.h),
+          margin: const EdgeInsets.all(2),
           decoration: BoxDecoration(
             borderRadius: BorderRadius.circular(15.r),
             color: Colors.transparent,
             border: Border.all(
-              color: context.theme.colors.primary.shade100,
+              color: context.theme.colors.primary.shade400,
             ),
           ),
           child: Text(
             tip.name,
-            textAlign: TextAlign.center,
+            textAlign: TextAlign.left,
             style: context.theme.textStyles.titleMedium!.copyWith(
               color: context.theme.colors.primary.shade100,
+              height: 1.3,
             ),
           ),
         ),

diff --git a/lib/ui/favourites/favourites_tips_screen.dart b/lib/ui/favourites/favourites_tips_screen.dart
@@ -24,7 +24,7 @@ class _FavouritesTipsContentScreen extends StatelessWidget {
     final cubit = context.read<FavouritesTipsCubit>();
     return BlocBuilder<FavouritesTipsCubit, FavouritesTipsBaseState>(
       builder: (context, state) => Container(
-        margin: EdgeInsets.symmetric(horizontal: 45.w),
+        margin: EdgeInsets.symmetric(horizontal: 20.w),
         padding: EdgeInsets.symmetric(horizontal: 40.0.w),
         child: state.tips.isEmpty
             ? emptyFavouriteScreen(context)
@@ -41,7 +41,7 @@ class _FavouritesTipsContentScreen extends StatelessWidget {
       Column(
         children: [
           Container(
-            padding: EdgeInsets.symmetric(horizontal: 10.w, vertical: 15.h),
+            padding: EdgeInsets.only(top: 42.h, bottom: 16.h),
             alignment: Alignment.centerLeft,
             child: Text(
               context.localizations.myFavorites,

diff --git a/lib/ui/favourites/list_favourites_tips_screen.dart b/lib/ui/favourites/list_favourites_tips_screen.dart
@@ -1,5 +1,6 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttips/ui/common/context_extensions.dart';
 import 'package:fluttips/ui/theme/app_theme.dart';
 import 'package:fluttips/ui/tips/tips_screen.dart';
@@ -31,19 +32,20 @@ class ListFavouritesTipsScreen extends StatelessWidget {
                 child: TextButton(
                   onPressed: context.router.navigateBack,
                   style: TextButton.styleFrom(
-                    padding: const EdgeInsets.only(
-                      top: 5,
-                      left: 10,
-                      right: 5,
-                      bottom: 5,
+                    padding: EdgeInsets.only(
+                      top: 5.h,
+                      left: 13.w,
+                      right: 5.w,
+                      bottom: 5.h,
                     ),
                     shape: const CircleBorder(),
-                    backgroundColor: context.theme.colors.primary.shade100,
+                    backgroundColor: context.theme.colors.primary,
                     alignment: Alignment.center,
                   ),
-                  child: const Icon(
+                  child: Icon(
                     Icons.arrow_back_ios,
                     size: 20,
+                    color: context.theme.colors.primary.shade100,
                   ),
                 ),
               ),

diff --git a/lib/ui/webView/webview_screen.dart b/lib/ui/webView/webview_screen.dart
@@ -30,7 +30,7 @@ class _WebViewScreenState extends State<WebViewScreen> {
   Widget build(BuildContext context) {
     _webViewController.setBackgroundColor(context.theme.colors.background);
     return Container(
-      margin: EdgeInsets.only(left: 50, top: 10.h),
+      margin: EdgeInsets.only(left: 80.w, top: 10.h),
       alignment: Alignment.centerLeft,
       child: Column(
         children: [