Added locales and fixed app icon

.dhiwise/config

@@ -1,3 +1,3 @@
 TOKEN = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyIjp7ImlkIjoiNjU3ZmYzZmVjMzBjMTkwMDFjZTZiNTM4IiwiX2lkIjoiNjU3ZmYzZmVjMzBjMTkwMDFjZTZiNTM4In0sImNvbXBhbnlJZCI6IjY1N2ZmM2ZlYzMwYzE5MDAxY2U2YjUzYSIsImFwcGxpY2F0aW9uSWQiOiI2NTdmZmI0NGE1ZDdiNDAwMjIzMGEwZWMiLCJpYXQiOjE3MDI4ODYyMTJ9.24JeUo8jgiAwKQkeKhwu49qjWT2CnXAoQrDmduDL0d0
 SEMANTIC_VERSION = 1.0
-VERSION_NUMBER = 7
+VERSION_NUMBER = 9

android/build.gradle

@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

lib/localization/en_us/en_us_translations.dart

@@ -1,59 +1,64 @@
 final Map<String, String> enUs = {
   // date_of_birth Screen
-  "lbl": "Дата Рождения", "lbl_01_01_2000": "01.01.2000",
+  "date_of_birth": "Дата Рождения",
 
   // city_of_living Screen
-  "lbl4": "Страна", "lbl5": "Россия", "lbl6": "Город", "lbl7": "Москва",
+  "country": "Страна", "Russia": "Россия", "city": "Город", "Moscow": "Москва",
-  "msg": "Место проживания",
+  "place_of_living": "Место проживания",
 
   // body_circumferences Screen
-  "lbl10": "Обхват бедр", "lbl8": "Обхват груди", "lbl9": "Обхват талии",
+  "hip_circumference": "Обхват бедр", "chest_circumference": "Обхват груди",
-  "msg2": "Первичные замеры",
+  "waist_circumference": "Обхват талии",
+  "initial_measurements": "Первичные замеры",
 
   // weight Screen
-  "lbl11": "Замер Веса", "lbl12": "Ваш вес:", "lbl_70": "70",
+  "weight_measurements": "Замер Веса", "your_weight": "Ваш вес:",
+  "lbl_70": "70",
 
   // allergies Screen
-  "msg3": "Наличие аллергии",
+  "allergies_presence": "Наличие аллергии",
 
   // medicine_intake Screen
-  "msg6": "Принимаете ли вы лекарства или бады?",
+  "do_you_take_pills": "Принимаете ли вы лекарства или бады?",
 
   // gender Screen
-  "lbl13": "Ваш пол?",
+  "your_gender": "Ваш пол?",
 
   // blood_pressure Screen
-  "lbl14": "Нет",
+  "no": "Нет",
-  "msg10": "Есть ли у вас склонность к гипертании?",
+  "do_you_have_hypertension_tendency": "Есть ли у вас склонность к гипертонии?",
-  "msg7": "Ваше артериальное давление?",
+  "your_blood_pressure": "Ваше артериальное давление?",
-  "msg8": "Средние показатели давления:",
+  "average_pressure": "Средние показатели давления:",
-  "msg9": "Есть ли у вас склонность к гипо?",
+  "do_you_have_hypotension_tendency": "Есть ли у вас склонность к гипотонии?",
 
   // favorite_sports Screen
-  "msg11": "Ваши спортивные увлечения?",
+  "your_favorite_sports": "Ваши спортивные увлечения?",
 
   // favorite_foods Screen
-  "lbl15": "Люблю продукты:",
+  "favorite_foods": "Люблю продукты:",
-  "msg12": "Ваши любимые/нелюбимые продукты питания?",
+  "favorite_unfavorite_foods": "Ваши любимые/нелюбимые продукты питания?",
-  "msg13": "Нелюбимые продукты:",
+  "unfavorite_foods": "Нелюбимые продукты:",
 
   // schedule Screen
-  "lbl16": "Ваш режим дня?",
+  "your_schedule": "Ваш режим дня?",
-  "msg14":
+  "tell_your_schedule":
       "Расскажите в свободной форме о том как просыпаетесь, когда едите, когда ложитесь спать:",
 
   // additional_information Screen
-  "msg15": "Дополнительная информация:",
+  "additional_information": "Дополнительная информация:",
-  "msg16": "Введите любую дополнительную информацию на своё усмотрение:",
+  "enter_additional_information":
+      "Введите любую дополнительную информацию на своё усмотрение:",
 
   // language_select Screen
-  "lbl_english": "English", "msg17": "Предпочетаемый язык общения?",
+  "lbl_english": "English",
+  "preferred_language": "Предпочетаемый язык общения?",
 
   // Common String
-  "lbl2": "Продолжить", "lbl3": "Пропустить", "lbl_60": "60", "lbl_90": "90",
+  "continue": "Продолжить", "skip": "Пропустить",
-  "msg4": "Заполните информацию:", "msg5": "Введите информацию...",
+  "fill_in_information": "Заполните информацию:",
+  "enter_information": "Введите информацию...",
 
 // Network Error String
-  "msg_network_err": "Network Error",
+  "msg_network_err": "Сетевая ошибка!",
-  "msg_something_went_wrong": "Something Went Wrong!",
+  "msg_something_went_wrong": "Что то пошло не так!",
 };

lib/presentation/additional_information_screen/additional_information_screen.dart

@@ -36,7 +36,7 @@ class AdditionalInformationScreen extends StatelessWidget {
                   SizedBox(height: 20.v),
                   SizedBox(
                       width: 192.h,
-                      child: Text("msg15".tr,
+                      child: Text("additional_information".tr,
                           maxLines: 2,
                           overflow: TextOverflow.ellipsis,
                           textAlign: TextAlign.center,
@@ -45,13 +45,13 @@ class AdditionalInformationScreen extends StatelessWidget {
                   _buildNinetyThree(context),
                   Spacer(),
                   CustomOutlinedButton(
-                      text: "lbl2".tr.toUpperCase(),
+                      text: "continue".tr.toUpperCase(),
                       buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
                       onPressed: () {
                         showSuccessMessage(context);
                       }),
                   SizedBox(height: 17.v),
-                  Text("lbl3".tr, style: theme.textTheme.bodyLarge)
+                  Text("skip".tr, style: theme.textTheme.bodyLarge)
                 ]))));
   }
 
@@ -95,14 +95,15 @@ class AdditionalInformationScreen extends StatelessWidget {
               alignment: Alignment.topLeft,
               child: Padding(
                   padding: EdgeInsets.only(left: 10.h, top: 69.v),
-                  child: Text("msg5".tr, style: theme.textTheme.bodyLarge))),
+                  child: Text("enter_information".tr,
+                      style: theme.textTheme.bodyLarge))),
           Align(
               alignment: Alignment.center,
               child: Column(mainAxisSize: MainAxisSize.min, children: [
                 Container(
                     width: 294.h,
                     margin: EdgeInsets.only(left: 24.h, right: 23.h),
-                    child: Text("msg16".tr,
+                    child: Text("enter_additional_information".tr,
                         maxLines: 2,
                         overflow: TextOverflow.ellipsis,
                         textAlign: TextAlign.center,

lib/presentation/allergies_screen/allergies_screen.dart

@@ -47,18 +47,19 @@ class AllergiesScreen extends StatelessWidget {
                               valueColor: AlwaysStoppedAnimation<Color>(
                                   appTheme.blueA400)))),
                   SizedBox(height: 22.v),
-                  Text("msg3".tr, style: CustomTextStyles.headlineSmallMulish),
+                  Text("allergies_presence".tr,
+                      style: CustomTextStyles.headlineSmallMulish),
                   Spacer(flex: 36),
                   _buildNinetyThree(context),
                   Spacer(flex: 63),
                   CustomOutlinedButton(
-                      text: "lbl2".tr.toUpperCase(),
+                      text: "continue".tr.toUpperCase(),
                       buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
                       onPressed: () {
                         navigateToMedicine(context);
                       }),
                   SizedBox(height: 17.v),
-                  Text("lbl3".tr, style: theme.textTheme.bodyLarge)
+                  Text("skip".tr, style: theme.textTheme.bodyLarge)
                 ]))));
   }
 
@@ -79,14 +80,15 @@ class AllergiesScreen extends StatelessWidget {
   /// Section Widget
   Widget _buildNinetyThree(BuildContext context) {
     return Column(children: [
-      Text("msg4".tr, style: CustomTextStyles.titleMediumSegoeUI),
+      Text("fill_in_information".tr,
+          style: CustomTextStyles.titleMediumSegoeUI),
       SizedBox(height: 2.v),
       BlocSelector<AllergiesBloc, AllergiesState, TextEditingController?>(
           selector: (state) => state.enterInformationController,
           builder: (context, enterInformationController) {
             return CustomTextFormField(
                 controller: enterInformationController,
-                hintText: "msg5".tr,
+                hintText: "enter_information".tr,
                 textInputAction: TextInputAction.done,
                 maxLines: 8);
           })

lib/presentation/blood_pressure_screen/blood_pressure_screen.dart

@@ -53,7 +53,7 @@ class BloodPressureScreen extends StatelessWidget {
                   SizedBox(height: 21.v),
                   SizedBox(
                       width: 224.h,
-                      child: Text("msg7".tr,
+                      child: Text("your_blood_pressure".tr,
                           maxLines: 2,
                           overflow: TextOverflow.ellipsis,
                           textAlign: TextAlign.center,
@@ -61,7 +61,8 @@ class BloodPressureScreen extends StatelessWidget {
                   SizedBox(height: 77.v),
                   _buildThirtyThree(context),
                   SizedBox(height: 22.v),
-                  Text("msg9".tr, style: theme.textTheme.bodyLarge),
+                  Text("do_you_have_hypotension_tendency".tr,
+                      style: theme.textTheme.bodyLarge),
                   SizedBox(height: 2.v),
                   Padding(
                       padding: EdgeInsets.symmetric(horizontal: 4.h),
@@ -75,7 +76,8 @@ class BloodPressureScreen extends StatelessWidget {
                                 textInputAction: TextInputAction.done);
                           })),
                   SizedBox(height: 22.v),
-                  Text("msg10".tr, style: theme.textTheme.bodyLarge),
+                  Text("do_you_have_hypertension_tendency".tr,
+                      style: theme.textTheme.bodyLarge),
                   SizedBox(height: 2.v),
                   Padding(
                       padding: EdgeInsets.symmetric(horizontal: 4.h),
@@ -94,7 +96,7 @@ class BloodPressureScreen extends StatelessWidget {
                                         imagePath: ImageConstant.imgFavorite,
                                         height: 12.adaptSize,
                                         width: 12.adaptSize)),
-                                hintText: "lbl14".tr,
+                                hintText: "no".tr,
                                 items:
                                     bloodPressureModelObj?.dropdownItemList ??
                                         [],
@@ -106,14 +108,14 @@ class BloodPressureScreen extends StatelessWidget {
                           })),
                   Spacer(),
                   CustomOutlinedButton(
-                      text: "lbl2".tr.toUpperCase(),
+                      text: "continue".tr.toUpperCase(),
                       margin: EdgeInsets.symmetric(horizontal: 4.h),
                       buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
                       onPressed: () {
                         navigateToSports(context);
                       }),
                   SizedBox(height: 17.v),
-                  Text("lbl3".tr, style: theme.textTheme.bodyLarge)
+                  Text("skip".tr, style: theme.textTheme.bodyLarge)
                 ]))));
   }
 
@@ -137,14 +139,14 @@ class BloodPressureScreen extends StatelessWidget {
         margin: EdgeInsets.only(right: 1.h),
         padding: EdgeInsets.symmetric(horizontal: 3.h),
         child: Column(children: [
-          Text("msg8".tr, style: theme.textTheme.bodyLarge),
+          Text("average_pressure".tr, style: theme.textTheme.bodyLarge),
           SizedBox(height: 2.v),
           BlocSelector<BloodPressureBloc, BloodPressureState,
                   TextEditingController?>(
               selector: (state) => state.valueController,
               builder: (context, valueController) {
                 return CustomTextFormField(
-                    controller: valueController, hintText: "lbl_90".tr);
+                    controller: valueController, hintText: "90".tr);
               })
         ]));
   }

lib/presentation/body_circumferences_screen/body_circumferences_screen.dart

@@ -47,22 +47,24 @@ class BodyCircumferencesScreen extends StatelessWidget {
                               valueColor: AlwaysStoppedAnimation<Color>(
                                   appTheme.blueA400)))),
                   SizedBox(height: 39.v),
-                  Text("msg2".tr, style: theme.textTheme.headlineSmall),
+                  Text("initial_measurements".tr,
+                      style: theme.textTheme.headlineSmall),
                   SizedBox(height: 93.v),
                   _buildTwentySeven(context),
                   SizedBox(height: 19.v),
-                  Text("lbl9".tr, style: theme.textTheme.bodyLarge),
+                  Text("waist_circumference".tr,
+                      style: theme.textTheme.bodyLarge),
                   SizedBox(height: 5.v),
                   BlocSelector<BodyCircumferencesBloc, BodyCircumferencesState,
                           TextEditingController?>(
                       selector: (state) => state.valueController1,
                       builder: (context, valueController1) {
                         return CustomTextFormField(
-                            controller: valueController1,
+                            controller: valueController1, hintText: "60".tr);
-                            hintText: "lbl_60".tr);
                       }),
                   SizedBox(height: 21.v),
-                  Text("lbl10".tr, style: theme.textTheme.bodyLarge),
+                  Text("hip_circumference".tr,
+                      style: theme.textTheme.bodyLarge),
                   SizedBox(height: 3.v),
                   BlocSelector<BodyCircumferencesBloc, BodyCircumferencesState,
                           TextEditingController?>(
@@ -70,18 +72,18 @@ class BodyCircumferencesScreen extends StatelessWidget {
                       builder: (context, valueController2) {
                         return CustomTextFormField(
                             controller: valueController2,
-                            hintText: "lbl_90".tr,
+                            hintText: "90".tr,
                             textInputAction: TextInputAction.done);
                       }),
                   Spacer(),
                   CustomOutlinedButton(
-                      text: "lbl2".tr.toUpperCase(),
+                      text: "continue".tr.toUpperCase(),
                       buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
                       onPressed: () {
                         navigateToWeight(context);
                       }),
                   SizedBox(height: 17.v),
-                  Text("lbl3".tr, style: theme.textTheme.bodyLarge)
+                  Text("skip".tr, style: theme.textTheme.bodyLarge)
                 ]))));
   }
 
@@ -102,14 +104,14 @@ class BodyCircumferencesScreen extends StatelessWidget {
   /// Section Widget
   Widget _buildTwentySeven(BuildContext context) {
     return Column(children: [
-      Text("lbl8".tr, style: theme.textTheme.bodyLarge),
+      Text("chest_circumference".tr, style: theme.textTheme.bodyLarge),
       SizedBox(height: 3.v),
       BlocSelector<BodyCircumferencesBloc, BodyCircumferencesState,
               TextEditingController?>(
           selector: (state) => state.valueController,
           builder: (context, valueController) {
             return CustomTextFormField(
-                controller: valueController, hintText: "lbl_90".tr);
+                controller: valueController, hintText: "90".tr);
           })
     ]);
   }

lib/presentation/city_of_living_screen/bloc/city_of_living_bloc.dart

@@ -38,18 +38,41 @@ class CityOfLivingBloc extends Bloc<CityOfLivingEvent, CityOfLivingState> {
   }
 
   List<SelectionPopupModel> fillDropdownItemList() {
-    return [
+    return [SelectionPopupModel(id: 1, title: "Россия", isSelected: true)];
-      SelectionPopupModel(id: 1, title: "Item One", isSelected: true),
-      SelectionPopupModel(id: 2, title: "Item Two"),
-      SelectionPopupModel(id: 3, title: "Item Three")
-    ];
   }
 
   List<SelectionPopupModel> fillDropdownItemList1() {
     return [
-      SelectionPopupModel(id: 1, title: "Item One", isSelected: true),
+      SelectionPopupModel(id: 1, title: "Москва", isSelected: true),
-      SelectionPopupModel(id: 2, title: "Item Two"),
+      SelectionPopupModel(id: 2, title: "Санкт-Петербург"),
-      SelectionPopupModel(id: 3, title: "Item Three")
+      SelectionPopupModel(id: 3, title: "Новосибирск"),
+      SelectionPopupModel(id: 4, title: "Екатеринбург"),
+      SelectionPopupModel(id: 5, title: "Нижний Новгород"),
+      SelectionPopupModel(id: 6, title: "Казань"),
+      SelectionPopupModel(id: 7, title: "Самара"),
+      SelectionPopupModel(id: 8, title: "Омск"),
+      SelectionPopupModel(id: 9, title: "Челябинск"),
+      SelectionPopupModel(id: 10, title: "Ростов-на-Дону"),
+      SelectionPopupModel(id: 11, title: "Уфа"),
+      SelectionPopupModel(id: 12, title: "Волгоград"),
+      SelectionPopupModel(id: 13, title: "Пермь"),
+      SelectionPopupModel(id: 14, title: "Красноярск"),
+      SelectionPopupModel(id: 15, title: "Воронеж"),
+      SelectionPopupModel(id: 16, title: "Саратов"),
+      SelectionPopupModel(id: 17, title: "Краснодар"),
+      SelectionPopupModel(id: 18, title: "Тольятти"),
+      SelectionPopupModel(id: 19, title: "Барнаул"),
+      SelectionPopupModel(id: 20, title: "Ижевск"),
+      SelectionPopupModel(id: 21, title: "Ульяновск"),
+      SelectionPopupModel(id: 22, title: "Тюмень"),
+      SelectionPopupModel(id: 23, title: "Иркутск"),
+      SelectionPopupModel(id: 24, title: "Хабаровск"),
+      SelectionPopupModel(id: 25, title: "Ярославль"),
+      SelectionPopupModel(id: 26, title: "Кемерово"),
+      SelectionPopupModel(id: 27, title: "Магнитогорск"),
+      SelectionPopupModel(id: 28, title: "Новокузнецк"),
+      SelectionPopupModel(id: 29, title: "Томск"),
+      SelectionPopupModel(id: 30, title: "Астрахань")
     ];
   }
 }

lib/presentation/city_of_living_screen/city_of_living_screen.dart

@@ -46,9 +46,9 @@ class CityOfLivingScreen extends StatelessWidget {
                               valueColor: AlwaysStoppedAnimation<Color>(
                                   appTheme.blueA400)))),
                   SizedBox(height: 39.v),
-                  Text("msg".tr, style: theme.textTheme.headlineSmall),
+                  Text("Moscow".tr, style: theme.textTheme.headlineSmall),
                   Spacer(flex: 34),
-                  Text("lbl4".tr, style: theme.textTheme.bodyLarge),
+                  Text("country".tr, style: theme.textTheme.bodyLarge),
                   SizedBox(height: 2.v),
                   BlocSelector<CityOfLivingBloc, CityOfLivingState,
                           CityOfLivingModel?>(
@@ -64,7 +64,7 @@ class CityOfLivingScreen extends StatelessWidget {
                                     imagePath: ImageConstant.imgFavorite,
                                     height: 12.adaptSize,
                                     width: 12.adaptSize)),
-                            hintText: "lbl5".tr,
+                            hintText: "Russia".tr,
                             items: cityOfLivingModelObj?.dropdownItemList ?? [],
                             onChanged: (value) {
                               context
@@ -73,7 +73,7 @@ class CityOfLivingScreen extends StatelessWidget {
                             });
                       }),
                   SizedBox(height: 22.v),
-                  Text("lbl6".tr, style: theme.textTheme.bodyLarge),
+                  Text("city".tr, style: theme.textTheme.bodyLarge),
                   SizedBox(height: 2.v),
                   BlocSelector<CityOfLivingBloc, CityOfLivingState,
                           CityOfLivingModel?>(
@@ -89,7 +89,7 @@ class CityOfLivingScreen extends StatelessWidget {
                                     imagePath: ImageConstant.imgFavorite,
                                     height: 12.adaptSize,
                                     width: 12.adaptSize)),
-                            hintText: "lbl7".tr,
+                            hintText: "Moscow".tr,
                             items:
                                 cityOfLivingModelObj?.dropdownItemList1 ?? [],
                             onChanged: (value) {
@@ -100,13 +100,13 @@ class CityOfLivingScreen extends StatelessWidget {
                       }),
                   Spacer(flex: 65),
                   CustomOutlinedButton(
-                      text: "lbl2".tr.toUpperCase(),
+                      text: "continue".tr.toUpperCase(),
                       buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
                       onPressed: () {
                         navigateToCircumferences(context);
                       }),
                   SizedBox(height: 17.v),
-                  Text("lbl3".tr, style: theme.textTheme.bodyLarge)
+                  Text("skip".tr, style: theme.textTheme.bodyLarge)
                 ]))));
   }
 

lib/presentation/date_of_birth_screen/date_of_birth_screen.dart

@@ -34,23 +34,22 @@ class DateOfBirthScreen extends StatelessWidget {
                     SizedBox(height: 7.v),
                     _buildProgressIndicator(context),
                     SizedBox(height: 38.v),
-                    Text("lbl".tr, style: theme.textTheme.headlineSmall),
+                    Text("date_of_birth".tr,
+                        style: theme.textTheme.headlineSmall),
                     Spacer(flex: 39),
                     _buildDateInput(context),
                     Spacer(flex: 60),
                     CustomOutlinedButton(
-                        text: "lbl2".tr.toUpperCase(),
+                        text: "continue".tr.toUpperCase(),
                         buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
                         onPressed: () {
                           navigateToCity(context);
                         }),
                     SizedBox(height: 17.v),
-                    Align(
+                    Padding(
-                        alignment: Alignment.centerLeft,
+                        padding: EdgeInsets.only(left: 8.h),
-                        child: Padding(
+                        child:
-                            padding: EdgeInsets.only(left: 8.h),
+                            Text("skip".tr, style: theme.textTheme.bodyLarge))
-                            child: Text("lbl3".tr,
-                                style: theme.textTheme.bodyLarge)))
                   ]))));
     });
   }
@@ -112,7 +111,7 @@ class DateOfBirthScreen extends StatelessWidget {
                       },
                       child: Text("lbl_01_01_2000".tr,
                           style: theme.textTheme.titleMedium))),
-              SizedBox(height: 4.v)
+              SizedBox(height: 6.v)
             ]));
   }
 

lib/presentation/favorite_foods_screen/favorite_foods_screen.dart

@@ -36,7 +36,7 @@ class FavoriteFoodsScreen extends StatelessWidget {
                   Container(
                       width: 327.h,
                       margin: EdgeInsets.only(left: 8.h, right: 7.h),
-                      child: Text("msg12".tr,
+                      child: Text("favorite_unfavorite_foods".tr,
                           maxLines: 2,
                           overflow: TextOverflow.ellipsis,
                           textAlign: TextAlign.center,
@@ -47,13 +47,13 @@ class FavoriteFoodsScreen extends StatelessWidget {
                   _buildNinetyThree1(context),
                   SizedBox(height: 27.v),
                   CustomOutlinedButton(
-                      text: "lbl2".tr.toUpperCase(),
+                      text: "continue".tr.toUpperCase(),
                       buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
                       onPressed: () {
                         navigateToSchedule(context);
                       }),
                   SizedBox(height: 17.v),
-                  Text("lbl3".tr, style: theme.textTheme.bodyLarge)
+                  Text("skip".tr, style: theme.textTheme.bodyLarge)
                 ]))));
   }
 
@@ -91,7 +91,7 @@ class FavoriteFoodsScreen extends StatelessWidget {
   /// Section Widget
   Widget _buildNinetyThree(BuildContext context) {
     return Column(children: [
-      Text("lbl15".tr, style: CustomTextStyles.titleMediumSegoeUI),
+      Text("favorite_foods".tr, style: CustomTextStyles.titleMediumSegoeUI),
       SizedBox(height: 2.v),
       BlocSelector<FavoriteFoodsBloc, FavoriteFoodsState,
               TextEditingController?>(
@@ -99,7 +99,7 @@ class FavoriteFoodsScreen extends StatelessWidget {
           builder: (context, enterinformationController) {
             return CustomTextFormField(
                 controller: enterinformationController,
-                hintText: "msg5".tr,
+                hintText: "enter_information".tr,
                 maxLines: 8);
           })
     ]);
@@ -108,7 +108,7 @@ class FavoriteFoodsScreen extends StatelessWidget {
   /// Section Widget
   Widget _buildNinetyThree1(BuildContext context) {
     return Column(children: [
-      Text("msg13".tr, style: CustomTextStyles.titleMediumSegoeUI),
+      Text("unfavorite_foods".tr, style: CustomTextStyles.titleMediumSegoeUI),
       SizedBox(height: 2.v),
       BlocSelector<FavoriteFoodsBloc, FavoriteFoodsState,
               TextEditingController?>(
@@ -116,7 +116,7 @@ class FavoriteFoodsScreen extends StatelessWidget {
           builder: (context, enterinformationController1) {
             return CustomTextFormField(
                 controller: enterinformationController1,
-                hintText: "msg5".tr,
+                hintText: "enter_information".tr,
                 textInputAction: TextInputAction.done,
                 maxLines: 8);
           })

lib/presentation/favorite_sports_screen/favorite_sports_screen.dart

@@ -35,18 +35,19 @@ class FavoriteSportsScreen extends StatelessWidget {
                       SizedBox(height: 20.v),
                       _buildProgressIndicatorSection(context),
                       SizedBox(height: 38.v),
-                      Text("msg11".tr, style: theme.textTheme.headlineSmall),
+                      Text("your_favorite_sports".tr,
+                          style: theme.textTheme.headlineSmall),
                       Spacer(flex: 32),
                       _buildNinetyThreeSection(context),
                       Spacer(flex: 67),
                       CustomOutlinedButton(
-                          text: "lbl2".tr.toUpperCase(),
+                          text: "continue".tr.toUpperCase(),
                           buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
                           onPressed: () {
                             navigateToFoods(context);
                           }),
                       SizedBox(height: 17.v),
-                      Text("lbl3".tr, style: theme.textTheme.bodyLarge),
+                      Text("skip".tr, style: theme.textTheme.bodyLarge),
                       SizedBox(height: 4.v)
                     ]))));
   }
@@ -71,7 +72,8 @@ class FavoriteSportsScreen extends StatelessWidget {
   /// Section Widget
   Widget _buildNinetyThreeSection(BuildContext context) {
     return Column(children: [
-      Text("msg4".tr, style: CustomTextStyles.titleMediumSegoeUI),
+      Text("fill_in_information".tr,
+          style: CustomTextStyles.titleMediumSegoeUI),
       SizedBox(height: 2.v),
       BlocSelector<FavoriteSportsBloc, FavoriteSportsState,
               TextEditingController?>(
@@ -79,7 +81,7 @@ class FavoriteSportsScreen extends StatelessWidget {
           builder: (context, enterinformationController) {
             return CustomTextFormField(
                 controller: enterinformationController,
-                hintText: "msg5".tr,
+                hintText: "enter_information".tr,
                 textInputAction: TextInputAction.done,
                 maxLines: 8);
           })

lib/presentation/gender_screen/gender_screen.dart

@@ -33,20 +33,21 @@ class GenderScreen extends StatelessWidget {
                     SizedBox(height: 7.v),
                     _buildProgressIndicator(context),
                     SizedBox(height: 36.v),
-                    Text("lbl13".tr, style: theme.textTheme.headlineSmall),
+                    Text("your_gender".tr,
+                        style: theme.textTheme.headlineSmall),
                     Spacer(flex: 33),
                     Text(""),
                     SizedBox(height: 20.v),
                     Text(""),
                     Spacer(flex: 66),
                     CustomOutlinedButton(
-                        text: "lbl2".tr.toUpperCase(),
+                        text: "continue".tr.toUpperCase(),
                         buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
                         onPressed: () {
                           navigateToDate(context);
                         }),
                     SizedBox(height: 17.v),
-                    Text("lbl3".tr, style: theme.textTheme.bodyLarge)
+                    Text("skip".tr, style: theme.textTheme.bodyLarge)
                   ]))));
     });
   }

lib/presentation/language_select_screen/language_select_screen.dart

@@ -30,12 +30,12 @@ class LanguageSelectScreen extends StatelessWidget {
                       height: 50.adaptSize,
                       width: 50.adaptSize),
                   SizedBox(height: 20.v),
-                  _buildProgressIndicator(context),
+                  _buildProgressIndicatorSection(context),
                   SizedBox(height: 20.v),
                   Container(
                       width: 262.h,
                       margin: EdgeInsets.only(left: 41.h, right: 39.h),
-                      child: Text("msg17".tr,
+                      child: Text("preferred_language".tr,
                           maxLines: 2,
                           overflow: TextOverflow.ellipsis,
                           textAlign: TextAlign.center,
@@ -66,11 +66,11 @@ class LanguageSelectScreen extends StatelessWidget {
                       }),
                   Spacer(flex: 63)
                 ])),
-            bottomNavigationBar: _buildContinueButton(context)));
+            bottomNavigationBar: _buildContinueButtonSection(context)));
   }
 
   /// Section Widget
-  Widget _buildProgressIndicator(BuildContext context) {
+  Widget _buildProgressIndicatorSection(BuildContext context) {
     return Container(
         width: 343.h,
         padding: EdgeInsets.symmetric(horizontal: 4.h, vertical: 3.v),
@@ -87,9 +87,9 @@ class LanguageSelectScreen extends StatelessWidget {
   }
 
   /// Section Widget
-  Widget _buildContinueButton(BuildContext context) {
+  Widget _buildContinueButtonSection(BuildContext context) {
     return CustomOutlinedButton(
-        text: "lbl2".tr.toUpperCase(),
+        text: "continue".tr.toUpperCase(),
         margin: EdgeInsets.only(left: 16.h, right: 16.h, bottom: 50.v),
         buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
         onPressed: () {

lib/presentation/medicine_intake_screen/medicine_intake_screen.dart

@@ -50,7 +50,7 @@ class MedicineIntakeScreen extends StatelessWidget {
                   Container(
                       width: 271.h,
                       margin: EdgeInsets.only(left: 35.h, right: 36.h),
-                      child: Text("msg6".tr,
+                      child: Text("do_you_take_pills".tr,
                           maxLines: 2,
                           overflow: TextOverflow.ellipsis,
                           textAlign: TextAlign.center,
@@ -59,13 +59,13 @@ class MedicineIntakeScreen extends StatelessWidget {
                   _buildNinetyThree(context),
                   Spacer(),
                   CustomOutlinedButton(
-                      text: "lbl2".tr.toUpperCase(),
+                      text: "continue".tr.toUpperCase(),
                       buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
                       onPressed: () {
                         navigateToPressure(context);
                       }),
                   SizedBox(height: 17.v),
-                  Text("lbl3".tr, style: theme.textTheme.bodyLarge)
+                  Text("skip".tr, style: theme.textTheme.bodyLarge)
                 ]))));
   }
 
@@ -86,7 +86,8 @@ class MedicineIntakeScreen extends StatelessWidget {
   /// Section Widget
   Widget _buildNinetyThree(BuildContext context) {
     return Column(children: [
-      Text("msg4".tr, style: CustomTextStyles.titleMediumSegoeUI),
+      Text("fill_in_information".tr,
+          style: CustomTextStyles.titleMediumSegoeUI),
       SizedBox(height: 2.v),
       BlocSelector<MedicineIntakeBloc, MedicineIntakeState,
               TextEditingController?>(
@@ -94,7 +95,7 @@ class MedicineIntakeScreen extends StatelessWidget {
           builder: (context, enterInformationController) {
             return CustomTextFormField(
                 controller: enterInformationController,
-                hintText: "msg5".tr,
+                hintText: "enter_information".tr,
                 textInputAction: TextInputAction.done,
                 maxLines: 8);
           })

lib/presentation/schedule_screen/schedule_screen.dart

@@ -33,18 +33,19 @@ class ScheduleScreen extends StatelessWidget {
                   SizedBox(height: 7.v),
                   _buildProgressIndicator(context),
                   SizedBox(height: 38.v),
-                  Text("lbl16".tr, style: theme.textTheme.headlineSmall),
+                  Text("your_schedule".tr,
+                      style: theme.textTheme.headlineSmall),
                   SizedBox(height: 67.v),
                   _buildNinetyThree(context),
                   Spacer(),
                   CustomOutlinedButton(
-                      text: "lbl2".tr.toUpperCase(),
+                      text: "continue".tr.toUpperCase(),
                       buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
                       onPressed: () {
                         navigateToAdditional(context);
                       }),
                   SizedBox(height: 17.v),
-                  Text("lbl3".tr, style: theme.textTheme.bodyLarge)
+                  Text("skip".tr, style: theme.textTheme.bodyLarge)
                 ]))));
   }
 
@@ -85,7 +86,7 @@ class ScheduleScreen extends StatelessWidget {
       Container(
           width: 324.h,
           margin: EdgeInsets.symmetric(horizontal: 9.h),
-          child: Text("msg14".tr,
+          child: Text("tell_your_schedule".tr,
               maxLines: 3,
               overflow: TextOverflow.ellipsis,
               textAlign: TextAlign.center,
@@ -96,7 +97,7 @@ class ScheduleScreen extends StatelessWidget {
           builder: (context, inputPlaceholderController) {
             return CustomTextFormField(
                 controller: inputPlaceholderController,
-                hintText: "msg5".tr,
+                hintText: "enter_information".tr,
                 textInputAction: TextInputAction.done,
                 maxLines: 8);
           })

lib/presentation/weight_screen/weight_screen.dart

@@ -49,13 +49,13 @@ class WeightScreen extends StatelessWidget {
                   _buildTwentySix(context),
                   Spacer(),
                   CustomOutlinedButton(
-                      text: "lbl2".tr.toUpperCase(),
+                      text: "continue".tr.toUpperCase(),
                       buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
                       onPressed: () {
                         navigateToAllergies(context);
                       }),
                   SizedBox(height: 17.v),
-                  Text("lbl3".tr, style: theme.textTheme.bodyLarge)
+                  Text("skip".tr, style: theme.textTheme.bodyLarge)
                 ]))));
   }
 
@@ -76,7 +76,7 @@ class WeightScreen extends StatelessWidget {
   /// Section Widget
   Widget _buildTwentySixWidget(BuildContext context) {
     return Column(children: [
-      Text("lbl12".tr, style: theme.textTheme.bodyLarge),
+      Text("your_weight".tr, style: theme.textTheme.bodyLarge),
       SizedBox(height: 4.v),
       BlocSelector<WeightBloc, WeightState, WeightModel?>(
           selector: (state) => state.weightModelObj,
@@ -104,7 +104,7 @@ class WeightScreen extends StatelessWidget {
   /// Section Widget
   Widget _buildTwentySix(BuildContext context) {
     return Column(children: [
-      Text("lbl11".tr, style: theme.textTheme.headlineSmall),
+      Text("weight_measurements".tr, style: theme.textTheme.headlineSmall),
       SizedBox(height: 174.v),
       _buildTwentySixWidget(context)
     ]);