@@ -2,12 +2,12 @@ import { HStack, ProgressView, Spacer, Text, VStack } from "@expo/ui/swift-ui";
22import {
33 accessibilityElement ,
44 accessibilityLabel ,
5+ fixedSize ,
56 font ,
67 foregroundStyle ,
78 frame ,
89 layoutPriority ,
910 lineLimit ,
10- minimumScaleFactor ,
1111 progressViewStyle ,
1212 tint ,
1313 widgetURL ,
@@ -33,6 +33,8 @@ function SubscriptionUsage(
3333 const accessory = family === "accessoryRectangular" ;
3434 const compact =
3535 family === "systemSmall" || accessory || environment . levelOfDetail === "simplified" ;
36+ // Budget short cards for two quotas per provider, including their secondary text.
37+ const dense = family === "systemSmall" || family === "systemMedium" ;
3638 const limit = family === "systemExtraLarge" ? 6 : family === "systemLarge" ? 4 : 2 ;
3739 const monochrome =
3840 environment . widgetRenderingMode !== "fullColor" || environment . isLuminanceReduced ;
@@ -77,6 +79,7 @@ function SubscriptionUsage(
7779 : provider . detail ;
7880 const barModifiers = [
7981 progressViewStyle ( "linear" ) ,
82+ frame ( { height : 4 } ) ,
8083 ...( monochrome ? [ ] : [ tint ( provider . name === "Claude" ? "#d97757" : "#8e8e93" ) ] ) ,
8184 ] ;
8285 if ( accessory ) {
@@ -99,7 +102,6 @@ function SubscriptionUsage(
99102 modifiers = { [
100103 font ( { textStyle : "caption" , weight : "semibold" } ) ,
101104 lineLimit ( 1 ) ,
102- minimumScaleFactor ( 0.75 ) ,
103105 foregroundStyle ( "primary" ) ,
104106 ] }
105107 >
@@ -132,35 +134,37 @@ function SubscriptionUsage(
132134 < VStack
133135 key = { provider . name }
134136 alignment = "leading"
135- spacing = { compact ? 2 : 4 }
136- modifiers = { [ frame ( { maxWidth : Infinity , alignment : "leading" } ) ] }
137+ spacing = { dense ? 1 : compact ? 2 : 4 }
138+ modifiers = { [
139+ frame ( { maxWidth : Infinity , alignment : "leading" } ) ,
140+ fixedSize ( { horizontal : false , vertical : true } ) ,
141+ ] }
137142 >
138143 < Text
139144 modifiers = { [
140145 font ( { textStyle : compact ? "caption" : "headline" , weight : "bold" } ) ,
141146 lineLimit ( 1 ) ,
142- minimumScaleFactor ( 0.75 ) ,
143147 foregroundStyle ( "primary" ) ,
144148 ] }
145149 >
146150 { provider . name }
147151 </ Text >
148- { ( ! compact || shown . length === 0 ) && detail !== "Subscription remaining" ? (
152+ { ! compact || shown . length === 0 ? (
149153 < Text
150154 modifiers = { [
151155 font ( { textStyle : "caption2" } ) ,
152156 foregroundStyle ( "secondary" ) ,
153- lineLimit ( compact ? 1 : 2 ) ,
157+ lineLimit ( 1 ) ,
154158 ] }
155159 >
156- { detail }
160+ { detail === "Subscription remaining" ? " " : detail }
157161 </ Text >
158162 ) : null }
159163 { shown . map ( ( window ) => (
160164 < VStack
161165 key = { window . label }
162166 alignment = "leading"
163- spacing = { 2 }
167+ spacing = { dense ? 1 : 2 }
164168 modifiers = { [
165169 accessibilityElement ( "ignore" ) ,
166170 accessibilityLabel (
@@ -171,20 +175,21 @@ function SubscriptionUsage(
171175 < HStack spacing = { 4 } >
172176 < Text
173177 modifiers = { [
174- font ( { textStyle : compact ? "caption2" : "caption" } ) ,
178+ font ( { textStyle : compact || dense ? "caption2" : "caption" } ) ,
175179 foregroundStyle ( "secondary" ) ,
176180 lineLimit ( 1 ) ,
177- minimumScaleFactor ( 0.75 ) ,
178181 ] }
179182 >
180183 { window . label }
181184 </ Text >
182185 < Spacer />
183186 < Text
184187 modifiers = { [
185- font ( { textStyle : compact ? "caption2" : "caption" , weight : "semibold" } ) ,
188+ font ( {
189+ textStyle : compact || dense ? "caption2" : "caption" ,
190+ weight : "semibold" ,
191+ } ) ,
186192 lineLimit ( 1 ) ,
187- minimumScaleFactor ( 0.75 ) ,
188193 layoutPriority ( 1 ) ,
189194 foregroundStyle (
190195 window . remaining <= 10 && ! monochrome
@@ -205,7 +210,6 @@ function SubscriptionUsage(
205210 font ( { textStyle : "caption2" } ) ,
206211 foregroundStyle ( "secondary" ) ,
207212 lineLimit ( 1 ) ,
208- minimumScaleFactor ( 0.75 ) ,
209213 ] }
210214 >
211215 { window . reset }
@@ -216,7 +220,13 @@ function SubscriptionUsage(
216220 { ! compact &&
217221 ! stale &&
218222 ( period === "auto" ? ( provider . totalWindows ?? windows . length ) : windows . length ) > limit ? (
219- < Text modifiers = { [ font ( { textStyle : "caption2" } ) , foregroundStyle ( "secondary" ) ] } >
223+ < Text
224+ modifiers = { [
225+ font ( { textStyle : "caption2" } ) ,
226+ foregroundStyle ( "secondary" ) ,
227+ lineLimit ( 1 ) ,
228+ ] }
229+ >
220230 { ( period === "auto" ? ( provider . totalWindows ?? windows . length ) : windows . length ) -
221231 limit } { " " }
222232 more in T3
@@ -228,11 +238,11 @@ function SubscriptionUsage(
228238 return (
229239 < VStack
230240 alignment = "leading"
231- spacing = { accessory ? 2 : 6 }
241+ spacing = { accessory || dense ? 2 : 6 }
232242 modifiers = { props . url ? [ widgetURL ( props . url ) ] : [ ] }
233243 >
234244 { compact ? (
235- < VStack alignment = "leading" spacing = { accessory ? 4 : 8 } >
245+ < VStack alignment = "leading" spacing = { accessory || dense ? 4 : 8 } >
236246 { columns }
237247 </ VStack >
238248 ) : (
@@ -243,12 +253,7 @@ function SubscriptionUsage(
243253 { ! accessory ? < Spacer /> : null }
244254 { ! accessory ? (
245255 < Text
246- modifiers = { [
247- font ( { textStyle : "caption2" } ) ,
248- foregroundStyle ( "secondary" ) ,
249- lineLimit ( 1 ) ,
250- minimumScaleFactor ( 0.75 ) ,
251- ] }
256+ modifiers = { [ font ( { textStyle : "caption2" } ) , foregroundStyle ( "secondary" ) , lineLimit ( 1 ) ] }
252257 >
253258 { props . checkedAt
254259 ? `As of ${ new Date ( props . checkedAt ) . toLocaleString ( undefined , { hour : "numeric" , minute : "2-digit" , month : "short" , day : "numeric" } ) } `
0 commit comments