Merge Code for upgrade project and UI changes for vaccination and HC in main #961

DivyaniPatel96 · 2024-02-29T07:16:19Z

Merge Code for upgrade project and UI changes for vaccination and HC in main

…uild Upgrade project with latest react native version and bug fix in UAT build

Update string changes and resolve crash for android

Implement store and display search results and resolve image issue for details and about us screen

take pull from main branch for vaccination tab icon UI changes

Resolve bug for language selection and child profile deletion

changes in language screen for foleja

Akhror · 2024-03-04T12:43:41Z

Did we create a new release for these changes?
Build has to be created here: https://github.com/UNICEFECAR/parenting-app-bebbo-mobile/releases.
And UAT has to be conducted using the release build which was created from dev branch.

Akhror · 2024-03-04T12:45:18Z

.github/workflows/android.yml

-  #     - main
+  pull_request:
+    branches:
+      - main


You do not need these line for main anymore.
We should trigger it when we merge to dev.

bhumika will update yml file based on the latest code

Akhror · 2024-03-04T12:47:24Z

android/app/build.gradle

-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
-    implementation project(':react-native-lottie-splash-screen')
-    implementation 'com.google.android.gms:play-services-base:17.3.0'
+       implementation("com.facebook.react:react-android")


Can you make sure you applied correct indentation for your changes?
I see down below in some places wrong indentation.

okay @Akhror I will remove those extra space before implementation in this file.

Akhror · 2024-03-04T12:52:06Z

android/app/build.gradle

    into 'libs'
 }
 project.ext.vectoricons = [
-    iconFontNames: [ 'fontello.ttf' ] // Name of the font files you want to copy
+        iconFontNames: [ 'fontello.ttf' ] // Name of the font files you want to copy


Let's remove indentation.

remove extra space from build.gradle file

…-app-bebbo-mobile into Development

Akhror · 2024-03-06T22:36:11Z

app/assets/translations/appConstants/bebbo/en.ts

@@ -391,7 +390,7 @@ const en = {
                "dataSaveroff": "Do you want to switch off data saver mode?",
                "dataSaveron": "Do you want to switch on data saver mode?",
                "parentGender": "Gender",
-                "successOnboardingImport": "You have successfully uploaded your information.",
+                "successOnboardingImport": "You have successfully uploaded your  information.",


Is this extra space intentional?

Hello @Akhror , No this space is not intentional and we can update in string file. kindly create one task for all string changes.

Akhror · 2024-03-06T22:37:31Z

android/app/src/main/java/org/unicef/ecar/bebbo/MainActivity.java

-    /**
-     * This method is only called if the provider is successfully updated
-     * (or is already up-to-date).
-     */


This comment looks useful. Let's keep it.

okay sure @Akhror

Akhror · 2024-03-06T22:50:05Z

app/assets/translations/appConstants/bebbo/RSen.ts

+                "childSetupListeditSiblingBtn": "Edit child's profile",
+                "childSetupListcontinueBtnText": "Continue",
+                "childSetupListsaveBtnText": "Save data",
+                "drawerMenuchildInfo": "Born on {{childdob}} ",


Was extra space at the end intentional?

We can update this in string changes. kindly create one task for all string changes.

Akhror · 2024-03-06T22:52:36Z

app/assets/translations/appConstants/bebbo/RSen.ts

+                "growthScreenaddWeight": "Add weight",
+                "growthScreenaddHeight": "Add height",
+                "growthScreennewGrowthBottomText": "Measuring a child at home is less accurate than measuring at the doctor's and can affect the accuracy of the growth chart.",
+                "growthScreenrelatedArticle": "Related advice ",


Consider breaking this into two sentences for clarity:
"Measuring a child at home is less accurate than measuring at the doctor's. This can affect the accuracy of the growth chart."

We can update this in string changes. kindly create one task for all string changes.

Akhror · 2024-03-06T23:24:53Z

app/assets/translations/appOfflineData/getDataToStore.ts

    // return new Promise((resolve) => {
    let dataToStore: any;
    let offlineData: any;
    if (SchemaToUse.name == StandardDevWeightForHeightSchema.name) {
        offlineData = jsonData[languageCode] ? jsonData[languageCode][0].weight_for_height : undefined;
-        if (offlineData == undefined || offlineData == "" || offlineData == {}) {
+        if (offlineData == undefined || offlineData == "" || offlineData == null) {


Shorter version:

if (!offlineData) { offlineData = []; }

okay sure, I will change

Akhror

I added some comments. Please work on them if time permits.

work on resolve review comments

Merge Code for upgrade project and UI changes for vaccination and HC in main

DivyaniPatel96 added 6 commits February 1, 2024 18:09

Upgrade project with latest react native version and bug fix in UAT b…

6880bac

…uild Upgrade project with latest react native version and bug fix in UAT build

Update string changes and resolve crash for android

9fe8691

Update string changes and resolve crash for android

Store and Display search results

6376eef

Implement store and display search results and resolve image issue for details and about us screen

take pull from main branch for vaccination tab icon UI changes

29325d7

take pull from main branch for vaccination tab icon UI changes

Resolve bug for language selection and child profile deletion

3540616

Resolve bug for language selection and child profile deletion

changes in language screen for foleja

f82aa68

changes in language screen for foleja

DivyaniPatel96 requested a review from Akhror February 29, 2024 07:16

Akhror reviewed Mar 4, 2024

View reviewed changes

BhumikaDatamatics and others added 3 commits March 5, 2024 13:54

Update android.yml

7cc598f

Update build.gradle file

4a55de1

remove extra space from build.gradle file

Merge branch 'Development' of https://github.com/UNICEFECAR/parenting…

657d985

…-app-bebbo-mobile into Development

Akhror reviewed Mar 6, 2024

View reviewed changes

Akhror requested changes Mar 6, 2024

View reviewed changes

Resolve review comments

fa9079f

work on resolve review comments

Akhror self-requested a review March 8, 2024 06:57

Akhror approved these changes Mar 8, 2024

View reviewed changes

DivyaniPatel96 merged commit 974c195 into main Mar 8, 2024
2 of 3 checks passed

deepakmali-dgsl pushed a commit that referenced this pull request Aug 13, 2024

Merge pull request #961 from UNICEFECAR/Development

9f8ee82

Merge Code for upgrade project and UI changes for vaccination and HC in main

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge Code for upgrade project and UI changes for vaccination and HC in main #961

Merge Code for upgrade project and UI changes for vaccination and HC in main #961

DivyaniPatel96 commented Feb 29, 2024

Akhror commented Mar 4, 2024

Akhror Mar 4, 2024 •

edited

Loading

DivyaniPatel96 Mar 6, 2024

Akhror Mar 4, 2024 •

edited

Loading

DivyaniPatel96 Mar 5, 2024

Akhror Mar 4, 2024

DivyaniPatel96 Mar 5, 2024

Akhror Mar 6, 2024

DivyaniPatel96 Mar 7, 2024

Akhror Mar 6, 2024

DivyaniPatel96 Mar 7, 2024

Akhror Mar 6, 2024

DivyaniPatel96 Mar 7, 2024

Akhror Mar 6, 2024

DivyaniPatel96 Mar 7, 2024

Akhror Mar 6, 2024

DivyaniPatel96 Mar 7, 2024

Akhror left a comment

Merge Code for upgrade project and UI changes for vaccination and HC in main #961

Merge Code for upgrade project and UI changes for vaccination and HC in main #961

Conversation

DivyaniPatel96 commented Feb 29, 2024

Akhror commented Mar 4, 2024

Akhror Mar 4, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Akhror Mar 4, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Akhror left a comment

Choose a reason for hiding this comment

Akhror Mar 4, 2024 •

edited

Loading

Akhror Mar 4, 2024 •

edited

Loading