diff --git a/src/watchOS/bitwarden/bitwarden WatchKit App/Assets.xcassets/AccentColor.colorset/Contents.json b/src/watchOS/bitwarden/bitwarden WatchKit App/Assets.xcassets/AccentColor.colorset/Contents.json index 14b11821c..97650a1a6 100644 --- a/src/watchOS/bitwarden/bitwarden WatchKit App/Assets.xcassets/AccentColor.colorset/Contents.json +++ b/src/watchOS/bitwarden/bitwarden WatchKit App/Assets.xcassets/AccentColor.colorset/Contents.json @@ -5,9 +5,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0.349", - "green" : "0.664", - "red" : "0.279" + "blue" : "1.000", + "green" : "1.000", + "red" : "1.000" } }, "idiom" : "universal" diff --git a/src/watchOS/bitwarden/bitwarden WatchKit Extension/Assets.xcassets/AvatarItemBackground.colorset/Contents.json b/src/watchOS/bitwarden/bitwarden WatchKit Extension/Assets.xcassets/AvatarItemBackground.colorset/Contents.json new file mode 100644 index 000000000..bee419a0e --- /dev/null +++ b/src/watchOS/bitwarden/bitwarden WatchKit Extension/Assets.xcassets/AvatarItemBackground.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x15", + "green" : "0x12", + "red" : "0x10" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xFF", + "green" : "0xFF", + "red" : "0xFF" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/src/watchOS/bitwarden/bitwarden WatchKit Extension/Assets.xcassets/ItemBackground.colorset/Contents.json b/src/watchOS/bitwarden/bitwarden WatchKit Extension/Assets.xcassets/ItemBackground.colorset/Contents.json index cbecde52e..c3aec3c0f 100644 --- a/src/watchOS/bitwarden/bitwarden WatchKit Extension/Assets.xcassets/ItemBackground.colorset/Contents.json +++ b/src/watchOS/bitwarden/bitwarden WatchKit Extension/Assets.xcassets/ItemBackground.colorset/Contents.json @@ -34,5 +34,8 @@ "info" : { "author" : "xcode", "version" : 1 + }, + "properties" : { + "localizable" : true } } diff --git a/src/watchOS/bitwarden/bitwarden WatchKit Extension/Utilities/ColorUtils.swift b/src/watchOS/bitwarden/bitwarden WatchKit Extension/Utilities/ColorUtils.swift index 58242e640..21de59d3f 100644 --- a/src/watchOS/bitwarden/bitwarden WatchKit Extension/Utilities/ColorUtils.swift +++ b/src/watchOS/bitwarden/bitwarden WatchKit Extension/Utilities/ColorUtils.swift @@ -7,6 +7,7 @@ extension Color { let primary = Color(hex: "#175DDC") let itemBackground = Color("ItemBackground") let darkTextMuted = Color("DarkTextMuted") + let avatarItemBackground = Color("AvatarItemBackground") } init?(hex: String) { diff --git a/src/watchOS/bitwarden/bitwarden WatchKit Extension/Views/CipherListView.swift b/src/watchOS/bitwarden/bitwarden WatchKit Extension/Views/CipherListView.swift index 4c40568a0..df46de75e 100644 --- a/src/watchOS/bitwarden/bitwarden WatchKit Extension/Views/CipherListView.swift +++ b/src/watchOS/bitwarden/bitwarden WatchKit Extension/Views/CipherListView.swift @@ -6,7 +6,7 @@ struct CipherListView: View { let AVATAR_ID: String = "avatarId" @State private var contentOffset = CGFloat(0) @State private var initialOffset = CGFloat(0) - + var isHeaderVisible: Bool { if !viewModel.searchTerm.isEmpty { return true @@ -50,6 +50,12 @@ struct CipherListView: View { Section() { avatarHeader .id(AVATAR_ID) + .background( + RoundedRectangle(cornerRadius: 5) + .foregroundColor(Color.ui.avatarItemBackground) + .frame(width: geometry.size.width + 10, height: 50) + ) + .padding(0) } } ForEach(viewModel.filteredCiphers, id: \.id) { cipher in @@ -58,7 +64,7 @@ struct CipherListView: View { } .listRowInsets(EdgeInsets()) .listRowBackground(Color.clear) - .padding(3) + .padding(0) } } .emptyState(viewModel.filteredCiphers.isEmpty, emptyContent: { @@ -77,8 +83,10 @@ struct CipherListView: View { } } } + .navigationTitle("Bitwarden") + .navigationBarTitleDisplayMode(.inline) .onAppear { - self.viewModel.checkStateAndFetch() + self.viewModel.fetchCiphers() } .fullScreenCover(isPresented: $viewModel.showingSheet) { BWStateView(viewModel.currentState)