@@ -56,7 +56,6 @@ import li.songe.gkd.MainActivity
56
56
import li.songe.gkd.data.deleteSubscription
57
57
import li.songe.gkd.ui.style.EmptyHeight
58
58
import li.songe.gkd.ui.style.itemHorizontalPadding
59
- import li.songe.gkd.ui.style.itemVerticalPadding
60
59
import li.songe.gkd.util.LOCAL_SUBS_ID
61
60
import li.songe.gkd.util.LocalNavController
62
61
import li.songe.gkd.util.checkSubsUpdate
@@ -122,7 +121,7 @@ fun SubsSheet(
122
121
val childModifier = remember {
123
122
Modifier
124
123
.fillMaxWidth()
125
- .padding(horizontal = itemHorizontalPadding, vertical = itemVerticalPadding / 2 )
124
+ .padding(horizontal = itemHorizontalPadding, vertical = 8 .dp )
126
125
}
127
126
Column (
128
127
modifier = Modifier
@@ -138,16 +137,34 @@ fun SubsSheet(
138
137
modifier = childModifier
139
138
)
140
139
if (subscription != null ) {
141
- if (! subsItem.isLocal) {
140
+ Column (
141
+ modifier = childModifier
142
+ ) {
142
143
Row (
144
+ modifier = Modifier .fillMaxWidth(),
145
+ verticalAlignment = Alignment .CenterVertically ,
143
146
horizontalArrangement = Arrangement .SpaceBetween ,
144
- modifier = childModifier
145
147
) {
146
- Column {
147
- Text (
148
- text = " 作者" ,
149
- style = MaterialTheme .typography.labelLarge,
150
- )
148
+ Text (
149
+ text = " 作者" ,
150
+ style = MaterialTheme .typography.labelLarge,
151
+ )
152
+ Text (
153
+ text = " v${subscription.version} " ,
154
+ style = MaterialTheme .typography.labelMedium,
155
+ color = MaterialTheme .colorScheme.tertiary,
156
+ modifier = Modifier
157
+ .clip(MaterialTheme .shapes.extraSmall)
158
+ .background(MaterialTheme .colorScheme.tertiaryContainer)
159
+ .padding(horizontal = 2 .dp),
160
+ )
161
+ }
162
+ Row (
163
+ modifier = Modifier .fillMaxWidth(),
164
+ verticalAlignment = Alignment .CenterVertically ,
165
+ horizontalArrangement = Arrangement .SpaceBetween ,
166
+ ) {
167
+ if (! subsItem.isLocal) {
151
168
Text (
152
169
text = subscription.author ? : " 未知" ,
153
170
style = MaterialTheme .typography.labelMedium,
@@ -162,49 +179,20 @@ fun SubsSheet(
162
179
softWrap = false ,
163
180
overflow = TextOverflow .Ellipsis ,
164
181
)
165
- }
166
- Column (
167
- horizontalAlignment = Alignment .End
168
- ) {
182
+ } else {
169
183
Text (
170
- text = " v ${subscription.version} " ,
184
+ text = META .appName ,
171
185
style = MaterialTheme .typography.labelMedium,
172
- color = MaterialTheme .colorScheme.tertiary,
173
- modifier = Modifier
174
- .clip(MaterialTheme .shapes.extraSmall)
175
- .background(MaterialTheme .colorScheme.tertiaryContainer)
176
- .padding(horizontal = 2 .dp),
186
+ color = MaterialTheme .colorScheme.secondary,
177
187
)
178
188
}
179
- }
180
- } else {
181
- Column (
182
- modifier = childModifier
183
- ) {
184
189
Text (
185
- text = " 作者" ,
186
- style = MaterialTheme .typography.labelLarge,
187
- )
188
- Text (
189
- text = META .appName,
190
+ text = subsItem.mtimeStr,
190
191
style = MaterialTheme .typography.labelMedium,
191
- color = MaterialTheme .colorScheme.secondary ,
192
+ color = MaterialTheme .colorScheme.onSurfaceVariant ,
192
193
)
193
194
}
194
195
}
195
- Column (
196
- modifier = childModifier
197
- ) {
198
- Text (
199
- text = " 更新时间" ,
200
- style = MaterialTheme .typography.labelLarge,
201
- )
202
- Text (
203
- text = subsItem.mtimeStr,
204
- style = MaterialTheme .typography.labelMedium,
205
- color = MaterialTheme .colorScheme.onSurfaceVariant,
206
- )
207
- }
208
196
if (subscription.globalGroups.isNotEmpty() || subsItem.isLocal) {
209
197
Row (
210
198
modifier = Modifier
0 commit comments