sync: Part 8 sync to upstream (#552)

* feat: banner when register with already linked social account (#54) * fix: fix lint warnings * chore: added banner when register with already linked social account * style: changed text color --------- Co-authored-by: Anton Yarmolenko <[email protected]> * chore: fix after merge * chore: update tab bar icons for selected unselected states (#81) * chore: Elm theme improvements on Profile (#82) * chore: fix after merge * fix: fix tab bar color not properly applying (#85) * fix: fix tar bar color not properly applying * chore: parity with android for discover icon * chore: added missed colors --------- Co-authored-by: Anton Yarmolenko <[email protected]> Co-authored-by: Saeed Bashir <[email protected]>
openedx · Dec 17, 2024 · 403205f · 403205f
1 parent c104371
commit 403205f
Show file tree

Hide file tree

Showing 38 changed files with 286 additions and 168 deletions.
diff --git a/Authorization/Authorization/Presentation/Registration/SignUpViewModel.swift b/Authorization/Authorization/Presentation/Registration/SignUpViewModel.swift
@@ -195,7 +195,13 @@ public final class SignUpViewModel: ObservableObject {
             analytics.userLogin(method: authMethod)
             isShowProgress = false
             router.showMainOrWhatsNewScreen(sourceScreen: sourceScreen)
-            NotificationCenter.default.post(name: .userAuthorized, object: nil)
+            NotificationCenter.default.post(
+                name: .userAuthorized,
+                object: [
+                    "authMethod": authMethod,
+                    "showSocialRegisterBanner": true
+                    ]
+            )
         } catch {
             update(fullName: response.name, email: response.email)
             self.externalToken = response.token

diff --git a/...avigationBar/learn.imageset/Contents.json → ...gationBar/discover.imageset/Contents.json b/...avigationBar/learn.imageset/Contents.json → ...gationBar/discover.imageset/Contents.json
@@ -1,15 +1,13 @@
 {
   "images" : [
+
     {
-      "filename" : "learn filled.svg",
+      "filename" : "discover_inactive.svg",
       "idiom" : "universal"
     }
   ],
   "info" : {
     "author" : "xcode",
     "version" : 1
-  },
-  "properties" : {
-    "template-rendering-intent" : "template"
   }
 }
diff --git a/Core/Core/Assets.xcassets/NavigationBar/discover.imageset/discover_inactive.svg b/Core/Core/Assets.xcassets/NavigationBar/discover.imageset/discover_inactive.svg
diff --git a/Core/Core/Assets.xcassets/NavigationBar/discovery.imageset/Frame-6.svg b/Core/Core/Assets.xcassets/NavigationBar/discovery.imageset/Frame-6.svg
diff --git a/Core/Core/Assets.xcassets/NavigationBar/learn.imageset/learn filled.svg b/Core/Core/Assets.xcassets/NavigationBar/learn.imageset/learn filled.svg
diff --git a/...ationBar/discovery.imageset/Contents.json → ...onBar/learn_active.imageset/Contents.json b/...ationBar/discovery.imageset/Contents.json → ...onBar/learn_active.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Frame-6.svg",
+      "filename" : "learn_active.svg",
       "idiom" : "universal"
     }
   ],

diff --git a/Core/Core/Assets.xcassets/NavigationBar/learn_active.imageset/learn_active.svg b/Core/Core/Assets.xcassets/NavigationBar/learn_active.imageset/learn_active.svg
diff --git a/...igationBar/profile.imageset/Contents.json → ...Bar/learn_inactive.imageset/Contents.json b/...igationBar/profile.imageset/Contents.json → ...Bar/learn_inactive.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Frame-8.svg",
+      "filename" : "learn_inactive.svg",
       "idiom" : "universal"
     }
   ],

diff --git a/Core/Core/Assets.xcassets/NavigationBar/learn_inactive.imageset/learn_inactive.svg b/Core/Core/Assets.xcassets/NavigationBar/learn_inactive.imageset/learn_inactive.svg
diff --git a/Core/Core/Assets.xcassets/NavigationBar/profile.imageset/Frame-8.svg b/Core/Core/Assets.xcassets/NavigationBar/profile.imageset/Frame-8.svg
diff --git a/...rofile/delete_eyes.imageset/Contents.json → ...Bar/profile_active.imageset/Contents.json b/...rofile/delete_eyes.imageset/Contents.json → ...Bar/profile_active.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "delete_eyes.svg",
+      "filename" : "profile_active.svg",
       "idiom" : "universal"
     }
   ],

diff --git a/Core/Core/Assets.xcassets/NavigationBar/profile_active.imageset/profile_active.svg b/Core/Core/Assets.xcassets/NavigationBar/profile_active.imageset/profile_active.svg
diff --git a/Core/Core/Assets.xcassets/NavigationBar/profile_inactive.imageset/Contents.json b/Core/Core/Assets.xcassets/NavigationBar/profile_inactive.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "profile_inactive.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...re/Assets.xcassets/NavigationBar/profile_inactive.imageset/profile_inactive.svg b/...re/Assets.xcassets/NavigationBar/profile_inactive.imageset/profile_inactive.svg
diff --git a/Core/Core/Assets.xcassets/Profile/bg_delete.imageset/Contents.json b/Core/Core/Assets.xcassets/Profile/bg_delete.imageset/Contents.json
diff --git a/Core/Core/Assets.xcassets/Profile/bg_delete.imageset/bg_delete 1.svg b/Core/Core/Assets.xcassets/Profile/bg_delete.imageset/bg_delete 1.svg
diff --git a/Core/Core/Assets.xcassets/Profile/bg_delete.imageset/delete_bg_light.svg b/Core/Core/Assets.xcassets/Profile/bg_delete.imageset/delete_bg_light.svg
diff --git a/Core/Core/Assets.xcassets/Profile/delete_char.imageset/delete_char.svg b/Core/Core/Assets.xcassets/Profile/delete_char.imageset/delete_char.svg
diff --git a/Core/Core/Assets.xcassets/Profile/delete_eyes.imageset/delete_eyes.svg b/Core/Core/Assets.xcassets/Profile/delete_eyes.imageset/delete_eyes.svg
diff --git a/Core/Core/Assets.xcassets/Profile/noAvatar.imageset/Contents.json b/Core/Core/Assets.xcassets/Profile/noAvatar.imageset/Contents.json
@@ -1,17 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Group 82 (1).svg",
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "Group 82-2.svg",
+      "filename" : "noavatar.svg",
       "idiom" : "universal"
     }
   ],