From 9013a86f3841532bfb34982e1b63c5487c7891ea Mon Sep 17 00:00:00 2001
From: Momo Ozawa <momo.ozawa@automattic.com>
Date: Thu, 7 Dec 2023 14:22:13 +0000
Subject: [PATCH 1/7] add new tab icons feature flag

---
 WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift b/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift
index 2ed10bd739bf..b41b3b72bc0a 100644
--- a/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift
+++ b/WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift
@@ -12,6 +12,7 @@ enum FeatureFlag: Int, CaseIterable {
     case commentModerationUpdate
     case compliancePopover
     case domainFocus
+    case newTabIcons
 
     /// Returns a boolean indicating if the feature is enabled
     var enabled: Bool {
@@ -40,6 +41,8 @@ enum FeatureFlag: Int, CaseIterable {
             return true
         case .domainFocus:
             return true
+        case .newTabIcons:
+            return BuildConfiguration.current == .localDeveloper
         }
     }
 
@@ -82,6 +85,8 @@ extension FeatureFlag {
             return "Compliance Popover"
         case .domainFocus:
             return "Domain Focus"
+        case .newTabIcons:
+            return "New Tab Icons"
         }
     }
 }

From 5486e2e8decd55a695e49ea41d45e295b557eb06 Mon Sep 17 00:00:00 2001
From: Momo Ozawa <momo.ozawa@automattic.com>
Date: Thu, 7 Dec 2023 14:22:41 +0000
Subject: [PATCH 2/7] add new home icon

---
 .../System/Coordinators/MySitesCoordinator.swift |  11 ++++++++---
 .../AppImages.xcassets/Bottom Tabs/Contents.json |   6 ++++++
 .../tab-bar-home-selected.imageset/Contents.json |  12 ++++++++++++
 .../tab-bar-home-selected.pdf                    | Bin 0 -> 2383 bytes
 .../Contents.json                                |  12 ++++++++++++
 .../tab-bar-home-unselected.pdf                  | Bin 0 -> 2601 bytes
 6 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 WordPress/Resources/AppImages.xcassets/Bottom Tabs/Contents.json
 create mode 100644 WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-selected.imageset/Contents.json
 create mode 100644 WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-selected.imageset/tab-bar-home-selected.pdf
 create mode 100644 WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-unselected.imageset/Contents.json
 create mode 100644 WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-unselected.imageset/tab-bar-home-unselected.pdf

diff --git a/WordPress/Classes/ViewRelated/System/Coordinators/MySitesCoordinator.swift b/WordPress/Classes/ViewRelated/System/Coordinators/MySitesCoordinator.swift
index 9d5f67b6b083..e595c5d5a23a 100644
--- a/WordPress/Classes/ViewRelated/System/Coordinators/MySitesCoordinator.swift
+++ b/WordPress/Classes/ViewRelated/System/Coordinators/MySitesCoordinator.swift
@@ -69,9 +69,14 @@ class MySitesCoordinator: NSObject {
         navigationController.restorationIdentifier = MySitesCoordinator.navigationControllerRestorationID
         navigationController.navigationBar.isTranslucent = false
 
-        let tabBarImage = AppStyleGuide.mySiteTabIcon
-        navigationController.tabBarItem.image = tabBarImage
-        navigationController.tabBarItem.selectedImage = tabBarImage
+        if FeatureFlag.newTabIcons.enabled {
+            navigationController.tabBarItem.image = UIImage(named: "tab-bar-home-unselected")
+            navigationController.tabBarItem.selectedImage = UIImage(named: "tab-bar-home-selected")
+        } else {
+            let tabBarImage = AppStyleGuide.mySiteTabIcon
+            navigationController.tabBarItem.image = tabBarImage
+            navigationController.tabBarItem.selectedImage = tabBarImage
+        }
         navigationController.tabBarItem.accessibilityLabel = NSLocalizedString("My Site", comment: "The accessibility value of the my site tab.")
         navigationController.tabBarItem.accessibilityIdentifier = "mySitesTabButton"
         navigationController.tabBarItem.title = NSLocalizedString("My Site", comment: "The accessibility value of the my site tab.")
diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/Contents.json b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/Contents.json
new file mode 100644
index 000000000000..73c00596a7fc
--- /dev/null
+++ b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/Contents.json	
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-selected.imageset/Contents.json b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-selected.imageset/Contents.json
new file mode 100644
index 000000000000..389937d2e482
--- /dev/null
+++ b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-selected.imageset/Contents.json	
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "tab-bar-home-selected.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-selected.imageset/tab-bar-home-selected.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-selected.imageset/tab-bar-home-selected.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..6b8360c14dd67e6be9869d88b27dd7b02495fe67
GIT binary patch
literal 2383
zcmd^AQE%EX5PtWs@Jpq3Qc0YU08)iipheSGwSzrWs`iiu7wAIF5;M{L`rRe=IVn_K
zpXUcSf4=+9{&GH_+)b{}MW@G@;67K6&y4en3+{b?*-Gx+-#$LeR09UX`zrILUhx1N
zX9k)UYPW3!RP%bRim3zVz*i)BxlIb0r!TGb;m}accaOSCdaa6$!Dg~lyCRh(rXbJJ
zNbUIp_d9+yoDl{Va@G%^g2+-AGTAV1B7d(_Ih&67c;1|)CHuvM4JYbzvS=;pM0Hv+
z(hVcGL!(UdBg>5t5!<vG6TW2+C}GB&-Sl-RB?W@ek{tyHb~R&tYaYWI!DNz=u@!sz
z#B%nHF_|xnv|wTRFf5O{j>0g;^$HCMeW$v*|95qf$Ygw=x<U$SlvgM^!tX{sAMQzi
z5OqVr-R(GXVN&L3oMXluk3$<4Woclv9pI!)WB?`EW@|ooSt!_ThoF=-B25>_;Fg*5
zkzd28mQVxZP6VmDoi0;V;%`+rmS|n!-MCK`9ubNaZaQbx8t(<i<~nm7>}s#4bDd~e
ztzU`iZ+?@MKP#(lzBp~QO4m`_mN(^iy-ZJTuN}-hXvUY>c9pzOZ5!?Z2Lk4Wpp(2s
zHyqZ-1~S_V;+9h8Rq0uU{;5-YpxLry9!NV;$NLZx+OI^Z`vl@gy3BK>Oa6dwggeq*
zvXln6k&AWm(boo<+{1-sVPDI!%C*cPBPw9QJA4#19~h{i6GHU~aI;_53)m{h6U?~X
z@mTF3RvhfV1f;<vpzs@1c*2r0x|5F+on&g+j@=jXiTPXzR^J@_<#7~+5eM81On`&K
zTUU>00M`VEgJJ>aZb2dp;kkGPMXv)z936P|4!wFk(7Mev=z?4=DDVTvrHf>p$%3K0
ypC=&hX{k2yjGwL-XSKxMOexS8<*UAzH(&pes0D~y>ZH(>I)UF0*vZM&?e$-r=>^RI

literal 0
HcmV?d00001

diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-unselected.imageset/Contents.json b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-unselected.imageset/Contents.json
new file mode 100644
index 000000000000..2beeb2c82aa1
--- /dev/null
+++ b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-unselected.imageset/Contents.json	
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "tab-bar-home-unselected.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-unselected.imageset/tab-bar-home-unselected.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-unselected.imageset/tab-bar-home-unselected.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..27beb8670ad9a628f7aac8a7a62b422e3e7ff173
GIT binary patch
literal 2601
zcmc&$OHbQC5WerP*b5R=!uI+R#}bMJ2}D(kph*u%s0ZULNvLC|wo^fWeP`C**)<75
z9I9GKjK7`v=HZ#09NkW?PK6UQCb-AThbPAQ*%^1gzicIU?`|HRWYz!%kNZ^?%Vx!W
zP@Hwpv?_O7%Rs%iXUe8EoC9B#7WFo*WRbn}&PSt;YQB4Dl+&xS+H}}V*5$6sWUX9W
zJ~z{OlQyz_6Y5`<a?c4peE4Y8{&m(D7v(d*hhuf>86ogBWTYQp1hLdjCDRRaC-V0?
zle6gsAJ6T#tY*KMdnx#`W<s-&hf|X1EYeCOWE)0m`$C-+OazYbBg}}-H_RtW0&@!#
zk&^_%3qqbV;W=mx_QohTPHk1<A|Yq7GmQJ*fpR~joUJTaXqOu%5-k%51O^P9WSB&L
z+=~>>gCGnd6+hYAssw7miqvvM(I<{jd7vAL{vc>suh`=!R<Li3$zstp14uX+3>&|l
zkVu4huF!zccjhMiPjf>P_Rr>FzcUXE0yP*3?+*g01|(U-69`9mVHD$-KtqLr;AWl=
zjCjTjjZw^*;W4NskrxZ2aDbCMkpPq=ccFRQcp+mG4nY~SEY%Eq(7%))=~;qG-MT7>
zATuLxJmJ(nzSZH_qHTwVgCTWzL@0K6w-eOmdnY)qjTzpY?Nxv9j-Fqq^-pEct`&T3
z_05tvD7jOP<JE1OgDM7eVa=T9+g18LwGP)9TT-|CD3iD7)V6^`Ak%ljpjWAGU&gvZ
zAK5J~ly*`czK4)de<gA~BoIH+c~O*2&F^um!PBL5n=WMsT+78e{pfx~CbN>UE%fhz
zaalC70FPJ!4c_9qZ+Ox{R-F)PGr(ZKtQQa}#|&m%M?5ZfU@P|Gulp4j(D)V=W>}L)
zlleGp(!5;uZJ#Uo$UH6tYX?nj%s~_d5eK|`(1AKAG&B^j2wp+3cKeWsqSuBZieDST
zg4)wc_O+4(rl9B17XzqtAM!)P)l}&^mlebEex5*akLz+HPx$eAanhF9os}ij7fjmk
c<<8fCB-R2xQ{ALhqpITvp2v=kE^n^>0?9NoO#lD@

literal 0
HcmV?d00001


From 59680a581b8cf18dce9005800e6e72c6805ca589 Mon Sep 17 00:00:00 2001
From: Momo Ozawa <momo.ozawa@automattic.com>
Date: Thu, 7 Dec 2023 15:19:51 +0000
Subject: [PATCH 3/7] add new notifications icon

---
 .../ViewRelated/System/WPTabBarController.m   |  18 +++++++++++++-----
 .../Contents.json                             |  12 ++++++++++++
 .../tab-bar-notifications-selected.pdf        | Bin 0 -> 5236 bytes
 .../Contents.json                             |  12 ++++++++++++
 .../tab-bar-notifications-unread-jp.pdf       | Bin 0 -> 2345 bytes
 .../Contents.json                             |  12 ++++++++++++
 .../tab-bar-notifications-unread-wp.pdf       | Bin 0 -> 2345 bytes
 .../Contents.json                             |  12 ++++++++++++
 .../tab-bar-notifications-unselected.pdf      | Bin 0 -> 2001 bytes
 9 files changed, 61 insertions(+), 5 deletions(-)
 create mode 100644 WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-selected.imageset/Contents.json
 create mode 100644 WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-selected.imageset/tab-bar-notifications-selected.pdf
 create mode 100644 WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-jp.imageset/Contents.json
 create mode 100644 WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-jp.imageset/tab-bar-notifications-unread-jp.pdf
 create mode 100644 WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-wp.imageset/Contents.json
 create mode 100644 WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-wp.imageset/tab-bar-notifications-unread-wp.pdf
 create mode 100644 WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unselected.imageset/Contents.json
 create mode 100644 WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unselected.imageset/tab-bar-notifications-unselected.pdf

diff --git a/WordPress/Classes/ViewRelated/System/WPTabBarController.m b/WordPress/Classes/ViewRelated/System/WPTabBarController.m
index 390af0d56201..2aaf77983314 100644
--- a/WordPress/Classes/ViewRelated/System/WPTabBarController.m
+++ b/WordPress/Classes/ViewRelated/System/WPTabBarController.m
@@ -207,11 +207,19 @@ - (UINavigationController *)notificationsNavigationController
     }
     _notificationsNavigationController = [[UINavigationController alloc] initWithRootViewController:rootViewController];
     _notificationsNavigationController.navigationBar.translucent = NO;
-    self.notificationsTabBarImage = [UIImage imageNamed:@"icon-tab-notifications"];
-    NSString *unreadImageName = [AppConfiguration isJetpack] ? @"icon-tab-notifications-unread-jetpack" : @"icon-tab-notifications-unread";
-    self.notificationsTabBarImageUnread = [[UIImage imageNamed:unreadImageName] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
-    _notificationsNavigationController.tabBarItem.image = self.notificationsTabBarImage;
-    _notificationsNavigationController.tabBarItem.selectedImage = self.notificationsTabBarImage;
+    if ([Feature enabled:FeatureFlagNewTabIcons]) {
+        self.notificationsTabBarImage = [UIImage imageNamed:@"tab-bar-notifications-unselected"];
+        NSString *unreadImageName = [AppConfiguration isJetpack] ? @"tab-bar-notifications-unread-jp" : @"tab-bar-notifications-unread-jp";
+        self.notificationsTabBarImageUnread = [[UIImage imageNamed:unreadImageName] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+        _notificationsNavigationController.tabBarItem.image = self.notificationsTabBarImage;
+        _notificationsNavigationController.tabBarItem.selectedImage = [UIImage imageNamed:@"tab-bar-notifications-selected"];
+    } else {
+        self.notificationsTabBarImage = [UIImage imageNamed:@"icon-tab-notifications"];
+        NSString *unreadImageName = [AppConfiguration isJetpack] ? @"icon-tab-notifications-unread-jetpack" : @"icon-tab-notifications-unread";
+        self.notificationsTabBarImageUnread = [[UIImage imageNamed:unreadImageName] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+        _notificationsNavigationController.tabBarItem.image = self.notificationsTabBarImage;
+        _notificationsNavigationController.tabBarItem.selectedImage = self.notificationsTabBarImage;
+    }
     _notificationsNavigationController.restorationIdentifier = WPNotificationsNavigationRestorationID;
     _notificationsNavigationController.tabBarItem.accessibilityIdentifier = @"notificationsTabButton";
     _notificationsNavigationController.tabBarItem.accessibilityLabel = NSLocalizedString(@"Notifications", @"Notifications tab bar item accessibility label");
diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-selected.imageset/Contents.json b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-selected.imageset/Contents.json
new file mode 100644
index 000000000000..a62a87b53879
--- /dev/null
+++ b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-selected.imageset/Contents.json	
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "tab-bar-notifications-selected.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-selected.imageset/tab-bar-notifications-selected.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-selected.imageset/tab-bar-notifications-selected.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..244ff2802dbccefa552e80024eb2a7bf58cad34b
GIT binary patch
literal 5236
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
K_3Dp*`}ThTLmb5b

literal 0
HcmV?d00001

diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-jp.imageset/Contents.json b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-jp.imageset/Contents.json
new file mode 100644
index 000000000000..f8d66690a2f5
--- /dev/null
+++ b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-jp.imageset/Contents.json	
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "tab-bar-notifications-unread-jp.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-jp.imageset/tab-bar-notifications-unread-jp.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-jp.imageset/tab-bar-notifications-unread-jp.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..6548d74e397aaf0cb15281195afed0c84fdee60b
GIT binary patch
literal 2345
zcmb7GO^@3)5WVwP@UlQsAT($A4Fn4`yPKeBi*CKW1wE)*W!HsmwU$zB`|JBC$&_s8
zknmvBkMsFv$nn+v?fW;Rf)FINZ2$OENcr}yT;09&A0GOuZ^mCdeASiI%Idu2^))0f
z*6NPFM)LYP>o@zy>`?HD=bxJWQ~xXtz;%}D`a@Ig#Ok*BXHz%p5AWp7!}3?%iN8hm
z`_u`of)1pEd{cIp8>Fi>2ab|RxeyF%S?{1bB&Lz#`KGJ)^Kn!<dS|0ts3gT4C>Xhg
z9HnTzmq{5L$t2h_Q8N^hvObaxK%DhqK-_4n7OV_u>#QWLqSe6}3CJZAT#hqA51KQ?
zN}J^2a!{S*qDr1}Y};&a1eug2xHHl!&o0-FopR1`${`sG4@;;PWK>KVvI{}-iXsFd
ziEgnRpbTu#M$Ac(F_v>Q3zQXykdV`MiGu#X$&jR=Yy?F<=ZuUwYDrO1U<PeT6>b1p
zZ(<zc4UrObqw)a}WjXe2IDH91G)1n|E!SwO@B(`l<W#cW20gppWzZy$HN?n9vk#Ii
zDg@S$H!0M`q!X-U4ezsLLfhDgtic5eky0S=3w?Bs2bZj(k0x5lR_XKN6sQ*9Ea+rV
zhXSHBY&FPdqflUqB%NZ4#=;t-9}{_p%2<@cWRkO6bR>>Z>8W*+3dy2|3#fEcEoQmW
zciRPsd*nTWhO$o#i@BoSBuk8z4bh^tXI8<>CDmK;EIxfF_Tty!I`dawXQOQLJ_ZS9
z3|Um_8!od~(VSl92=4Tdjl{*V98=0!kqKxF@QZS#OwxqZ0^;Zj^k%_4^qfO$7E2?7
z7>mDpZo-0{P>>&~yyoW!Z`uTvGjl{x(dleVo(--yR6QlHW42+Cfsy$oL(>ln@4>X$
z%@{6s!uv*ulyw@PuXFJd2MT!<FId@J9u<El$xm*I_+@wnsYQvZU}bZ8wD5=C8d@vQ
zoN1sOr%xU<<J=>!eHlu&z<C^gzu&igCqMo^4!zZH|Nhm;)qVBUOu*00<EDDozQ~Vr
z!3q@ymu94V-W@Hio38zQsGCma0lc2f-L(6@*~4R=jYsglIslVyf)*1rL-XwZar1~!
zWzJwNkA802&(Nid_&XpAOa8=CPOvKuG3}?sZ>ql9woj+3FNfxn&@zZI*Ze8*C>SRJ
zPm9pcc}Wb^agjlac@>EA1v`TxVQQXArF3qKwVxIHL$%p92a&7y!!77|)wR3kwS2XC
md_9t~TDNU4bHW3`tB1{h4Wb|Za#V+YNQa4yxVpOg<^BKE`sB<2

literal 0
HcmV?d00001

diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-wp.imageset/Contents.json b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-wp.imageset/Contents.json
new file mode 100644
index 000000000000..4999b3e1c264
--- /dev/null
+++ b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-wp.imageset/Contents.json	
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "tab-bar-notifications-unread-wp.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-wp.imageset/tab-bar-notifications-unread-wp.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-wp.imageset/tab-bar-notifications-unread-wp.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..e7de7f353a71ddac4d576353fd778fdca2033c35
GIT binary patch
literal 2345
zcmb7GO>f*b5WVwP@M0h-5H4r<4Fm=n+X;%csJreh=s}egdyCywyHX0bzrK%>meTI#
zknmvBPcxjE_l6u_-QT`{Ln;VCQp@&_KZTTU-^$h9OaI}auli>Ei-%uzCAG3TFL`|p
z%Zs(Tqpz{NzRv#5{xJs>d=mMmX8+VbO9OD7t-AiuR6DV{ZT{KR&HBSTdGoORtM0_#
zBFBB|gjPWZ(m}o{yUPvA)tUoGNu*o|hPAAB@Er=%DDiyL)%*E#R62TRqg=Qo#T+OY
zxrH62XuX$785_wYoM)nDI3#6#BpZM@>%)M!@vK^~GNi4ulC+9e2WKQ8mrQUu&jdes
z&JZhYl1IqFb+U^pdCIwM^LZo4q%0wvkyd$jSvz*hImaodWGo^qp<0kpF=^N?49P2s
zFoY$##d3f%u)!NSCq>3s&e<$bRvbb?P1_|3`U59Jl7g}k6!}~;D(0vqMMZ%bv?W!z
z0cgF6amY7BO7M-!2V|7(*t6mEB?#FRyP{jxXi|8AJqvOwS#N`$L+>(Z637~IWTV*!
zNfru$HPlTCx|no=m8ubawoGUn8&Ng5fDkDK0>AJ_=Xh|*D*9-mm28zh7pFkA0B1ob
z104zoY1nFz&qhIDiX@$4ipJtJMn5L<4$4@_VKT`%EIJaOq4d-`Nrhyg;Q}h%REycJ
z^xbv=;vRXAq~Yun<HW3}H^~yCWka-R?U_~Za!K`8Jd01?iM{xBxX%35*V!nWypKVG
z8ABFIeZyt;Dw@;F9KoF)s*$)jmSak}Dl!3$0e&G@$|OxlEntqWKyMbz!_PUiW;tm@
zkYkBg&rMjc6AJPpmDl_n;Z2*M^35C(C^~%`i;tf1Zs46UfnDB27b9DlUotfPu<#yC
zo864zawoiRgiKkd@%cJ8FL^-7qj|x~=JHdCcT)TmrkG!*SCCqitO`~(m!B5#&|5=m
z<(V@Ll;iZtgJzt2<h3tD$rd<|!|(U|w(sP}-^Zc1`t9Gp8o9c!o|*~xxp~}F@7fpn
zaTcslVQ^_i%IDqjq;=D^pAU7@$vlA9({VTLzHj!3m}lb=ysr+xB;*{R#RSdJJiC9~
zJR((@D_F~8oSXJDeCZ<p4#?spe{xbTuqy#E?We+Ts=nH`Pp7Ughvt*eGKjI({8Qpl
zFirxV7NMW>k{GDtB7+k1DiGxhb_PYl)I7CH>HI9#es=5+)n?lqL{{&IThQ^UYj@3S
q`D*j{dL(7FZrfhwf(L?E51aoQWIz1NQ62iB940p6>gw*7_x}SN_~haM

literal 0
HcmV?d00001

diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unselected.imageset/Contents.json b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unselected.imageset/Contents.json
new file mode 100644
index 000000000000..203f9d6badac
--- /dev/null
+++ b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unselected.imageset/Contents.json	
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "tab-bar-notifications-unselected.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unselected.imageset/tab-bar-notifications-unselected.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unselected.imageset/tab-bar-notifications-unselected.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..a81d76062bca52b3369ee5bb699fecb3211ea28e
GIT binary patch
literal 2001
zcmb7FO>f&q5WVlOn2Uj=Kvp}m-#}oXv7I1jgSv8WK@Tj=*eYbP5t+ixug_bGA}KqE
zbPp2wII}bJ-t6qz_2t`FtfNv)hT6aWRz$B~)9UK6e|OVYeRFt|;jga9XlKfz^K)1}
zTdOPn5zF)Q;@|9UOF$(jk$-J=cl|wCfa_w__4}rJP^-)4-%Z`D-@T!Wo8?>Gsn4p!
zz3Y_G(L^?pUQJKWA5g9_5+xC{_Ay#9R6oFXD9oV5rw?7dn?EOQQt&R(!X;~w$kEak
zcAS$7fwHzPvCY`eCL?gj+J(d}0`V@y0r7{uY9-pTao!Odot%l@5+I*#^d-*>KX}fN
zXk&9g$ia2AOF9QGxoyjS2T)i$MmS4O2k}Ka@!ESYxuj$rA}pa=vDGOX*e(n?XihMM
zCA!5)gfp<g8#!mq);cNKEKt!BV@6HeB?|hZWXr@+y9A0tsTmbZGQ>%96aj5nPuu`>
z!KO6i8xv>vCLJO&Ds~dYO8y>%Y$m%&x1!Og@B+J6>~(g*MKgzfD4@+CYsgWokr0U;
z6as6gn>BQ?`2?G)M)cV-qitM5)!+g`<Qy6N!XKRzz@_LEl1+}pY4cQ^391!1izZv>
zFoBRpoB{b_H3a6w<h5|J4!a5ZF>~-x#z78SNG@T~k@yUy$JWU@W(N%y(9}(}n(d~(
z+b%$yqY#iZoI@7uSQHI5I~KHTOb)F*vkG3GQ@vI9>eEkZr+y!fv;6RJw%X+oQY0{A
z*+HrQahQWn_Vh3(aA$^U2nWYW%DGg<Hli`WFXYOFq!FnV%+VF-%?S(e^B%1^?Q}qp
z;}ox+n{dJw6qMOG4!+}*ECcZ{pBW854No`0Wo-Yv+qHd1AOAcI=hYwo{nOCuy1Hvd
z;6rn}sou1Y^zl1$&O+Q_(foAWY29?~mwnxIR4$73xZOp&>zf@SmKlBoud6*U@*}jE
z^aYylm|r%xNR>(jYdXfcXurUhpXJ{HS?m-}b}9vSQ$XBGW8oK7Uv1mFQ`g6R^GO+s
z>QHO>B{Z+~1bAGGYoIK`;6E(3D6y;wLa#lwD#PHZRdC4l)G^}5IYRxu+H9M>D(bzz
x1RXEB_Mv%6FE+O?52UQtZQD~Rcp!Lnv-#Q}`{8P=_We)}W6r9xv#a0Uegm2sqrU(E

literal 0
HcmV?d00001


From 0191161fd5c6a838a58ebc315ca099b9e970de3f Mon Sep 17 00:00:00 2001
From: Momo Ozawa <momo.ozawa@automattic.com>
Date: Thu, 7 Dec 2023 15:32:45 +0000
Subject: [PATCH 4/7] add new reader icon

---
 .../ViewRelated/System/WPTabBarController.m      |  11 ++++++++---
 .../Contents.json                                |  12 ++++++++++++
 .../tab-bar-reader-selected.pdf                  | Bin 0 -> 4874 bytes
 .../Contents.json                                |  12 ++++++++++++
 .../tab-bar-reader-unselected.pdf                | Bin 0 -> 4986 bytes
 5 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-selected.imageset/Contents.json
 create mode 100644 WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-selected.imageset/tab-bar-reader-selected.pdf
 create mode 100644 WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-unselected.imageset/Contents.json
 create mode 100644 WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-unselected.imageset/tab-bar-reader-unselected.pdf

diff --git a/WordPress/Classes/ViewRelated/System/WPTabBarController.m b/WordPress/Classes/ViewRelated/System/WPTabBarController.m
index 2aaf77983314..966b8c9377be 100644
--- a/WordPress/Classes/ViewRelated/System/WPTabBarController.m
+++ b/WordPress/Classes/ViewRelated/System/WPTabBarController.m
@@ -181,9 +181,14 @@ - (UINavigationController *)readerNavigationController
         _readerNavigationController.navigationBar.translucent = NO;
         _readerNavigationController.view.backgroundColor = [UIColor murielBasicBackground];
 
-        UIImage *readerTabBarImage = [UIImage imageNamed:@"icon-tab-reader"];
-        _readerNavigationController.tabBarItem.image = readerTabBarImage;
-        _readerNavigationController.tabBarItem.selectedImage = readerTabBarImage;
+        if ([Feature enabled:FeatureFlagNewTabIcons]) {
+            _readerNavigationController.tabBarItem.image = [UIImage imageNamed:@"tab-bar-reader-unselected"];
+            _readerNavigationController.tabBarItem.selectedImage = [UIImage imageNamed:@"tab-bar-reader-selected"];
+        } else {
+            UIImage *readerTabBarImage = [UIImage imageNamed:@"icon-tab-reader"];
+            _readerNavigationController.tabBarItem.image = readerTabBarImage;
+            _readerNavigationController.tabBarItem.selectedImage = readerTabBarImage;
+        }
         _readerNavigationController.restorationIdentifier = WPReaderNavigationRestorationID;
         _readerNavigationController.tabBarItem.accessibilityIdentifier = @"readerTabButton";
         _readerNavigationController.tabBarItem.title = NSLocalizedString(@"Reader", @"The accessibility value of the Reader tab.");
diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-selected.imageset/Contents.json b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-selected.imageset/Contents.json
new file mode 100644
index 000000000000..aedb797c23ed
--- /dev/null
+++ b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-selected.imageset/Contents.json	
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "tab-bar-reader-selected.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-selected.imageset/tab-bar-reader-selected.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-selected.imageset/tab-bar-reader-selected.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..a24b53177210d9e3cd11f35647199bd29cc7d1dd
GIT binary patch
literal 4874
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

literal 0
HcmV?d00001

diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-unselected.imageset/Contents.json b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-unselected.imageset/Contents.json
new file mode 100644
index 000000000000..993c6dfe2d15
--- /dev/null
+++ b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-unselected.imageset/Contents.json	
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "tab-bar-reader-unselected.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-unselected.imageset/tab-bar-reader-unselected.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-unselected.imageset/tab-bar-reader-unselected.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..98d1d80ec7457bfc66f7f0bb75f714afdcc7c10b
GIT binary patch
literal 4986
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

literal 0
HcmV?d00001


From 2883d369741a69b1ee3a60f2aa24a7967b5f56eb Mon Sep 17 00:00:00 2001
From: Momo Ozawa <momo.ozawa@automattic.com>
Date: Thu, 7 Dec 2023 16:08:26 +0000
Subject: [PATCH 5/7] add new me icon

---
 .../System/WPTabBarController+MeTab.swift     |  18 ++++++++++++++----
 .../ViewRelated/System/WPTabBarController.m   |   7 ++++++-
 .../Contents.json                             |  12 ++++++++++++
 .../tab-bar-me-selected.pdf                   | Bin 0 -> 1336 bytes
 .../Contents.json                             |  12 ++++++++++++
 .../tab-bar-me-unselected.pdf                 | Bin 0 -> 1904 bytes
 6 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-selected.imageset/Contents.json
 create mode 100644 WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-selected.imageset/tab-bar-me-selected.pdf
 create mode 100644 WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-unselected.imageset/Contents.json
 create mode 100644 WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-unselected.imageset/tab-bar-me-unselected.pdf

diff --git a/WordPress/Classes/ViewRelated/System/WPTabBarController+MeTab.swift b/WordPress/Classes/ViewRelated/System/WPTabBarController+MeTab.swift
index e803229578bd..b30a7df60078 100644
--- a/WordPress/Classes/ViewRelated/System/WPTabBarController+MeTab.swift
+++ b/WordPress/Classes/ViewRelated/System/WPTabBarController+MeTab.swift
@@ -14,9 +14,13 @@ extension WPTabBarController {
         NotificationCenter.default.addObserver(self, selector: #selector(accountDidChange), name: .WPAccountEmailAndDefaultBlogUpdated, object: nil)
     }
 
-    @objc func configureMeTabImage(placeholderImage: UIImage) {
-        meNavigationController?.tabBarItem.image = placeholderImage
-        meNavigationController?.tabBarItem.selectedImage = placeholderImage
+    @objc func configureMeTabImage(placeholderImage: UIImage?) {
+        configureMeTabImage(unselectedPlaceholderImage: placeholderImage, selectedPlaceholderImage: placeholderImage)
+    }
+
+    @objc func configureMeTabImage(unselectedPlaceholderImage: UIImage?, selectedPlaceholderImage: UIImage?) {
+        meNavigationController?.tabBarItem.image = unselectedPlaceholderImage
+        meNavigationController?.tabBarItem.selectedImage = selectedPlaceholderImage
 
         guard let account = defaultAccount(),
               let email = account.email else {
@@ -45,7 +49,13 @@ extension WPTabBarController {
     }
 
     @objc private func accountDidChange() {
-        configureMeTabImage(placeholderImage: UIImage(named: "icon-tab-me") ?? UIImage())
+        guard FeatureFlag.newTabIcons.enabled else {
+            configureMeTabImage(placeholderImage: UIImage(named: "icon-tab-me"))
+            return
+        }
+
+        configureMeTabImage(unselectedPlaceholderImage: UIImage(named: "tab-bar-me-unselected"),
+                            selectedPlaceholderImage: UIImage(named: "tab-bar-me-selected"))
     }
 }
 
diff --git a/WordPress/Classes/ViewRelated/System/WPTabBarController.m b/WordPress/Classes/ViewRelated/System/WPTabBarController.m
index 966b8c9377be..33b044bfb0eb 100644
--- a/WordPress/Classes/ViewRelated/System/WPTabBarController.m
+++ b/WordPress/Classes/ViewRelated/System/WPTabBarController.m
@@ -237,7 +237,12 @@ - (UINavigationController *)meNavigationController
 {
     if (!_meNavigationController) {
         _meNavigationController = [[UINavigationController alloc] initWithRootViewController:self.meViewController];
-        [self configureMeTabImageWithPlaceholderImage:[UIImage imageNamed:@"icon-tab-me"]];
+        if ([Feature enabled:FeatureFlagNewTabIcons]) {
+            [self configureMeTabImageWithUnselectedPlaceholderImage:[UIImage imageNamed:@"tab-bar-me-unselected"]
+                                           selectedPlaceholderImage:[UIImage imageNamed:@"tab-bar-me-selected"]];
+        } else {
+            [self configureMeTabImageWithPlaceholderImage:[UIImage imageNamed:@"icon-tab-me"]];
+        }
         _meNavigationController.restorationIdentifier = WPMeNavigationRestorationID;
         _meNavigationController.tabBarItem.accessibilityLabel = NSLocalizedString(@"Me", @"The accessibility value of the me tab.");
         _meNavigationController.tabBarItem.accessibilityIdentifier = @"meTabButton";
diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-selected.imageset/Contents.json b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-selected.imageset/Contents.json
new file mode 100644
index 000000000000..fd311e91eeb0
--- /dev/null
+++ b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-selected.imageset/Contents.json	
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "tab-bar-me-selected.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-selected.imageset/tab-bar-me-selected.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-selected.imageset/tab-bar-me-selected.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..c3d3ba6e6b628a5e325f3c31ad0a6bed66f604a7
GIT binary patch
literal 1336
zcmb7^O>dkq5QgvbE9SCNatL4yhLxg7&2CavZIun_Ey{ti&W4D!TOd{1Umu&rV^H?c
z_^=utd*1o5XBV6G^%)B?0EQ9jpU;4JevTIxAl24>LOkW+H>r006LJF!d#dYOS?(cR
z%RhA`i_e$1x|@Dg9sC9sM8m?!8E0hC9`h)5$ErOLeQ$J?0v5Zo!WsJsj02I2cp2j|
z;EZQc?o*)iBwWFG+_b`pkwHpCNTBjbQW#P?lAuQwkb{TbI<h$l`UH=l;P!v}o4Jxc
z&|RvPd?ptn0+EV5O^^jV;VcoDyAa$NL@HpUL9hWfilp9`(Y6mjh%}5ILCUi67jcY{
za|5n-_LYxM*u8iAv=4J2mV%}rA!?>0{G^obJG_4|(_&Wm<L@tt;ilZl5qy{1y1dk{
zcz@(6aeA}fa!Q5l^h;aG4(&V^quffXUMdsO4x@vcvNa6T5lu$cA{yoJYrQq8qOG7n
z7iXnkj4ykae`m-<Nz9aNfgJ_(g|EuKZ1isK`r67zh%kf0?Au=yY06VHcw8*P!9qod
zn>_9ED9cS2bClabo}*=M8a6{LN=+k1)VF2b$QJDFeOa4!oOF6GPw}MQo*tSK7Fzdc
d3mzIA-qru4$$t2cE8Bi3hcTAGVsUkI{RV3g9X$X5

literal 0
HcmV?d00001

diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-unselected.imageset/Contents.json b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-unselected.imageset/Contents.json
new file mode 100644
index 000000000000..20a007833188
--- /dev/null
+++ b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-unselected.imageset/Contents.json	
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "tab-bar-me-unselected.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-unselected.imageset/tab-bar-me-unselected.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-unselected.imageset/tab-bar-me-unselected.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..dc86104dbadf2760b5b7582e5ebc3fbc63371548
GIT binary patch
literal 1904
zcma)7O>f&U487}D@KT^1P}`C%I{}ISYx;p<8`h<}6+3v2nr3M1&31=wzkZY>JvnuO
zO^23wBp*LS(MLBISEn*6gpia_^X<DJIy<BI^0~jh?aSWmf2rYLRZ<dVi9NJfu;t{$
zm-2rs7Yple>a`6h)IsDArrz`qlrp%oR$bqkawp;o^J`m~)%7_oZ^yr?PW%)$?xqu5
z$&g*bc{<@VNKmRQD)dl=R9>of0+v&utLmVJ&&Z|lJdZ*~19w8NVelQ<sVLF&Jj)0I
zC}0kx5;A1(BQcqdvMfn;POy}@??K=lL9PSL2XLHl;kjQ0krzjXrHoW6l`M!ERX!_b
zS-6IfG@4rpumH1NaU{SXOjRJL#DlnhBWm$^7zSmB0oM(JFbmMhBvNh^w3q%p3fkW`
zySq8tiIks)D&`3V5O*<)l6j#d>wH^5!582$FhGC`=0GYjB@K}S12O~!M+68C2tfyj
z0NFmn7y8jVm_>7?^R(bu)<u@)DM@4u`vBP@oI?PE^okNBTm_gB3=Y#If!MioxdDSP
zRgD5-#_Z~Hd&w^`yRY`^Q_5UpxA7AgZPmAR-Si#ZeckWQ_{;AfhT@xYV;u0&theQP
z^GtW)=^(e1-|=uLNS<kBy5^~^Oh<N)uN>X7se4m%M7v@=cvH5Fk#^8%5nCvH0^V=e
zoGRH0R^;O>n<w^_ll(hIMojqulP$1AK>ldB!k1-VJ~o>}*XP#U3tpaLU#tB~xz?#B
zhTY+ZG)Tl-d4FWeCE5c>rkd~M1ypcihmg+ZFQHro$G$DMkERv&oA~a6+i~1AJ99$E
o+x5x5De<alda?x%4UTWOe+*|oe7VZDAIg#WOo^kT%THH-0RTLS5C8xG

literal 0
HcmV?d00001


From f1287b9c38e69a7186ee40f4bcf70a60de77c97c Mon Sep 17 00:00:00 2001
From: Momo Ozawa <momo.ozawa@automattic.com>
Date: Mon, 11 Dec 2023 10:56:36 +0000
Subject: [PATCH 6/7] use native transparency for tab bar

---
 .../Colors and Styles/WPStyleGuide+ApplicationStyles.swift     | 3 ---
 .../Controllers/NotificationsViewController.swift              | 3 +++
 .../Reader/Tab Navigation/ReaderTabViewController.swift        | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/WordPress/Classes/Extensions/Colors and Styles/WPStyleGuide+ApplicationStyles.swift b/WordPress/Classes/Extensions/Colors and Styles/WPStyleGuide+ApplicationStyles.swift
index ca0456d81a5d..472b8c908c98 100644
--- a/WordPress/Classes/Extensions/Colors and Styles/WPStyleGuide+ApplicationStyles.swift	
+++ b/WordPress/Classes/Extensions/Colors and Styles/WPStyleGuide+ApplicationStyles.swift	
@@ -66,9 +66,6 @@ extension WPStyleGuide {
         UITabBar.appearance().unselectedItemTintColor = .tabUnselected
 
         let appearance = UITabBarAppearance()
-        appearance.configureWithOpaqueBackground()
-        appearance.backgroundColor = .systemBackground
-
         UITabBar.appearance().standardAppearance = appearance
         UITabBar.appearance().scrollEdgeAppearance = appearance
     }
diff --git a/WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationsViewController.swift b/WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationsViewController.swift
index 077816b80f93..f834abf59537 100644
--- a/WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationsViewController.swift
+++ b/WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationsViewController.swift
@@ -175,6 +175,9 @@ class NotificationsViewController: UIViewController, UIViewControllerRestoration
 
         reloadTableViewPreservingSelection()
         startListeningToCommentDeletedNotifications()
+
+        extendedLayoutIncludesOpaqueBars = true
+        edgesForExtendedLayout = .all
     }
 
     override func viewWillAppear(_ animated: Bool) {
diff --git a/WordPress/Classes/ViewRelated/Reader/Tab Navigation/ReaderTabViewController.swift b/WordPress/Classes/ViewRelated/Reader/Tab Navigation/ReaderTabViewController.swift
index 7607c266e362..72d84e04aaea 100644
--- a/WordPress/Classes/ViewRelated/Reader/Tab Navigation/ReaderTabViewController.swift	
+++ b/WordPress/Classes/ViewRelated/Reader/Tab Navigation/ReaderTabViewController.swift	
@@ -18,6 +18,7 @@ class ReaderTabViewController: UIViewController {
         self.makeReaderTabView = readerTabViewFactory
         super.init(nibName: nil, bundle: nil)
 
+        extendedLayoutIncludesOpaqueBars = true
         title = ReaderTabConstants.title
         setupNavigationButtons()
 

From cf91ff8696ee1cf9063554a844c50f7001fbed0d Mon Sep 17 00:00:00 2001
From: Momo Ozawa <momo.ozawa@automattic.com>
Date: Tue, 12 Dec 2023 12:07:36 +0000
Subject: [PATCH 7/7] replace unselected icon assets

images need to be opaque (i.e. 100% opacity)
---
 .../tab-bar-home-unselected.pdf               | Bin 2601 -> 1146 bytes
 .../tab-bar-me-unselected.pdf                 | Bin 1904 -> 1792 bytes
 .../tab-bar-notifications-unread-jp.pdf       | Bin 2345 -> 2233 bytes
 .../tab-bar-notifications-unread-wp.pdf       | Bin 2345 -> 2233 bytes
 .../tab-bar-notifications-unselected.pdf      | Bin 2001 -> 1889 bytes
 .../tab-bar-reader-unselected.pdf             | Bin 4986 -> 4871 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-unselected.imageset/tab-bar-home-unselected.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-home-unselected.imageset/tab-bar-home-unselected.pdf
index 27beb8670ad9a628f7aac8a7a62b422e3e7ff173..56894a360bbbebe9217a6caa8df217e4b7756d3b 100644
GIT binary patch
delta 342
zcmZ1}@{41FxT>8US885Leo__}myv>j0*IlYU}K}8?~|IBUXr0;3=|BSEW_eAIgwFZ
z!pzXr%)(5;Ko7w%HZ(Rj-aLVE4x>0oEyMs*19P~sCX-LG7X})F%mEq=1p3bTc_pcN
zCB+IL8)1S0iA6v$1yiUHlDj}c2zPmBrW7kgE0|2~;V_x($IizdkeHrYtYA9%8iy{U
z`D9j3J%0mZ69oehP{`u~(*_2nmgeX}W`>sNLgto07olpjFf*Hcj?+*b=xK;k^@B63
eQWea(fDSA!Nh~U<C`wJ^vNST~QdM>JcLM-Ad{M^$

literal 2601
zcmc&$OHbQC5WerP*b5R=!uI+R#}bMJ2}D(kph*u%s0ZULNvLC|wo^fWeP`C**)<75
z9I9GKjK7`v=HZ#09NkW?PK6UQCb-AThbPAQ*%^1gzicIU?`|HRWYz!%kNZ^?%Vx!W
zP@Hwpv?_O7%Rs%iXUe8EoC9B#7WFo*WRbn}&PSt;YQB4Dl+&xS+H}}V*5$6sWUX9W
zJ~z{OlQyz_6Y5`<a?c4peE4Y8{&m(D7v(d*hhuf>86ogBWTYQp1hLdjCDRRaC-V0?
zle6gsAJ6T#tY*KMdnx#`W<s-&hf|X1EYeCOWE)0m`$C-+OazYbBg}}-H_RtW0&@!#
zk&^_%3qqbV;W=mx_QohTPHk1<A|Yq7GmQJ*fpR~joUJTaXqOu%5-k%51O^P9WSB&L
z+=~>>gCGnd6+hYAssw7miqvvM(I<{jd7vAL{vc>suh`=!R<Li3$zstp14uX+3>&|l
zkVu4huF!zccjhMiPjf>P_Rr>FzcUXE0yP*3?+*g01|(U-69`9mVHD$-KtqLr;AWl=
zjCjTjjZw^*;W4NskrxZ2aDbCMkpPq=ccFRQcp+mG4nY~SEY%Eq(7%))=~;qG-MT7>
zATuLxJmJ(nzSZH_qHTwVgCTWzL@0K6w-eOmdnY)qjTzpY?Nxv9j-Fqq^-pEct`&T3
z_05tvD7jOP<JE1OgDM7eVa=T9+g18LwGP)9TT-|CD3iD7)V6^`Ak%ljpjWAGU&gvZ
zAK5J~ly*`czK4)de<gA~BoIH+c~O*2&F^um!PBL5n=WMsT+78e{pfx~CbN>UE%fhz
zaalC70FPJ!4c_9qZ+Ox{R-F)PGr(ZKtQQa}#|&m%M?5ZfU@P|Gulp4j(D)V=W>}L)
zlleGp(!5;uZJ#Uo$UH6tYX?nj%s~_d5eK|`(1AKAG&B^j2wp+3cKeWsqSuBZieDST
zg4)wc_O+4(rl9B17XzqtAM!)P)l}&^mlebEex5*akLz+HPx$eAanhF9os}ij7fjmk
c<<8fCB-R2xQ{ALhqpITvp2v=kE^n^>0?9NoO#lD@

diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-unselected.imageset/tab-bar-me-unselected.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-me-unselected.imageset/tab-bar-me-unselected.pdf
index dc86104dbadf2760b5b7582e5ebc3fbc63371548..15ec5221c9329563017d28eaab6c4b0b138e0d07 100644
GIT binary patch
delta 181
zcmeys*T6SHd}5{F#B&Z3W`?F_7G??tdI*NGp|QE~W;Mojj1$kxO#aTKgj<mzvkDWF
zso~~u)<Q;q17i~f0}xQi;{wwLhDIia7(!+ks!WW{(N&om8cr5x58yO4H{eoLb@g`x
E0K@$#Z~y=R

delta 295
zcmZqR`@lCrJW=1ZqQpJ8B(Wq_!Nx{G-_;0AB_}Ev=$RORfP$SJmjWixcQqtNrJdbG
zF@Fw_;`CxJ-O1TZG83DWCBOz70Ifh{Y}~t!kqzXA^y0}`O!hd{Z9d4P!o*}|y7@Uv
zA)~*cv5^AUAcZ_Gh=GR2rp6dT=4R+ZrY4r?LS{zBlb5pvaGF^dajB}h`nv%D?WjJ|

diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-jp.imageset/tab-bar-notifications-unread-jp.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-jp.imageset/tab-bar-notifications-unread-jp.pdf
index 6548d74e397aaf0cb15281195afed0c84fdee60b..5911b7b97a89a758d406c603d08da6b25751dbbb 100644
GIT binary patch
delta 190
zcmZ1}v{P_`_{2)TiRa7|EDRNrbGZ!k%nVJ<EX)*;8ODaj=Ej><7>k%Eo>QHCh(%li
zr=pK6GEB^-mPVTe*b5o`4UA0`3_w63j|)s27@Aoap$nNCn4$|=m|LI=S(+M6zQ7T{
OX<%r`rK;-c?*;%yLMt!;

delta 302
zcmdlfxKe0>c%r^*MTvWGNn%N=f{l%WzN-<KN={TT&@(Xr0R=ldE(J`W?`lYlN;|uW
zV*YF(#p%V9by(CUb_psN87L&@avA7>jW+;VgvQvoyNDU6#R#IsRsu~Lu3>W{iwqO9
znSt5n1#E?k{)Waz3SgxQd0Y@JhUS(g=t35T=IBC}mOw{<09>PyftktV1daesLnC7@
JRaIAiHvlSIKK=jz

diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-wp.imageset/tab-bar-notifications-unread-wp.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unread-wp.imageset/tab-bar-notifications-unread-wp.pdf
index e7de7f353a71ddac4d576353fd778fdca2033c35..b31f056e91238830022497e50517b0ea060beefd 100644
GIT binary patch
delta 190
zcmZ1}v{P_`_{2)TiRa7|EDRNrbGZ!k%nVJ<EX)*;8ODaj=Ej><7>k%Eo>QHCh(%li
zr=pK6GEB^-mPVTe*b5o`4UA0`3_w63j|)s27@Aoap$nNCn4$|=m|LI=S(+M6zQ7T{
OX<%r`rK;-c?*;%yLMt!;

delta 302
zcmdlfxKe0>c%r^*MTvWGNn%N=f{l%WzN-<KN={TT&@(Xr0R=ldE(J`W?`lYlN;|uW
zV*YF(#p%V9by(CUb_psN87L&@avA7>jW+;VgvQvoyNDU6#R#IsRsu~Lu3>W{iwqO9
znSt5n1#E?k{)Waz3SgxQd0Y@JhUS(g=t35T=IBC}mOw{<09>PyftktV1daesLnC7@
JRaIAiHvlSIKK=jz

diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unselected.imageset/tab-bar-notifications-unselected.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-notifications-unselected.imageset/tab-bar-notifications-unselected.pdf
index a81d76062bca52b3369ee5bb699fecb3211ea28e..34cb4610aa69dd45cf79e1495122833e2ffad5d6 100644
GIT binary patch
delta 188
zcmcb}|B!Ej_{2)TiRa7|EDRNrbGZ!k%nVJ<EX)*;8ODaj=Ej><7>k%Eo>QHCh(%li
zm!ioZS&lN9SZv<GTFB^cU~Hmb00IhmTwvP3(Ad}lL&(e!UC0zuqnUxl<O=oxPBSxe
KE>%@me>VWB11uQ;

delta 300
zcmaFJcaeXBc%r^*MTvWGNn%N=f{l%WzN-<KN={TT&@(Xr0R=ldE(J`W?`lYlN;|uW
zV*YF(#p%V9by(CUb_psN87L&@avA7>jW+;VgvQvoyNDU6#R#IsRsu~Lu3>T`%TXpX
zqs<<yg^d1&#zqQYg$j9G5DkVVra;3%07=N)7+uKB#0*`?+{j=u2YUdgxw$2ms;aBM
F8vr9dKIi}d

diff --git a/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-unselected.imageset/tab-bar-reader-unselected.pdf b/WordPress/Resources/AppImages.xcassets/Bottom Tabs/tab-bar-reader-unselected.imageset/tab-bar-reader-unselected.pdf
index 98d1d80ec7457bfc66f7f0bb75f714afdcc7c10b..ef5d0741667037aef6d8c4494e6bbe3d0e0185b5 100644
GIT binary patch
literal 4871
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

literal 4986
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