Skip to content

Commit fe122b8

Browse files
authored
Fixes Needed for the Favorited Books Feature (#20)
* SimplyE rebuild progress commited. * Merge branch 'master' into rebuild/SimplyE * Fixes for List.items and other new changes added. * Changes for randomly changing of heroImage image. * Changes for randomly changing of heroImage image * Changes for randomly changing of heroImage image * Latest updates to all pages and new additions.
1 parent 26f157d commit fe122b8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+2140
-194
lines changed

SimplyE/Assets/black-64bt-favorite-icon.svg

+7
Loading

SimplyE/Assets/red-64bt-favorite-icon.svg

+7
Loading

SimplyE/Sources/SimplyE/Extensions/Pages/BookDetail.page.ext.swift renamed to SimplyE/Sources/SimplyE/Extensions/Pages/books page/BookDetail.page.ext.swift

+16-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ extension BookDetailPageAdapter {
55
return self.page?.getWidgetByName("navigationBar") as! SCDWidgetsNavigationBar
66
}
77

8-
var downloadButton: SCDWidgetsButton {
9-
return self.page?.getWidgetByName("downloadButton") as! SCDWidgetsButton
10-
}
11-
128
var backButton: SCDWidgetsButton {
139
return self.page?.getWidgetByName("backButton") as! SCDWidgetsButton
1410
}
@@ -17,6 +13,10 @@ extension BookDetailPageAdapter {
1713
return self.page?.getWidgetByName("detailsLabel") as! SCDWidgetsLabel
1814
}
1915

16+
var favoritedButton: SCDWidgetsButton {
17+
return self.page?.getWidgetByName("favoritedButton") as! SCDWidgetsButton
18+
}
19+
2020
var listBookDetails: SCDWidgetsListView {
2121
return self.page?.getWidgetByName("listBookDetails") as! SCDWidgetsListView
2222
}
@@ -136,4 +136,16 @@ extension BookDetailPageAdapter {
136136
var caption3: SCDWidgetsLabel {
137137
return self.page?.getWidgetByName("caption3") as! SCDWidgetsLabel
138138
}
139+
140+
var toolBarItem4: SCDWidgetsToolBarItem {
141+
return self.page?.getWidgetByName("toolBarItem4") as! SCDWidgetsToolBarItem
142+
}
143+
144+
var icon4: SCDWidgetsImage {
145+
return self.page?.getWidgetByName("icon4") as! SCDWidgetsImage
146+
}
147+
148+
var caption4: SCDWidgetsLabel {
149+
return self.page?.getWidgetByName("caption4") as! SCDWidgetsLabel
150+
}
139151
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
import ScadeKit
2+
3+
extension FavoritedPageAdapter {
4+
var favoriteLabelTitle: SCDWidgetsLabel {
5+
return self.page?.getWidgetByName("favoriteLabelTitle") as! SCDWidgetsLabel
6+
}
7+
8+
var ctrlListBooks: SCDWidgetsList {
9+
return self.page?.getWidgetByName("ctrlListBooks") as! SCDWidgetsList
10+
}
11+
12+
var toolBar: SCDWidgetsToolBar {
13+
return self.page?.getWidgetByName("toolBar") as! SCDWidgetsToolBar
14+
}
15+
16+
var toolBarItem1: SCDWidgetsToolBarItem {
17+
return self.page?.getWidgetByName("toolBarItem1") as! SCDWidgetsToolBarItem
18+
}
19+
20+
var icon1: SCDWidgetsImage {
21+
return self.page?.getWidgetByName("icon1") as! SCDWidgetsImage
22+
}
23+
24+
var caption1: SCDWidgetsLabel {
25+
return self.page?.getWidgetByName("caption1") as! SCDWidgetsLabel
26+
}
27+
28+
var toolBarItem2: SCDWidgetsToolBarItem {
29+
return self.page?.getWidgetByName("toolBarItem2") as! SCDWidgetsToolBarItem
30+
}
31+
32+
var icon2: SCDWidgetsImage {
33+
return self.page?.getWidgetByName("icon2") as! SCDWidgetsImage
34+
}
35+
36+
var caption2: SCDWidgetsLabel {
37+
return self.page?.getWidgetByName("caption2") as! SCDWidgetsLabel
38+
}
39+
40+
var toolBarItem3: SCDWidgetsToolBarItem {
41+
return self.page?.getWidgetByName("toolBarItem3") as! SCDWidgetsToolBarItem
42+
}
43+
44+
var icon3: SCDWidgetsImage {
45+
return self.page?.getWidgetByName("icon3") as! SCDWidgetsImage
46+
}
47+
48+
var caption3: SCDWidgetsLabel {
49+
return self.page?.getWidgetByName("caption3") as! SCDWidgetsLabel
50+
}
51+
52+
var toolBarItem4: SCDWidgetsToolBarItem {
53+
return self.page?.getWidgetByName("toolBarItem4") as! SCDWidgetsToolBarItem
54+
}
55+
56+
var icon4: SCDWidgetsImage {
57+
return self.page?.getWidgetByName("icon4") as! SCDWidgetsImage
58+
}
59+
60+
var caption4: SCDWidgetsLabel {
61+
return self.page?.getWidgetByName("caption4") as! SCDWidgetsLabel
62+
}
63+
}

SimplyE/Sources/SimplyE/Extensions/Pages/search.page.ext.swift renamed to SimplyE/Sources/SimplyE/Extensions/Pages/books page/search page/search.page.ext.swift

+12
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,16 @@ extension SearchPageAdapter {
5656
var caption3: SCDWidgetsLabel {
5757
return self.page?.getWidgetByName("caption3") as! SCDWidgetsLabel
5858
}
59+
60+
var toolBarItem4: SCDWidgetsToolBarItem {
61+
return self.page?.getWidgetByName("toolBarItem4") as! SCDWidgetsToolBarItem
62+
}
63+
64+
var icon4: SCDWidgetsImage {
65+
return self.page?.getWidgetByName("icon4") as! SCDWidgetsImage
66+
}
67+
68+
var caption4: SCDWidgetsLabel {
69+
return self.page?.getWidgetByName("caption4") as! SCDWidgetsLabel
70+
}
5971
}

SimplyE/Sources/SimplyE/Extensions/Pages/main.page.ext.swift

+12
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,16 @@ extension MainPageAdapter {
4848
var caption3: SCDWidgetsLabel {
4949
return self.page?.getWidgetByName("caption3") as! SCDWidgetsLabel
5050
}
51+
52+
var toolBarItem4: SCDWidgetsToolBarItem {
53+
return self.page?.getWidgetByName("toolBarItem4") as! SCDWidgetsToolBarItem
54+
}
55+
56+
var icon4: SCDWidgetsImage {
57+
return self.page?.getWidgetByName("icon4") as! SCDWidgetsImage
58+
}
59+
60+
var caption4: SCDWidgetsLabel {
61+
return self.page?.getWidgetByName("caption4") as! SCDWidgetsLabel
62+
}
5163
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import ScadeKit
2+
3+
extension AboutPageAdapter {
4+
var webView: SCDWidgetsWebView {
5+
return self.page?.getWidgetByName("webView") as! SCDWidgetsWebView
6+
}
7+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import ScadeKit
2+
3+
extension ContactUsPageAdapter {
4+
var webView: SCDWidgetsWebView {
5+
return self.page?.getWidgetByName("webView") as! SCDWidgetsWebView
6+
}
7+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
import ScadeKit
2+
3+
extension SettingsPageAdapter {
4+
var navigationBar: SCDWidgetsNavigationBar {
5+
return self.page?.getWidgetByName("navigationBar") as! SCDWidgetsNavigationBar
6+
}
7+
8+
var titleLabel: SCDWidgetsLabel {
9+
return self.page?.getWidgetByName("titleLabel") as! SCDWidgetsLabel
10+
}
11+
12+
var VerticalView: SCDWidgetsListView {
13+
return self.page?.getWidgetByName("VerticalView") as! SCDWidgetsListView
14+
}
15+
16+
var subrow1: SCDWidgetsListView {
17+
return self.page?.getWidgetByName("subrow1") as! SCDWidgetsListView
18+
}
19+
20+
var horinzontalView1: SCDWidgetsRowView {
21+
return self.page?.getWidgetByName("horinzontalView1") as! SCDWidgetsRowView
22+
}
23+
24+
var aboutLabel: SCDWidgetsLabel {
25+
return self.page?.getWidgetByName("aboutLabel") as! SCDWidgetsLabel
26+
}
27+
28+
var arrowLabel1: SCDWidgetsLabel {
29+
return self.page?.getWidgetByName("arrowLabel1") as! SCDWidgetsLabel
30+
}
31+
32+
var subrow2: SCDWidgetsListView {
33+
return self.page?.getWidgetByName("subrow2") as! SCDWidgetsListView
34+
}
35+
36+
var horinzontalView2: SCDWidgetsRowView {
37+
return self.page?.getWidgetByName("horinzontalView2") as! SCDWidgetsRowView
38+
}
39+
40+
var rateLabel: SCDWidgetsLabel {
41+
return self.page?.getWidgetByName("rateLabel") as! SCDWidgetsLabel
42+
}
43+
44+
var label2: SCDWidgetsLabel {
45+
return self.page?.getWidgetByName("label2") as! SCDWidgetsLabel
46+
}
47+
48+
var subrow3: SCDWidgetsListView {
49+
return self.page?.getWidgetByName("subrow3") as! SCDWidgetsListView
50+
}
51+
52+
var horinzontalView3: SCDWidgetsRowView {
53+
return self.page?.getWidgetByName("horinzontalView3") as! SCDWidgetsRowView
54+
}
55+
56+
var contactUsLabel: SCDWidgetsLabel {
57+
return self.page?.getWidgetByName("contactUsLabel") as! SCDWidgetsLabel
58+
}
59+
60+
var label3: SCDWidgetsLabel {
61+
return self.page?.getWidgetByName("label3") as! SCDWidgetsLabel
62+
}
63+
64+
var subrow4: SCDWidgetsListView {
65+
return self.page?.getWidgetByName("subrow4") as! SCDWidgetsListView
66+
}
67+
68+
var horinzontalView4: SCDWidgetsRowView {
69+
return self.page?.getWidgetByName("horinzontalView4") as! SCDWidgetsRowView
70+
}
71+
72+
var darkModeLabel: SCDWidgetsLabel {
73+
return self.page?.getWidgetByName("darkModeLabel") as! SCDWidgetsLabel
74+
}
75+
76+
var checkbox1: SCDWidgetsCheckbox {
77+
return self.page?.getWidgetByName("checkbox1") as! SCDWidgetsCheckbox
78+
}
79+
80+
var horinzontalView5: SCDWidgetsRowView {
81+
return self.page?.getWidgetByName("horinzontalView5") as! SCDWidgetsRowView
82+
}
83+
84+
var label: SCDWidgetsLabel {
85+
return self.page?.getWidgetByName("label") as! SCDWidgetsLabel
86+
}
87+
88+
var toolBar: SCDWidgetsToolBar {
89+
return self.page?.getWidgetByName("toolBar") as! SCDWidgetsToolBar
90+
}
91+
92+
var toolBarItem1: SCDWidgetsToolBarItem {
93+
return self.page?.getWidgetByName("toolBarItem1") as! SCDWidgetsToolBarItem
94+
}
95+
96+
var icon1: SCDWidgetsImage {
97+
return self.page?.getWidgetByName("icon1") as! SCDWidgetsImage
98+
}
99+
100+
var caption1: SCDWidgetsLabel {
101+
return self.page?.getWidgetByName("caption1") as! SCDWidgetsLabel
102+
}
103+
104+
var toolBarItem2: SCDWidgetsToolBarItem {
105+
return self.page?.getWidgetByName("toolBarItem2") as! SCDWidgetsToolBarItem
106+
}
107+
108+
var icon2: SCDWidgetsImage {
109+
return self.page?.getWidgetByName("icon2") as! SCDWidgetsImage
110+
}
111+
112+
var caption2: SCDWidgetsLabel {
113+
return self.page?.getWidgetByName("caption2") as! SCDWidgetsLabel
114+
}
115+
116+
var toolBarItem3: SCDWidgetsToolBarItem {
117+
return self.page?.getWidgetByName("toolBarItem3") as! SCDWidgetsToolBarItem
118+
}
119+
120+
var icon3: SCDWidgetsImage {
121+
return self.page?.getWidgetByName("icon3") as! SCDWidgetsImage
122+
}
123+
124+
var caption3: SCDWidgetsLabel {
125+
return self.page?.getWidgetByName("caption3") as! SCDWidgetsLabel
126+
}
127+
128+
var toolBarItem4: SCDWidgetsToolBarItem {
129+
return self.page?.getWidgetByName("toolBarItem4") as! SCDWidgetsToolBarItem
130+
}
131+
132+
var icon4: SCDWidgetsImage {
133+
return self.page?.getWidgetByName("icon4") as! SCDWidgetsImage
134+
}
135+
136+
var caption4: SCDWidgetsLabel {
137+
return self.page?.getWidgetByName("caption4") as! SCDWidgetsLabel
138+
}
139+
}

0 commit comments

Comments
 (0)