From be009da7d85a01504089485f53cd92e6465f2aac Mon Sep 17 00:00:00 2001 From: Veloraine Date: Sun, 26 Nov 2023 20:04:23 +0700 Subject: [PATCH 1/3] fix: change secrets env target path --- lib/core/environment/secrets.dart | 2 +- macos/Flutter/GeneratedPluginRegistrant.swift | 6 ++++-- windows/flutter/generated_plugin_registrant.cc | 3 +++ windows/flutter/generated_plugins.cmake | 1 + 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/core/environment/secrets.dart b/lib/core/environment/secrets.dart index 1319010..6dabd81 100644 --- a/lib/core/environment/secrets.dart +++ b/lib/core/environment/secrets.dart @@ -2,7 +2,7 @@ import 'package:envied/envied.dart'; part 'secrets.g.dart'; -@Envied(name: 'Secret', path: '.env.example') +@Envied(name: 'Secret', path: '.env') abstract class Secret { @EnviedField(varName: 'BASE_URL_DEV') static const String baseUrlDev = _Secret.baseUrlDev; diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 8fce4cf..dce6ef2 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,14 +5,16 @@ import FlutterMacOS import Foundation +import firebase_analytics import firebase_core import firebase_crashlytics import package_info -import path_provider_macos -import shared_preferences_macos +import path_provider_foundation +import shared_preferences_foundation import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + FLTFirebaseAnalyticsPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseAnalyticsPlugin")) FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin")) FLTFirebaseCrashlyticsPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCrashlyticsPlugin")) FLTPackageInfoPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlugin")) diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 4f78848..ec8e8d4 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -6,9 +6,12 @@ #include "generated_plugin_registrant.h" +#include #include void RegisterPlugins(flutter::PluginRegistry* registry) { + FirebaseCorePluginCApiRegisterWithRegistrar( + registry->GetRegistrarForPlugin("FirebaseCorePluginCApi")); UrlLauncherWindowsRegisterWithRegistrar( registry->GetRegistrarForPlugin("UrlLauncherWindows")); } diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 88b22e5..02d26c3 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -3,6 +3,7 @@ # list(APPEND FLUTTER_PLUGIN_LIST + firebase_core url_launcher_windows ) From 4a06405d0a6e9a1a5d4e3a7f826d482c92692e26 Mon Sep 17 00:00:00 2001 From: Yudha Haris Purnama Date: Wed, 6 Dec 2023 19:38:58 +0700 Subject: [PATCH 2/3] feat(service): initializing mixpanel service --- lib/core/environment/config.dart | 6 +- lib/core/environment/secrets.dart | 2 + .../detail/presentation/widgets/_widgets.dart | 1 + .../widgets/title_and_bookmark.dart | 4 +- lib/services/_services.dart | 3 + lib/services/mixpanel_service.dart | 30 +++++++++ pubspec.lock | 62 ++++++++++++------- pubspec.yaml | 1 + 8 files changed, 84 insertions(+), 25 deletions(-) create mode 100644 lib/services/mixpanel_service.dart diff --git a/lib/core/environment/config.dart b/lib/core/environment/config.dart index 0f82190..f7c9035 100644 --- a/lib/core/environment/config.dart +++ b/lib/core/environment/config.dart @@ -38,6 +38,7 @@ class Config { await HiveDataBaseService.init(); } await Pref.init(); + await MixpanelService.init(); // TODO(fauzi): Implement notification plugin // await notificationPlugin.init(); @@ -55,6 +56,7 @@ class Config { } static bool get isDevelopment => appFlavor == Flavor.development; + static BaseConfig get baseConfig => _baseConfig()!; static BaseConfig? _baseConfig() { @@ -74,8 +76,10 @@ class Config { class BaseConfig { const BaseConfig({ - required this.endpoints, this.assetAbsolutePath = Constants.assetPath, + required this.endpoints, + this.assetAbsolutePath = Constants.assetPath, }); + final String assetAbsolutePath; final BaseEndpoints endpoints; } diff --git a/lib/core/environment/secrets.dart b/lib/core/environment/secrets.dart index 6dabd81..16d5fe5 100644 --- a/lib/core/environment/secrets.dart +++ b/lib/core/environment/secrets.dart @@ -8,4 +8,6 @@ abstract class Secret { static const String baseUrlDev = _Secret.baseUrlDev; @EnviedField(varName: 'BASE_URL_PROD') static const String baseUrlProd = _Secret.baseUrlProd; + @EnviedField(varName: 'MIXPANEL_TOKEN') + static const String mixpanelToken = _Secret.mixpanelToken; } diff --git a/lib/features/matkul/detail/presentation/widgets/_widgets.dart b/lib/features/matkul/detail/presentation/widgets/_widgets.dart index 52ed30e..9206a6f 100644 --- a/lib/features/matkul/detail/presentation/widgets/_widgets.dart +++ b/lib/features/matkul/detail/presentation/widgets/_widgets.dart @@ -10,6 +10,7 @@ import 'package:ulaskelas/features/leaderboard/presentation/widgets/_widgets.dar import 'package:ulaskelas/features/matkul/bookmarks/data/models/_models.dart'; import 'package:ulaskelas/features/matkul/form/data/models/_models.dart'; import 'package:ulaskelas/features/matkul/search/data/models/_models.dart'; +import 'package:ulaskelas/services/_services.dart'; import 'package:ulaskelas/services/launch_service.dart'; part 'review_card.dart'; diff --git a/lib/features/matkul/detail/presentation/widgets/title_and_bookmark.dart b/lib/features/matkul/detail/presentation/widgets/title_and_bookmark.dart index 7f05731..9110148 100644 --- a/lib/features/matkul/detail/presentation/widgets/title_and_bookmark.dart +++ b/lib/features/matkul/detail/presentation/widgets/title_and_bookmark.dart @@ -2,7 +2,8 @@ part of '_widgets.dart'; class TitleAndBookMark extends StatelessWidget { const TitleAndBookMark({ - required this.course, super.key, + required this.course, + super.key, }); final CourseModel course; @@ -36,6 +37,7 @@ class TitleAndBookMark extends StatelessWidget { shortName: course.shortName, ); bookmarkRM.setState((s) => s.toggleBookmark(bookmark)); + MixpanelService.track('bookmark_course'); }, child: Icon( Icons.bookmark, diff --git a/lib/services/_services.dart b/lib/services/_services.dart index a278451..8c724d7 100644 --- a/lib/services/_services.dart +++ b/lib/services/_services.dart @@ -7,10 +7,12 @@ import 'package:flutter/material.dart'; import 'package:hive/hive.dart'; import 'package:intl/intl.dart'; import 'package:logger/logger.dart'; +import 'package:mixpanel_flutter/mixpanel_flutter.dart'; import 'package:path_provider/path_provider.dart'; import 'package:share/share.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:ulaskelas/core/_core.dart'; +import 'package:ulaskelas/core/environment/secrets.dart'; part 'date_service.dart'; part 'delay_service.dart'; @@ -19,3 +21,4 @@ part 'file_service.dart'; part 'hive_db_service.dart'; part 'pref_service.dart'; part 'share_service.dart'; +part 'mixpanel_service.dart'; diff --git a/lib/services/mixpanel_service.dart b/lib/services/mixpanel_service.dart new file mode 100644 index 0000000..dae4b68 --- /dev/null +++ b/lib/services/mixpanel_service.dart @@ -0,0 +1,30 @@ +part of '_services.dart'; + +class MixpanelService { + static Mixpanel? _mixpanel; + + static Future init() async { + Logger().i('Initializing Mixpanel Service'); + _mixpanel = await Mixpanel.init( + Secret.mixpanelToken, + trackAutomaticEvents: true, + ); + } + + static Future get instance async { + return _mixpanel ??= await Mixpanel.init( + Secret.mixpanelToken, + trackAutomaticEvents: true, + ); + } + + static void track(String eventName, {Map? params}) { + _mixpanel!.track(eventName, properties: params); + Logger().i( + ''' + Track Events: $eventName, + Parameters: $params + ''' + ); + } +} diff --git a/pubspec.lock b/pubspec.lock index 0642794..60b7249 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -165,10 +165,10 @@ packages: dependency: transitive description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.18.0" convert: dependency: transitive description: @@ -467,10 +467,10 @@ packages: dependency: "direct main" description: name: intl - sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" url: "https://pub.dev" source: hosted - version: "0.18.0" + version: "0.18.1" io: dependency: transitive description: @@ -515,18 +515,18 @@ packages: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" material_design_icons_flutter: dependency: "direct main" description: @@ -539,10 +539,10 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" mime: dependency: transitive description: @@ -551,6 +551,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.4" + mixpanel_flutter: + dependency: "direct main" + description: + name: mixpanel_flutter + sha256: "5dc993ade5eaad51ebb6c91230971a3443ac30a3d1d24399bc3db74c5705d400" + url: "https://pub.dev" + source: hosted + version: "2.2.0" navigation_builder: dependency: transitive description: @@ -651,10 +659,10 @@ packages: dependency: transitive description: name: platform - sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76" + sha256: ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102 url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.1.2" plugin_platform_interface: dependency: transitive description: @@ -816,18 +824,18 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" stack_trace: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" states_rebuilder: dependency: "direct main" description: @@ -840,10 +848,10 @@ packages: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" stream_transform: dependency: transitive description: @@ -880,10 +888,10 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.6.1" timing: dependency: transitive description: @@ -1024,10 +1032,10 @@ packages: dependency: transitive description: name: vm_service - sha256: f6deed8ed625c52864792459709183da231ebf66ff0cf09e69b573227c377efe + sha256: c538be99af830f478718b51630ec1b6bee5e74e52c8a802d328d9e71d35d2583 url: "https://pub.dev" source: hosted - version: "11.3.0" + version: "11.10.0" watcher: dependency: transitive description: @@ -1036,6 +1044,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" + web: + dependency: transitive + description: + name: web + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + url: "https://pub.dev" + source: hosted + version: "0.3.0" web_socket_channel: dependency: transitive description: @@ -1117,5 +1133,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.0.0 <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=3.10.0" diff --git a/pubspec.yaml b/pubspec.yaml index eb9120f..7e8b275 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -39,6 +39,7 @@ dependencies: # envify: ^2.0.3 envied: ^0.3.0+3 html: ^0.15.4 + mixpanel_flutter: ^2.2.0 dev_dependencies: flutter_test: From b8535dc920e7331419ca960a28b018097358f23a Mon Sep 17 00:00:00 2001 From: Yudha Haris Purnama Date: Sat, 9 Dec 2023 17:52:07 +0700 Subject: [PATCH 3/3] feat: implement mixpanel --- .../detail/presentation/pages/_pages.dart | 2 + .../pages/detail_matkul_page.dart | 49 +++++++++++----- .../presentation/widgets/review_card.dart | 34 +++++++---- .../form/presentation/pages/_pages.dart | 1 + .../pages/review_matkul_form_page.dart | 19 +++++- .../states/review_course_form_state.dart | 8 +++ .../presentation/pages/profile_page.dart | 58 +++++++++---------- lib/main_page.dart | 15 ++++- 8 files changed, 129 insertions(+), 57 deletions(-) diff --git a/lib/features/matkul/detail/presentation/pages/_pages.dart b/lib/features/matkul/detail/presentation/pages/_pages.dart index 35de4bf..0287877 100644 --- a/lib/features/matkul/detail/presentation/pages/_pages.dart +++ b/lib/features/matkul/detail/presentation/pages/_pages.dart @@ -15,6 +15,8 @@ import 'package:ulaskelas/features/matkul/form/presentation/states/_states.dart' import 'package:ulaskelas/features/matkul/search/data/models/_models.dart'; import 'package:ulaskelas/features/matkul/search/presentation/widgets/_widgets.dart'; +import '../../../../../services/_services.dart'; + part 'detail_matkul_page.dart'; part 'review_matkul_page.dart'; part 'all_review_matkul_page.dart'; diff --git a/lib/features/matkul/detail/presentation/pages/detail_matkul_page.dart b/lib/features/matkul/detail/presentation/pages/detail_matkul_page.dart index 9e83d0d..f3bf811 100644 --- a/lib/features/matkul/detail/presentation/pages/detail_matkul_page.dart +++ b/lib/features/matkul/detail/presentation/pages/detail_matkul_page.dart @@ -8,7 +8,9 @@ part of '_pages.dart'; /// ```; class DetailMatkulPage extends StatefulWidget { const DetailMatkulPage({ - required this.courseId, required this.courseCode, super.key, + required this.courseId, + required this.courseCode, + super.key, }); final int courseId; @@ -57,12 +59,10 @@ class _DetailMatkulPageState extends BaseStateful { bool get _isBottom { if (!scrollController.hasClients) { - print('no client'); return false; } final maxScroll = scrollController.position.maxScrollExtent; final currentScroll = scrollController.offset; - print(currentScroll >= (maxScroll * 0.9)); return currentScroll >= (maxScroll * 0.9); } @@ -114,7 +114,7 @@ class _DetailMatkulPageState extends BaseStateful { TitleAndBookMark(course: course), const HeightSpace(24), if (course.tags?.isNotEmpty ?? false) - _buildMatkulTag(course), + _buildMatkulTag(course), const HeightSpace(16), _buildMatkulDescription(course), const HeightSpace(32), @@ -125,10 +125,22 @@ class _DetailMatkulPageState extends BaseStateful { const HeightSpace(16), if (course.reviewCount! > 3) InkWell( - onTap: () => nav.goToAllReviewMatkulPage( - courseId: widget.courseId, - courseCode: widget.courseCode, - ), + onTap: () { + nav.goToAllReviewMatkulPage( + courseId: widget.courseId, + courseCode: widget.courseCode, + ); + MixpanelService.track( + 'view_all_reviews', + params: { + 'course_id': course.code.toString(), + 'course_name': course.name.toString(), + 'review_count': course.reviewCount.toString(), + 'course_rating_avg': + course.ratingAverage.toString(), + }, + ); + }, child: Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -170,12 +182,12 @@ class _DetailMatkulPageState extends BaseStateful { children: course.tags! .map( (e) => Padding( - padding: const EdgeInsets.only(right: 8, bottom: 8), - child: Tag( - label: e, - ), - ), - ) + padding: const EdgeInsets.only(right: 8, bottom: 8), + child: Tag( + label: e, + ), + ), + ) .toList(), ); } @@ -227,6 +239,15 @@ class _DetailMatkulPageState extends BaseStateful { review: review, onLiked: () { reviewCourseRM.state.like(review); + MixpanelService.track( + 'like_review', + params: { + 'course_id': review.courseCode.toString(), + 'course_name': review.courseName.toString(), + 'review_count': review.likesCount.toString(), + 'course_rating_avg': review.ratingAverage.toString(), + }, + ); }, ); }, diff --git a/lib/features/matkul/detail/presentation/widgets/review_card.dart b/lib/features/matkul/detail/presentation/widgets/review_card.dart index 8a078bd..a492059 100644 --- a/lib/features/matkul/detail/presentation/widgets/review_card.dart +++ b/lib/features/matkul/detail/presentation/widgets/review_card.dart @@ -2,7 +2,8 @@ part of '_widgets.dart'; class ReviewCard extends StatelessWidget { const ReviewCard({ - required this.review, super.key, + required this.review, + super.key, this.imgUrl, this.onLiked, this.status, @@ -75,7 +76,8 @@ class ReviewCard extends StatelessWidget { ? TagStatus.pending : TagStatus.rejected, ), - if (status == null && review.rankTop20 != null && + if (status == null && + review.rankTop20 != null && review.rankTop20! > 0 && review.rankTop20! < 21) TagLeaderboard( @@ -94,8 +96,7 @@ class ReviewCard extends StatelessWidget { PopupMenu( username: review.author.toString(), isAnonymous: review.isAnonym ?? false, - reviewId: review.id!, - // userId: review.author, + review: review, ), Container(), ], @@ -176,9 +177,9 @@ class ReviewCard extends StatelessWidget { // color: likesCountColor, ), ), - ) + ), ], - ) + ), ], ), ); @@ -187,20 +188,22 @@ class ReviewCard extends StatelessWidget { class PopupMenu extends StatelessWidget { const PopupMenu({ - required this.username, required this.reviewId, super.key, + required this.username, + required this.review, + super.key, this.isAnonymous = false, }); final String username; final bool isAnonymous; - final int reviewId; + final ReviewModel review; @override Widget build(BuildContext context) { return PopupMenuButton( padding: EdgeInsets.zero, iconSize: 18, - onSelected: (value) => _onSelected(context, value), + onSelected: (value) => _onSelected(context, value, review), itemBuilder: (context) => [ _buildItem( value: 1, @@ -238,13 +241,22 @@ class PopupMenu extends StatelessWidget { ); } - void _onSelected(BuildContext context, int value) { + void _onSelected(BuildContext context, int value, ReviewModel review) { switch (value) { case 1: + MixpanelService.track( + 'report_review', + params: { + 'course_id': review.courseCode.toString(), + 'course_name': review.courseName.toString(), + 'previous_likes': review.likesCount.toString(), + 'score_given_by_review': review.courseReviewCount.toString(), + }, + ); LaunchServices.openEmail( 'team@ristek.cs.ui.ac.id', ''' -Report User Content for ${isAnonymous ? 'Review id $reviewId' : username}''', +Report User Content for ${isAnonymous ? 'Review id ${review.id}' : username}''', 'enter report message', ); default: diff --git a/lib/features/matkul/form/presentation/pages/_pages.dart b/lib/features/matkul/form/presentation/pages/_pages.dart index 2773534..fd02e45 100644 --- a/lib/features/matkul/form/presentation/pages/_pages.dart +++ b/lib/features/matkul/form/presentation/pages/_pages.dart @@ -15,6 +15,7 @@ import 'package:ulaskelas/features/matkul/form/presentation/states/_states.dart' import 'package:ulaskelas/features/matkul/form/presentation/widgets/_widgets.dart'; import 'package:ulaskelas/features/matkul/search/data/models/_models.dart'; import 'package:ulaskelas/features/matkul/search/presentation/widgets/_widgets.dart'; +import 'package:ulaskelas/services/_services.dart'; part 'add_review_matkul_tag_page.dart'; part 'review_matkul_form_page.dart'; diff --git a/lib/features/matkul/form/presentation/pages/review_matkul_form_page.dart b/lib/features/matkul/form/presentation/pages/review_matkul_form_page.dart index bbcfb8f..dabe3c8 100644 --- a/lib/features/matkul/form/presentation/pages/review_matkul_form_page.dart +++ b/lib/features/matkul/form/presentation/pages/review_matkul_form_page.dart @@ -4,7 +4,8 @@ part of '_pages.dart'; class ReviewMatkulFormPage extends StatefulWidget { const ReviewMatkulFormPage({ - required this.course, super.key, + required this.course, + super.key, }); final CourseModel course; @@ -132,6 +133,22 @@ class _ReviewMatkulFormPageState extends BaseStateful { await reviewFormRM.state .submitForm(widget.course.code!); await Future.delayed(const Duration(milliseconds: 150)); + MixpanelService.track( + 'write_review', + params: { + 'course_id': widget.course.code.toString(), + 'course_name': widget.course.name.toString(), + 'created_at': DateTime.now().toString(), + 'period_taking': + reviewFormStateData.semester.toString(), + 'year_taking': reviewFormStateData.year.toString(), + 'avg_rating_given': + reviewFormState.getAvgRating().toString(), + 'tags': reviewFormStateData.tagData.toString(), + 'anonymous_review': + reviewFormStateData.isAnonymous.toString(), + }, + ); reviewFormRM.state.cleanForm(); nav.pop(); await nav.replaceToReviewPendingPage(); diff --git a/lib/features/matkul/form/presentation/states/review_course_form_state.dart b/lib/features/matkul/form/presentation/states/review_course_form_state.dart index eb567e9..c1c9df1 100644 --- a/lib/features/matkul/form/presentation/states/review_course_form_state.dart +++ b/lib/features/matkul/form/presentation/states/review_course_form_state.dart @@ -112,6 +112,14 @@ class ReviewCourseFormState { _formData.ratingRecommended = ratingRecommended; } + double getAvgRating() { + return ((_formData.ratingBeneficial ?? 0) + + (_formData.ratingFitToCredit ?? 0) + + (_formData.ratingFitToStudyBook ?? 0) + + (_formData.ratingRecommended ?? 0) + + (_formData.ratingUnderstandable ?? 0)) / 5; + } + /// Cleaning form when success submitting form void cleanForm() { _formData = ReviewMatkulData(); diff --git a/lib/features/profile/presentation/pages/profile_page.dart b/lib/features/profile/presentation/pages/profile_page.dart index d8bdfca..a97e2a5 100644 --- a/lib/features/profile/presentation/pages/profile_page.dart +++ b/lib/features/profile/presentation/pages/profile_page.dart @@ -46,34 +46,32 @@ class _ProfilePageState extends BaseStateful { vertical: 10, ), child: Column( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - const SizedBox(height: 42), - Icon( - Icons.account_circle, - size: 140, - color: Colors.grey[300], - ), - // CircleAvatar( - // radius: 100, - // backgroundColor: Colors.grey[300], - // ), - const SizedBox(height: 34), - ProfileData( - 'Nama', - profileRM.state.profile.name.toString(), - ), - // TODO(pawpaw): angkatan. - ProfileData( - 'Angkatan', - profileRM.state.profile.generation.toString(), - ), - ProfileData( - 'Jurusan', - profileRM.state.profile.studyProgram.toString(), - ), - const Expanded( - child: SizedBox(), + children: [ + Expanded( + child: ListView( + children: [ + const SizedBox(height: 42), + Icon( + Icons.account_circle, + size: 140, + color: Colors.grey[300], + ), + const SizedBox(height: 24), + ProfileData( + 'Nama', + profileRM.state.profile.name.toString(), + ), + // TODO(pawpaw): angkatan. + ProfileData( + 'Angkatan', + profileRM.state.profile.generation.toString(), + ), + ProfileData( + 'Jurusan', + profileRM.state.profile.studyProgram.toString(), + ), + ], + ), ), Center( child: InkWell( @@ -89,7 +87,7 @@ class _ProfilePageState extends BaseStateful { ), ), ), - const HeightSpace(30), + const HeightSpace(24), Center( child: InkWell( onTap: () { @@ -104,7 +102,7 @@ class _ProfilePageState extends BaseStateful { ), ), ), - const HeightSpace(30), + const HeightSpace(24), SecondaryButton( width: double.infinity, text: 'Keluar', diff --git a/lib/main_page.dart b/lib/main_page.dart index 600e94e..60aabde 100644 --- a/lib/main_page.dart +++ b/lib/main_page.dart @@ -3,6 +3,7 @@ import 'package:flutter/material.dart'; import 'package:ristek_material_component/ristek_material_component.dart'; import 'package:ulaskelas/features/kalkulator/presentation/pages/_pages.dart'; +import 'package:ulaskelas/services/_services.dart'; import 'core/bases/states/_states.dart'; import 'features/home/presentation/pages/_pages.dart'; import 'features/leaderboard/presentation/pages/_pages.dart'; @@ -70,7 +71,19 @@ class _MainPageState extends BaseStateful { Widget? _convexNavigation() { return RistekBotNavBar( initialActiveIndex: _selectedIndex, - onTap: (int index) => setState(() => _selectedIndex = index), + onTap: (int index) { + switch (index) { + case 1: + MixpanelService.track('open_courses'); + case 2: + MixpanelService.track('open_klasemen'); + case 3: + MixpanelService.track('open_calculator'); + case 4: + MixpanelService.track('open_profile'); + } + setState(() => _selectedIndex = index); + }, items: const [ RistekBotNavItem( icon: Icons.home,