D:\A\Soton\Projects\Xcel Medical Centre\xcel_medical_center_dev\xcel>git status
On branch dev
Your branch is up to date with 'origin/dev'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: lib/pages/navbar_doctor/Profile/edit/widgets/image_picker.dart
no changes added to commit (use "git add" and/or "git commit -a")
D:\A\Soton\Projects\Xcel Medical Centre\xcel_medical_center_dev\xcel>git remote -v
origin git@192.168.0.164:soton/xcel.git (fetch)
origin git@192.168.0.164:soton/xcel.git (push)
D:\A\Soton\Projects\Xcel Medical Centre\xcel_medical_center_dev\xcel>git remote add upstream git@192.168.0.164:mobile_apps/xcel.git
D:\A\Soton\Projects\Xcel Medical Centre\xcel_medical_center_dev\xcel>git remote -v
origin git@192.168.0.164:soton/xcel.git (fetch)
origin git@192.168.0.164:soton/xcel.git (push)
upstream git@192.168.0.164:mobile_apps/xcel.git (fetch)
upstream git@192.168.0.164:mobile_apps/xcel.git (push)
D:\A\Soton\Projects\Xcel Medical Centre\xcel_medical_center_dev\xcel>git add .
D:\A\Soton\Projects\Xcel Medical Centre\xcel_medical_center_dev\xcel>git commit -m "Clean"
[dev 6da5a3f] Clean
1 file changed, 2 deletions(-)
D:\A\Soton\Projects\Xcel Medical Centre\xcel_medical_center_dev\xcel>git pull upstream dev
remote: Enumerating objects: 83, done.
remote: Counting objects: 100% (61/61), done.
remote: Compressing objects: 100% (27/27), done.
remote: Total 35 (delta 19), reused 18 (delta 3)
Unpacking objects: 100% (35/35), 4.33 KiB | 3.00 KiB/s, done.
From 192.168.0.164:mobile_apps/xcel
* branch dev -> FETCH_HEAD
* [new branch] dev -> upstream/dev
Merge made by the 'recursive' strategy.
android/app/build.gradle | 4 +--
android/app/src/main/AndroidManifest.xml | 2 +-
.../medical/ios}/MainActivity.kt | 2 +-
ios/Runner.xcodeproj/project.pbxproj | 37 ++++++++++++++++------
ios/Runner/GoogleService-Info.plist | 36 +++++++++++++++++++++
ios/Runner/Info.plist | 35 ++++++++++----------
ios/Runner/Runner.entitlements | 8 +++++
lib/config/common_const.dart | 6 ++--
lib/pages/login/decision_login_page.dart | 2 ++
.../login/patient/patient_login_page_hlbd.dart | 2 ++
.../login/patient/patient_login_page_lis.dart | 2 ++
pubspec.yaml | 3 +-
12 files changed, 105 insertions(+), 34 deletions(-)
rename android/app/src/main/kotlin/com/{example/xcel_medical_center => xcel/medical/ios}/MainActivity.kt (70%)
create mode 100644 ios/Runner/GoogleService-Info.plist
create mode 100644 ios/Runner/Runner.entitlements
D:\A\Soton\Projects\Xcel Medical Centre\xcel_medical_center_dev\xcel>
Comments
Post a Comment