diff --git a/.dhiwise/config b/.dhiwise/config index 580683ab..6f3a9c14 100644 --- a/.dhiwise/config +++ b/.dhiwise/config @@ -1,3 +1,3 @@ TOKEN = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyIjp7ImlkIjoiNjU3ZmYzZmVjMzBjMTkwMDFjZTZiNTM4IiwiX2lkIjoiNjU3ZmYzZmVjMzBjMTkwMDFjZTZiNTM4In0sImNvbXBhbnlJZCI6IjY1N2ZmM2ZlYzMwYzE5MDAxY2U2YjUzYSIsImFwcGxpY2F0aW9uSWQiOiI2NTdmZmI0NGE1ZDdiNDAwMjIzMGEwZWMiLCJpYXQiOjE3MDI4ODYyMTJ9.24JeUo8jgiAwKQkeKhwu49qjWT2CnXAoQrDmduDL0d0 SEMANTIC_VERSION = 1.0 -VERSION_NUMBER = 6 \ No newline at end of file +VERSION_NUMBER = 7 \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index fa6d7bbd..c203d7a8 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index b0138108..54e8557b 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index a52aa871..c2daa200 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 8fb53f0a..9c8bd922 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 56873244..402489a4 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/build.gradle b/android/build.gradle index d7f8aafa..5670189c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -26,6 +26,6 @@ subprojects { project.evaluationDependsOn(':app') } -tasks.register("clean", Delete) { +task clean(type: Delete) { delete rootProject.buildDir } diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png index 332dbb67..69ce7998 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png index 45ded3ac..3e89b519 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png index b96fc7b4..9f5585ea 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png index d926afb9..453f8a4d 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png index e4068b4c..f35b7ecf 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png index 9ce15c12..257916c7 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png index ff22963b..98091c4d 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png index b96fc7b4..9f5585ea 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png index 5d461666..3c4c0d4b 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png index ff6ce24d..000b9d1c 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png index ff6ce24d..000b9d1c 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png index 3d862ddb..f9ca3c52 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png index 92d35b37..24c1cc5d 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png index 6b9abf13..6dbba678 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png index ff86a75e..a30c757e 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/lib/presentation/additional_information_screen/additional_information_screen.dart b/lib/presentation/additional_information_screen/additional_information_screen.dart index 29ee4d52..c1cc425f 100644 --- a/lib/presentation/additional_information_screen/additional_information_screen.dart +++ b/lib/presentation/additional_information_screen/additional_information_screen.dart @@ -46,6 +46,7 @@ class AdditionalInformationScreen extends StatelessWidget { Spacer(), CustomOutlinedButton( text: "lbl2".tr.toUpperCase(), + buttonStyle: CustomButtonStyles.outlinePrimaryTL15, onPressed: () { showSuccessMessage(context); }), diff --git a/lib/presentation/allergies_screen/allergies_screen.dart b/lib/presentation/allergies_screen/allergies_screen.dart index 7a2c3cdf..6b79520c 100644 --- a/lib/presentation/allergies_screen/allergies_screen.dart +++ b/lib/presentation/allergies_screen/allergies_screen.dart @@ -53,6 +53,7 @@ class AllergiesScreen extends StatelessWidget { Spacer(flex: 63), CustomOutlinedButton( text: "lbl2".tr.toUpperCase(), + buttonStyle: CustomButtonStyles.outlinePrimaryTL15, onPressed: () { navigateToMedicine(context); }), diff --git a/lib/presentation/blood_pressure_screen/blood_pressure_screen.dart b/lib/presentation/blood_pressure_screen/blood_pressure_screen.dart index ba95be5b..1af6b72b 100644 --- a/lib/presentation/blood_pressure_screen/blood_pressure_screen.dart +++ b/lib/presentation/blood_pressure_screen/blood_pressure_screen.dart @@ -108,6 +108,7 @@ class BloodPressureScreen extends StatelessWidget { CustomOutlinedButton( text: "lbl2".tr.toUpperCase(), margin: EdgeInsets.symmetric(horizontal: 4.h), + buttonStyle: CustomButtonStyles.outlinePrimaryTL15, onPressed: () { navigateToSports(context); }), diff --git a/lib/presentation/body_circumferences_screen/body_circumferences_screen.dart b/lib/presentation/body_circumferences_screen/body_circumferences_screen.dart index aa980fda..5dc43036 100644 --- a/lib/presentation/body_circumferences_screen/body_circumferences_screen.dart +++ b/lib/presentation/body_circumferences_screen/body_circumferences_screen.dart @@ -76,6 +76,7 @@ class BodyCircumferencesScreen extends StatelessWidget { Spacer(), CustomOutlinedButton( text: "lbl2".tr.toUpperCase(), + buttonStyle: CustomButtonStyles.outlinePrimaryTL15, onPressed: () { navigateToWeight(context); }), diff --git a/lib/presentation/city_of_living_screen/city_of_living_screen.dart b/lib/presentation/city_of_living_screen/city_of_living_screen.dart index 800f4c8f..e0f509e6 100644 --- a/lib/presentation/city_of_living_screen/city_of_living_screen.dart +++ b/lib/presentation/city_of_living_screen/city_of_living_screen.dart @@ -101,6 +101,7 @@ class CityOfLivingScreen extends StatelessWidget { Spacer(flex: 65), CustomOutlinedButton( text: "lbl2".tr.toUpperCase(), + buttonStyle: CustomButtonStyles.outlinePrimaryTL15, onPressed: () { navigateToCircumferences(context); }), diff --git a/lib/presentation/date_of_birth_screen/date_of_birth_screen.dart b/lib/presentation/date_of_birth_screen/date_of_birth_screen.dart index b60c29c0..d21f1ad7 100644 --- a/lib/presentation/date_of_birth_screen/date_of_birth_screen.dart +++ b/lib/presentation/date_of_birth_screen/date_of_birth_screen.dart @@ -40,6 +40,7 @@ class DateOfBirthScreen extends StatelessWidget { Spacer(flex: 60), CustomOutlinedButton( text: "lbl2".tr.toUpperCase(), + buttonStyle: CustomButtonStyles.outlinePrimaryTL15, onPressed: () { navigateToCity(context); }), diff --git a/lib/presentation/favorite_foods_screen/favorite_foods_screen.dart b/lib/presentation/favorite_foods_screen/favorite_foods_screen.dart index 095819f1..c90f3c92 100644 --- a/lib/presentation/favorite_foods_screen/favorite_foods_screen.dart +++ b/lib/presentation/favorite_foods_screen/favorite_foods_screen.dart @@ -48,6 +48,7 @@ class FavoriteFoodsScreen extends StatelessWidget { SizedBox(height: 27.v), CustomOutlinedButton( text: "lbl2".tr.toUpperCase(), + buttonStyle: CustomButtonStyles.outlinePrimaryTL15, onPressed: () { navigateToSchedule(context); }), diff --git a/lib/presentation/favorite_sports_screen/favorite_sports_screen.dart b/lib/presentation/favorite_sports_screen/favorite_sports_screen.dart index c665f625..bacdd269 100644 --- a/lib/presentation/favorite_sports_screen/favorite_sports_screen.dart +++ b/lib/presentation/favorite_sports_screen/favorite_sports_screen.dart @@ -41,6 +41,7 @@ class FavoriteSportsScreen extends StatelessWidget { Spacer(flex: 67), CustomOutlinedButton( text: "lbl2".tr.toUpperCase(), + buttonStyle: CustomButtonStyles.outlinePrimaryTL15, onPressed: () { navigateToFoods(context); }), diff --git a/lib/presentation/gender_screen/gender_screen.dart b/lib/presentation/gender_screen/gender_screen.dart index df73a593..3ccfaa79 100644 --- a/lib/presentation/gender_screen/gender_screen.dart +++ b/lib/presentation/gender_screen/gender_screen.dart @@ -41,6 +41,7 @@ class GenderScreen extends StatelessWidget { Spacer(flex: 66), CustomOutlinedButton( text: "lbl2".tr.toUpperCase(), + buttonStyle: CustomButtonStyles.outlinePrimaryTL15, onPressed: () { navigateToDate(context); }), diff --git a/lib/presentation/language_select_screen/language_select_screen.dart b/lib/presentation/language_select_screen/language_select_screen.dart index ce92f3ec..0218e18a 100644 --- a/lib/presentation/language_select_screen/language_select_screen.dart +++ b/lib/presentation/language_select_screen/language_select_screen.dart @@ -30,7 +30,7 @@ class LanguageSelectScreen extends StatelessWidget { height: 50.adaptSize, width: 50.adaptSize), SizedBox(height: 20.v), - _buildProgressIndicatorSection(context), + _buildProgressIndicator(context), SizedBox(height: 20.v), Container( width: 262.h, @@ -66,11 +66,11 @@ class LanguageSelectScreen extends StatelessWidget { }), Spacer(flex: 63) ])), - bottomNavigationBar: _buildContinueButtonSection(context))); + bottomNavigationBar: _buildContinueButton(context))); } /// Section Widget - Widget _buildProgressIndicatorSection(BuildContext context) { + Widget _buildProgressIndicator(BuildContext context) { return Container( width: 343.h, padding: EdgeInsets.symmetric(horizontal: 4.h, vertical: 3.v), @@ -87,7 +87,7 @@ class LanguageSelectScreen extends StatelessWidget { } /// Section Widget - Widget _buildContinueButtonSection(BuildContext context) { + Widget _buildContinueButton(BuildContext context) { return CustomOutlinedButton( text: "lbl2".tr.toUpperCase(), margin: EdgeInsets.only(left: 16.h, right: 16.h, bottom: 50.v), diff --git a/lib/presentation/medicine_intake_screen/medicine_intake_screen.dart b/lib/presentation/medicine_intake_screen/medicine_intake_screen.dart index dbb66208..05de8a3b 100644 --- a/lib/presentation/medicine_intake_screen/medicine_intake_screen.dart +++ b/lib/presentation/medicine_intake_screen/medicine_intake_screen.dart @@ -60,6 +60,7 @@ class MedicineIntakeScreen extends StatelessWidget { Spacer(), CustomOutlinedButton( text: "lbl2".tr.toUpperCase(), + buttonStyle: CustomButtonStyles.outlinePrimaryTL15, onPressed: () { navigateToPressure(context); }), diff --git a/lib/presentation/schedule_screen/schedule_screen.dart b/lib/presentation/schedule_screen/schedule_screen.dart index 827991fd..1b20601a 100644 --- a/lib/presentation/schedule_screen/schedule_screen.dart +++ b/lib/presentation/schedule_screen/schedule_screen.dart @@ -39,6 +39,7 @@ class ScheduleScreen extends StatelessWidget { Spacer(), CustomOutlinedButton( text: "lbl2".tr.toUpperCase(), + buttonStyle: CustomButtonStyles.outlinePrimaryTL15, onPressed: () { navigateToAdditional(context); }), diff --git a/lib/presentation/weight_screen/weight_screen.dart b/lib/presentation/weight_screen/weight_screen.dart index 804f5812..78db840a 100644 --- a/lib/presentation/weight_screen/weight_screen.dart +++ b/lib/presentation/weight_screen/weight_screen.dart @@ -50,6 +50,7 @@ class WeightScreen extends StatelessWidget { Spacer(), CustomOutlinedButton( text: "lbl2".tr.toUpperCase(), + buttonStyle: CustomButtonStyles.outlinePrimaryTL15, onPressed: () { navigateToAllergies(context); }),