ios widget showing what is available at chucks
feat: more ui tweaks
+39
-32
+2
-1
android/app/src/main/java/com/wasupchucks/ui/screens/home/HomeScreen.kt
+2
-1
android/app/src/main/java/com/wasupchucks/ui/screens/home/HomeScreen.kt
···
64
64
TopAppBar(
65
65
title = { Text(stringResource(R.string.app_name)) },
66
66
colors = TopAppBarDefaults.topAppBarColors(
67
-
containerColor = MaterialTheme.colorScheme.surface
67
+
containerColor = MaterialTheme.colorScheme.surfaceContainer
68
68
)
69
69
)
70
70
},
71
+
containerColor = MaterialTheme.colorScheme.surfaceContainer,
71
72
contentWindowInsets = WindowInsets(0, 0, 0, 0)
72
73
) { paddingValues ->
73
74
PullToRefreshBox(
+15
-13
android/app/src/main/java/com/wasupchucks/widget/ui/LargeWidget.kt
+15
-13
android/app/src/main/java/com/wasupchucks/widget/ui/LargeWidget.kt
···
3
3
import androidx.compose.runtime.Composable
4
4
import androidx.compose.ui.unit.dp
5
5
import androidx.compose.ui.unit.sp
6
+
import androidx.glance.ColorFilter
6
7
import androidx.glance.GlanceModifier
7
8
import androidx.glance.GlanceTheme
8
9
import androidx.glance.Image
···
39
40
val statusColor = if (status.isOpen) {
40
41
GlanceTheme.colors.primary
41
42
} else {
42
-
GlanceTheme.colors.tertiary
43
+
GlanceTheme.colors.onSurfaceVariant
43
44
}
44
45
45
46
val iconRes = when {
···
79
80
Image(
80
81
provider = ImageProvider(iconRes),
81
82
contentDescription = null,
82
-
modifier = GlanceModifier.size(28.dp)
83
+
modifier = GlanceModifier.size(32.dp),
84
+
colorFilter = ColorFilter.tint(GlanceTheme.colors.onSurface)
83
85
)
84
-
Spacer(modifier = GlanceModifier.width(8.dp))
86
+
Spacer(modifier = GlanceModifier.width(10.dp))
85
87
Column {
86
88
Text(
87
89
text = if (status.isOpen) "Open" else "Closed",
88
90
style = TextStyle(
89
-
fontSize = 12.sp,
91
+
fontSize = 14.sp,
90
92
fontWeight = FontWeight.Bold,
91
93
color = statusColor
92
94
)
···
99
101
Text(
100
102
text = mealName,
101
103
style = TextStyle(
102
-
fontSize = 18.sp,
104
+
fontSize = 20.sp,
103
105
fontWeight = FontWeight.Bold,
104
106
color = GlanceTheme.colors.onSurface
105
107
)
···
115
117
Text(
116
118
text = remaining.toCompactCountdown(),
117
119
style = TextStyle(
118
-
fontSize = 44.sp,
120
+
fontSize = 48.sp,
119
121
fontWeight = FontWeight.Bold,
120
122
color = GlanceTheme.colors.onSurface,
121
123
textAlign = TextAlign.End
···
128
130
Text(
129
131
text = labelText,
130
132
style = TextStyle(
131
-
fontSize = 11.sp,
133
+
fontSize = 13.sp,
132
134
color = GlanceTheme.colors.onSurfaceVariant,
133
135
textAlign = TextAlign.End
134
136
)
···
137
139
}
138
140
}
139
141
140
-
Spacer(modifier = GlanceModifier.height(12.dp))
142
+
Spacer(modifier = GlanceModifier.height(16.dp))
141
143
142
144
// Specials section
143
145
Text(
144
146
text = venueName,
145
147
style = TextStyle(
146
-
fontSize = 12.sp,
148
+
fontSize = 14.sp,
147
149
fontWeight = FontWeight.Bold,
148
150
color = GlanceTheme.colors.onSurfaceVariant
149
151
)
150
152
)
151
153
152
-
Spacer(modifier = GlanceModifier.height(8.dp))
154
+
Spacer(modifier = GlanceModifier.height(10.dp))
153
155
154
156
if (specials.isEmpty()) {
155
157
Spacer(modifier = GlanceModifier.defaultWeight())
···
160
162
Text(
161
163
text = "No specials available",
162
164
style = TextStyle(
163
-
fontSize = 14.sp,
165
+
fontSize = 16.sp,
164
166
color = GlanceTheme.colors.onSurfaceVariant
165
167
)
166
168
)
···
174
176
Text(
175
177
text = "\u2022 ${item.name}",
176
178
style = TextStyle(
177
-
fontSize = 14.sp,
179
+
fontSize = 16.sp,
178
180
color = GlanceTheme.colors.onSurface
179
181
),
180
182
maxLines = 1
181
183
)
182
-
Spacer(modifier = GlanceModifier.height(4.dp))
184
+
Spacer(modifier = GlanceModifier.height(6.dp))
183
185
}
184
186
}
185
187
}
+12
-10
android/app/src/main/java/com/wasupchucks/widget/ui/MediumWidget.kt
+12
-10
android/app/src/main/java/com/wasupchucks/widget/ui/MediumWidget.kt
···
3
3
import androidx.compose.runtime.Composable
4
4
import androidx.compose.ui.unit.dp
5
5
import androidx.compose.ui.unit.sp
6
+
import androidx.glance.ColorFilter
6
7
import androidx.glance.GlanceModifier
7
8
import androidx.glance.GlanceTheme
8
9
import androidx.glance.Image
···
38
39
val statusColor = if (status.isOpen) {
39
40
GlanceTheme.colors.primary
40
41
} else {
41
-
GlanceTheme.colors.tertiary
42
+
GlanceTheme.colors.onSurfaceVariant
42
43
}
43
44
44
45
val iconRes = when {
···
80
81
Image(
81
82
provider = ImageProvider(iconRes),
82
83
contentDescription = null,
83
-
modifier = GlanceModifier.size(16.dp)
84
+
modifier = GlanceModifier.size(20.dp),
85
+
colorFilter = ColorFilter.tint(GlanceTheme.colors.onSurface)
84
86
)
85
-
Spacer(modifier = GlanceModifier.width(4.dp))
87
+
Spacer(modifier = GlanceModifier.width(6.dp))
86
88
Text(
87
89
text = if (status.isOpen) "Open" else "Closed",
88
90
style = TextStyle(
89
-
fontSize = 12.sp,
91
+
fontSize = 14.sp,
90
92
fontWeight = FontWeight.Bold,
91
93
color = statusColor
92
94
)
···
97
99
Text(
98
100
text = remaining.toCompactCountdown(),
99
101
style = TextStyle(
100
-
fontSize = 48.sp,
102
+
fontSize = 52.sp,
101
103
fontWeight = FontWeight.Bold,
102
104
color = GlanceTheme.colors.onSurface
103
105
)
···
114
116
Text(
115
117
text = labelText,
116
118
style = TextStyle(
117
-
fontSize = 10.sp,
119
+
fontSize = 12.sp,
118
120
color = GlanceTheme.colors.onSurfaceVariant
119
121
)
120
122
)
···
133
135
Text(
134
136
text = venueName,
135
137
style = TextStyle(
136
-
fontSize = 12.sp,
138
+
fontSize = 14.sp,
137
139
fontWeight = FontWeight.Bold,
138
140
color = GlanceTheme.colors.onSurfaceVariant
139
141
)
140
142
)
141
143
142
-
Spacer(modifier = GlanceModifier.height(6.dp))
144
+
Spacer(modifier = GlanceModifier.height(8.dp))
143
145
144
146
if (specials.isEmpty()) {
145
147
Text(
146
148
text = "No specials available",
147
149
style = TextStyle(
148
-
fontSize = 13.sp,
150
+
fontSize = 14.sp,
149
151
color = GlanceTheme.colors.onSurfaceVariant
150
152
)
151
153
)
···
154
156
Text(
155
157
text = "\u2022 ${item.name}",
156
158
style = TextStyle(
157
-
fontSize = 13.sp,
159
+
fontSize = 14.sp,
158
160
color = GlanceTheme.colors.onSurface
159
161
),
160
162
maxLines = 1
+8
-6
android/app/src/main/java/com/wasupchucks/widget/ui/SmallWidget.kt
+8
-6
android/app/src/main/java/com/wasupchucks/widget/ui/SmallWidget.kt
···
3
3
import androidx.compose.runtime.Composable
4
4
import androidx.compose.ui.unit.dp
5
5
import androidx.compose.ui.unit.sp
6
+
import androidx.glance.ColorFilter
6
7
import androidx.glance.GlanceModifier
7
8
import androidx.glance.GlanceTheme
8
9
import androidx.glance.Image
···
31
32
val statusColor = if (status.isOpen) {
32
33
GlanceTheme.colors.primary
33
34
} else {
34
-
GlanceTheme.colors.tertiary
35
+
GlanceTheme.colors.onSurfaceVariant
35
36
}
36
37
37
38
val iconRes = when {
···
67
68
Image(
68
69
provider = ImageProvider(iconRes),
69
70
contentDescription = null,
70
-
modifier = GlanceModifier.size(16.dp)
71
+
modifier = GlanceModifier.size(20.dp),
72
+
colorFilter = ColorFilter.tint(GlanceTheme.colors.onSurface)
71
73
)
72
-
Spacer(modifier = GlanceModifier.width(4.dp))
74
+
Spacer(modifier = GlanceModifier.width(6.dp))
73
75
Text(
74
76
text = if (status.isOpen) "Open" else "Closed",
75
77
style = TextStyle(
76
-
fontSize = 12.sp,
78
+
fontSize = 14.sp,
77
79
fontWeight = FontWeight.Bold,
78
80
color = statusColor
79
81
)
···
85
87
Text(
86
88
text = remaining.toCompactCountdown(),
87
89
style = TextStyle(
88
-
fontSize = 52.sp,
90
+
fontSize = 56.sp,
89
91
fontWeight = FontWeight.Bold,
90
92
color = GlanceTheme.colors.onSurface
91
93
)
···
102
104
Text(
103
105
text = labelText,
104
106
style = TextStyle(
105
-
fontSize = 10.sp,
107
+
fontSize = 12.sp,
106
108
color = GlanceTheme.colors.onSurfaceVariant
107
109
)
108
110
)
+1
-1
android/app/src/main/res/drawable/ic_dinner.xml
+1
-1
android/app/src/main/res/drawable/ic_dinner.xml
···
6
6
android:viewportHeight="24">
7
7
<path
8
8
android:fillColor="#000000"
9
-
android:pathData="M12,2C8.43,2 5.23,3.54 3.01,6L12,22l8.99,-16C18.78,3.55 15.57,2 12,2zM7,7c0,-0.55 0.45,-1 1,-1s1,0.45 1,1s-0.45,1 -1,1S7,7.55 7,7zM10,12c-0.55,0 -1,-0.45 -1,-1c0,-0.55 0.45,-1 1,-1s1,0.45 1,1C11,11.55 10.55,12 10,12zM12,9c-0.55,0 -1,-0.45 -1,-1c0,-0.55 0.45,-1 1,-1s1,0.45 1,1C13,8.55 12.55,9 12,9z"/>
9
+
android:pathData="M2,19h20v2H2V19zM4,13c0,2.8 2.2,5 5,5h6c2.8,0 5,-2.2 5,-5v-1H4V13zM19.5,4h-1V2.5c0,-0.3 -0.2,-0.5 -0.5,-0.5h0c-0.3,0 -0.5,0.2 -0.5,0.5V4h-1c-0.3,0 -0.5,0.2 -0.5,0.5v0c0,0.3 0.2,0.5 0.5,0.5h1V6c0,0.3 0.2,0.5 0.5,0.5h0C18.8,6.5 19,6.3 19,6V5h1c0.3,0 0.5,-0.2 0.5,-0.5v0C20,4.2 19.8,4 19.5,4zM14.5,6h-1V4.5c0,-0.3 -0.2,-0.5 -0.5,-0.5h0c-0.3,0 -0.5,0.2 -0.5,0.5V6h-1C11.2,6 11,6.2 11,6.5v0C11,6.8 11.2,7 11.5,7h1v1.5c0,0.3 0.2,0.5 0.5,0.5h0c0.3,0 0.5,-0.2 0.5,-0.5V7h1C14.8,7 15,6.8 15,6.5v0C15,6.2 14.8,6 14.5,6z"/>
10
10
</vector>
+1
-1
android/app/src/main/res/drawable/ic_lunch.xml
+1
-1
android/app/src/main/res/drawable/ic_lunch.xml
···
6
6
android:viewportHeight="24">
7
7
<path
8
8
android:fillColor="#000000"
9
-
android:pathData="M2,19h20v2H2V19zM5,7h14l-1.5,9h-11L5,7zM1,5h22v2H1V5z"/>
9
+
android:pathData="M22,10h-4.2C17.4,7.3 14.9,5 12,5s-5.4,2.3 -5.8,5H2c-0.5,0 -1,0.5 -1,1v1c0,2.8 2.2,5 5,5h12c2.8,0 5,-2.2 5,-5v-1C23,10.5 22.5,10 22,10zM4.1,14c-0.6,-0.6 -0.9,-1.4 -1,-2.2h3.6C6.9,12.6 7.3,13.4 7.9,14H4.1zM12,7c1.8,0 3.4,1.2 3.9,3H8.1C8.6,8.2 10.2,7 12,7zM19.9,14h-3.8c0.6,-0.6 1,-1.4 1.2,-2.2h3.6C20.8,12.6 20.5,13.4 19.9,14zM2,19h20v2H2V19z"/>
10
10
</vector>