merge: pull request #103 from Solvro/feat/ui-improvements

Add youtube and github icon [MOBILE 53]
Solvro · Jun 21, 2024 · a901eba · a901eba
2 parents 567c103 + 073ba92
commit a901eba
Show file tree

Hide file tree

Showing 13 changed files with 54 additions and 65 deletions.
diff --git a/assets/icons/ic_github.png b/assets/icons/ic_github.png
diff --git a/assets/icons/ic_youtube.png b/assets/icons/ic_youtube.png
diff --git a/lib/config/url_icons.dart b/lib/config/url_icons.dart
@@ -1,9 +1,10 @@
-abstract class UrlIconsConfig {
- static const icons = {
-     "facebook": "assets/icons/ic_fb.png",
+abstract class IconsConfig {
+  static const iconsPaths = {
+    "facebook": "assets/icons/ic_fb.png",
     "instagram": "assets/icons/ic_insta.png",
     "linkedin": "assets/icons/ic_linkedin.png",
-    "github": "assets/icons/ic_github.png",
     "mailto:": "assets/icons/ic_email.png",
+    "youtu": "assets/icons/ic_youtube.png",
+    "github": "assets/icons/ic_github.png",
   };
-}
+}
diff --git a/lib/features/guide/widgets/about_us/models/about_us_details.dart b/lib/features/guide/widgets/about_us/models/about_us_details.dart
@@ -1,5 +1,6 @@
 import '../../../../../api_base/directus_assets_url.dart';
-import '../../../../../utils/url_icons.dart';
+
+import '../../../../../utils/determine_icon.dart';
 import '../../../../../utils/where_non_null_iterable.dart';
 import '../repository/about_us_repository.dart';
 import 'member_data.dart';
@@ -15,17 +16,16 @@ class AboutUsDetails {
       return MemberData(
         name: e.name,
         imageUrl: e.photo?.filename_disk?.directusUrl,
-        socialLinks:
-            e.socialLinks.whereNonNull.map((e) => e.url).toList(),
+        socialLinks: e.socialLinks.whereNonNull.map((e) => e.url).toList(),
         subtitle: e.subtitle,
       );
     }).toList();
   }
 
-  List<UrlIconsUtilModel> getSocialIcons() {
+  List<UrlIconsModel> getSocialIcons() {
     return aboutUs?.solvroSocialLinks.whereNonNull
             .map(
-              (e) => UrlIconsUtilModel(url: e.url),
+              (e) => UrlIconsModel(url: e.url),
             )
             .toList() ??
         [];

diff --git a/lib/features/guide/widgets/about_us/models/member_data.dart b/lib/features/guide/widgets/about_us/models/member_data.dart
@@ -1,13 +1,13 @@
 import 'package:flutter/foundation.dart';
 
-import '../../../../../utils/url_icons.dart';
+import '../../../../../utils/determine_icon.dart';
 
 @immutable
 class MemberData {
   final List<String> socialLinks;
   final String? name;
   final String? subtitle;
-  final List<UrlIconsUtilModel> links;
+  final List<UrlIconsModel> links;
   final String? imageUrl;
 
   MemberData({
@@ -17,25 +17,27 @@ class MemberData {
     required this.imageUrl,
   }) : links = _determineLinksIcons(socialLinks);
 
-  static List<UrlIconsUtilModel> _determineLinksIcons(List<String> urls) {
-    return urls.map((url) => UrlIconsUtilModel(url: url)).toList();
-  } 
-
+  static List<UrlIconsModel> _determineLinksIcons(List<String> urls) {
+    return urls.map((url) => UrlIconsModel(url: url)).toList();
+  }
 
   @override
-  bool operator == (Object other) {
+  bool operator ==(Object other) {
     if (identical(this, other)) return true;
-  
+
     return other is MemberData &&
-      listEquals(other.socialLinks, socialLinks) &&
-      other.name == name &&
-      other.subtitle == subtitle &&
-      listEquals(other.links, links) &&
-      other.imageUrl == imageUrl;
+        listEquals(other.socialLinks, socialLinks) &&
+        other.name == name &&
+        other.subtitle == subtitle &&
+        listEquals(other.links, links) &&
+        other.imageUrl == imageUrl;
   }
 
-
   @override
-  int get hashCode => socialLinks.hashCode ^ name.hashCode ^ subtitle.hashCode ^ links.hashCode ^ imageUrl.hashCode;
-
+  int get hashCode =>
+      socialLinks.hashCode ^
+      name.hashCode ^
+      subtitle.hashCode ^
+      links.hashCode ^
+      imageUrl.hashCode;
 }
diff --git a/lib/features/guide/widgets/about_us/widgets/links_section.dart b/lib/features/guide/widgets/about_us/widgets/links_section.dart
@@ -2,13 +2,13 @@ import 'package:flutter/material.dart';
 
 import '../../../../../config/ui_config.dart';
 import '../../../../../theme/app_theme.dart';
+import '../../../../../utils/determine_icon.dart';
 import '../../../../../utils/launch_url_util.dart';
-import '../../../../../utils/url_icons.dart';
 
 class LinksSection extends StatelessWidget {
   const LinksSection({super.key, required this.links});
 
-  final List<UrlIconsUtilModel> links;
+  final List<UrlIconsModel> links;
 
   @override
   Widget build(BuildContext context) {

diff --git a/lib/features/guide/widgets/about_us/widgets/team_section.dart b/lib/features/guide/widgets/about_us/widgets/team_section.dart
@@ -3,8 +3,9 @@ import 'package:flutter/material.dart';
 import '../../../../../api_base/directus_assets_url.dart';
 import '../../../../../config/ui_config.dart';
 import '../../../../../theme/app_theme.dart';
+import '../../../../../utils/determine_icon.dart';
 import '../../../../../utils/launch_url_util.dart';
-import '../../../../../utils/url_icons.dart';
+
 import '../../../../../widgets/my_cached_image.dart';
 import '../models/member_data.dart';
 
@@ -87,7 +88,7 @@ class _Description extends StatelessWidget {
       {required this.name, required this.subtitle, required this.links});
   final String name;
   final String subtitle;
-  final List<UrlIconsUtilModel> links;
+  final List<UrlIconsModel> links;
 
   @override
   Widget build(BuildContext context) {

diff --git a/lib/features/study_circle_details/models/contact_section_data.dart b/lib/features/study_circle_details/models/contact_section_data.dart
@@ -1,32 +1,12 @@
-import 'package:collection/collection.dart';
-
-import '../../../config/ui_config.dart';
+import '../../../utils/determine_icon.dart';
 
 class ContactSectionData {
   String iconUrl;
   String? text;
   String? url;
 
-  static const _icons = {
-    "facebook": "assets/icons/ic_fb.png",
-    "instagram": "assets/icons/ic_insta.png",
-    "linkedin": "assets/icons/ic_linkedin.png",
-    "mailto:": "assets/icons/ic_email.png",
-  };
-
   ContactSectionData({
     required this.text,
     required this.url,
-  }) : iconUrl = _determineIcon(url);
-
-  static String _determineIcon(String? url) {
-    return url != null
-        ? _icons.entries
-                .firstWhereOrNull(
-                  (e) => url.contains(e.key),
-                )
-                ?.value ??
-            DetailsScreenConfig.defaultIconUrl
-        : DetailsScreenConfig.defaultIconUrl;
-  }
+  }) : iconUrl = url.determineIcon();
 }
diff --git a/lib/features/study_circle_details/study_circle_details.dart b/lib/features/study_circle_details/study_circle_details.dart
@@ -5,7 +5,8 @@ import '../../api_base/directus_assets_url.dart';
 import '../../config/ui_config.dart';
 import '../../theme/app_theme.dart';
 import '../../utils/context_extensions.dart';
-import '../../utils/url_icons.dart';
+import '../../utils/determine_icon.dart';
+
 import '../../utils/where_non_null_iterable.dart';
 import '../../widgets/loading_widgets/shimmer_loading.dart';
 import '../../widgets/my_error_widget.dart';
@@ -64,7 +65,7 @@ class _CircleDetailsDataView extends ConsumerWidget {
               const SizedBox(height: DetailsScreenConfig.spacerHeight),
               ContactSection(
                 list: value?.links.whereNonNull
-                        .map((a) => UrlIconsUtilModel(
+                        .map((a) => UrlIconsModel(
                               text: a.name,
                               url: a.link,
                             ))

diff --git a/lib/features/study_circle_details/widgets/details_screen_contact_section.dart b/lib/features/study_circle_details/widgets/details_screen_contact_section.dart
@@ -3,14 +3,14 @@ import 'package:flutter/gestures.dart';
 
 import '../../../theme/app_theme.dart';
 import '../../../utils/context_extensions.dart';
+import '../../../utils/determine_icon.dart';
 import '../../../utils/launch_url_util.dart';
-import '../../../utils/url_icons.dart';
 import '../../../widgets/my_icon.dart';
 
 class ContactSection extends StatelessWidget {
   const ContactSection({super.key, required this.list});
 
-  final List<UrlIconsUtilModel> list;
+  final List<UrlIconsModel> list;
 
   @override
   Widget build(BuildContext context) {

diff --git a/lib/utils/url_icons.dart → lib/utils/determine_icon.dart b/lib/utils/url_icons.dart → lib/utils/determine_icon.dart
@@ -1,29 +1,31 @@
 import 'package:collection/collection.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/foundation.dart';
 
 import '../config/ui_config.dart';
 import '../config/url_icons.dart';
 
 @immutable
-class UrlIconsUtilModel {
+class UrlIconsModel {
   final String iconUrl;
   final String? text;
   final String? url;
 
-  UrlIconsUtilModel({
+  UrlIconsModel({
     String? text,
     this.url,
-  })  : iconUrl = _determineIcon(url),
+  })  : iconUrl = url.determineIcon(),
         text = text ?? url;
+}
 
-  static String _determineIcon(String? url) {
-    return url != null
-        ? UrlIconsConfig.icons.entries
+extension IconDeterminer on String? {
+  String determineIcon() {
+    return this != null
+        ? IconsConfig.iconsPaths.entries
                 .firstWhereOrNull(
-                  (e) => url.contains(e.key),
+                  (e) => this!.contains(e.key),
                 )
                 ?.value ??
             DetailsScreenConfig.defaultIconUrl
         : DetailsScreenConfig.defaultIconUrl;
   }
-}
+}
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -98,6 +98,7 @@ flutter:
     - assets/icons/ic_insta.png
     - assets/icons/ic_linkedin.png
     - assets/icons/ic_web.png
+    - assets/icons/ic_youtube.png
     - assets/icons/ic_github.png
 
   # An image asset can refer to one or more resolution-specific "variants", see

diff --git a/topwr.iml b/topwr.iml
@@ -8,6 +8,7 @@
       <excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/.idea" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/.pub" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Dart SDK" level="project" />