WD: Live activity implemented on config based #348

Open
taha.alam wants to merge 24 commits from live_activities into master
Collaborator
There is no content yet.
taha.alam added 21 commits 4 weeks ago
e87fdafd62 Merge remote-tracking branch 'origin/master' into live_activities
# Conflicts:
#	android/app/src/main/kotlin/com/ejada/hmg/MainActivity.kt
#	android/app/src/main/res/values/mapbox_access_token.xml
#	android/build/reports/problems/problems-report.html
#	android/settings.gradle.kts
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/core/utils/calender_utils_new.dart
#	lib/core/utils/push_notification_handler.dart
#	lib/presentation/home/widgets/small_service_card.dart
#	lib/presentation/tele_consultation/zoom/call_screen.dart
#	lib/routes/app_routes.dart
#	lib/splashPage.dart
#	pubspec.lock
cd15cf1a39 Merge remote-tracking branch 'origin/master' into live_activities
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/widgets/small_service_card.dart
#	lib/splashPage.dart
#	pubspec.yaml
b00a37cabb Merge remote-tracking branch 'origin/master' into live_activities
# Conflicts:
#	android/app/build.gradle.kts
#	android/app/proguard-rules.pro
#	android/app/src/main/AndroidManifest.xml
#	android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/MainActivity.kt
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	ios/Runner.xcodeproj/project.pbxproj
#	ios/Runner/AppDelegate.swift
#	lib/core/cache_consts.dart
#	lib/core/utils/calender_utils_new.dart
#	lib/core/utils/push_notification_handler.dart
#	lib/presentation/appointments/appointment_details_page.dart
#	pubspec.yaml
02cd542bd9 WD: config based live activity placed.
* variable place in the appstate to manage the live activity
* single utility function to show the live activity
taha.alam added 1 commit 4 weeks ago
taha.alam added 1 commit 4 weeks ago
taha.alam added 1 commit 4 weeks ago
This pull request has changes conflicting with the target branch.
  • android/app/src/main/res/values/colors.xml
  • assets/langs/ar-SA.json
  • assets/langs/en-US.json
  • ios/Runner.xcodeproj/project.pbxproj
  • pubspec.lock
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b live_activities master
git pull origin live_activities

Step 2:

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff live_activities
git push origin master
Sign in to join this conversation.
No reviewers
No Label
No Milestone
No project
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Haroon6138/HMG_Patient_App_New#348
Loading…
There is no content yet.