Skip to content

Commit

Permalink
Merge branch 'main' into ekirjasto-108-improve-contrast-in-tab-bar
Browse files Browse the repository at this point in the history
  • Loading branch information
natlibfi-kaisa authored Dec 9, 2024
2 parents 7705c2e + 99c0d9c commit a1a92c2
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xC6",
"green" : "0xC6",
"red" : "0xC6"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x12",
"green" : "0x12",
"red" : "0x12"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
8 changes: 8 additions & 0 deletions Palace/Views/TPPEntryPointView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,14 @@ final class TPPEntryPointView: UIView {
}

let segmentedControl = UISegmentedControl(items: titles)

// Set style for the filter button group in top of the book catalog in "Browse books" view.
// Segmented control button can be in two states
// - selected: button is currently selected
// - normal: button is not selected
// Use special darker background color for the buttons that are in normal state to add more contrast.
segmentedControl.backgroundColor = TPPConfiguration.catalogSegmentedControlBackgroundColorNormal()

Check failure on line 54 in Palace/Views/TPPEntryPointView.swift

View workflow job for this annotation

GitHub Actions / build

type 'TPPConfiguration' has no member 'catalogSegmentedControlBackgroundColorNormal'

Check failure on line 54 in Palace/Views/TPPEntryPointView.swift

View workflow job for this annotation

GitHub Actions / build

type 'TPPConfiguration' has no member 'catalogSegmentedControlBackgroundColorNormal'

Check failure on line 54 in Palace/Views/TPPEntryPointView.swift

View workflow job for this annotation

GitHub Actions / build

type 'TPPConfiguration' has no member 'catalogSegmentedControlBackgroundColorNormal'

setupSubviews(segmentedControl)
isHidden = false;
}
Expand Down

0 comments on commit a1a92c2

Please sign in to comment.