diff --git a/android/app/build.gradle b/android/app/build.gradle index d7a5345..5fdfde1 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -24,6 +24,7 @@ if (flutterVersionName == null) { android { namespace "com.example.smartfit_app_mobile" + //compileSdkVersion localProperties.getProperty('flutter.compileSdkVersion').toInteger() compileSdkVersion flutter.compileSdkVersion ndkVersion flutter.ndkVersion @@ -45,8 +46,11 @@ android { applicationId "com.example.smartfit_app_mobile" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. - minSdkVersion flutter.minSdkVersion + //minSdkVersion flutter.minSdkVersion + minSdkVersion localProperties.getProperty('flutter.minSdkVersion').toInteger() + //minSdkVersion localProperties.getProperty('flutter.minSdkVersion').toInteger() targetSdkVersion flutter.targetSdkVersion + //argetSdkVersion localProperties.getProperty('flutter.targetSdkVersion').toInteger() versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/android/build.gradle b/android/build.gradle index f7eb7f6..5264885 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.7.10' + ext.kotlin_version = '1.9.0' repositories { google() mavenCentral() diff --git a/lib/View/home/home_view.dart b/lib/View/home/home_view.dart index 64d0df2..069099b 100644 --- a/lib/View/home/home_view.dart +++ b/lib/View/home/home_view.dart @@ -1,4 +1,4 @@ - import 'package:dotted_dashed_line/dotted_dashed_line.dart'; +import 'package:dotted_dashed_line/dotted_dashed_line.dart'; import 'package:smartfit_app_mobile/common_widget/round_button.dart'; import 'package:fl_chart/fl_chart.dart'; import 'package:flutter/material.dart'; @@ -43,9 +43,9 @@ class _HomeViewState extends State { "progress": 0.7 }, ]; - List showingTooltipOnSpots = [21]; + List showingTooltipOnSpots = [0]; - List allSpots = [FlSpot(0, 20)]; + List allSpots = [FlSpot(0, 20)]; List waterArr = [ {"title": "6am - 8am", "subtitle": "600ml"}, @@ -74,7 +74,7 @@ class _HomeViewState extends State { ), dotData: FlDotData(show: false), gradient: LinearGradient( - colors: TColor.secondaryG , + colors: TColor.secondaryG, ), ), ]; @@ -296,7 +296,8 @@ class _HomeViewState extends State { child: Text( "78 BPM", style: TextStyle( - color: TColor.primaryColor1.withOpacity(0.7), + color: + TColor.primaryColor1.withOpacity(0.7), fontWeight: FontWeight.w700, fontSize: 18), ), @@ -871,7 +872,6 @@ class _HomeViewState extends State { SizedBox( height: media.width * 0.05, ), - SizedBox( height: media.width * 0.1, ), @@ -889,7 +889,6 @@ class _HomeViewState extends State { }); } - List showingSections() { return List.generate( 2, @@ -1038,28 +1037,28 @@ class _HomeViewState extends State { Widget text; switch (value.toInt()) { case 1: - text = Text('Dim', style: style); + text = Text('Dim', style: style); break; case 2: - text = Text('Lun', style: style); + text = Text('Lun', style: style); break; case 3: - text = Text('Mar', style: style); + text = Text('Mar', style: style); break; case 4: - text = Text('Mer', style: style); + text = Text('Mer', style: style); break; case 5: - text = Text('Jeu', style: style); + text = Text('Jeu', style: style); break; case 6: - text = Text('Ven', style: style); + text = Text('Ven', style: style); break; case 7: - text = Text('Sam', style: style); + text = Text('Sam', style: style); break; default: - text = Text('', style: style); + text = Text('', style: style); break; } @@ -1069,4 +1068,4 @@ class _HomeViewState extends State { child: text, ); } -} \ No newline at end of file +}