@@ -153,29 +153,24 @@ void showTopicActionSheet(BuildContext context, {
153
153
required int channelId,
154
154
required String topic,
155
155
}) {
156
+ final store = PerAccountStoreWidget .of (context);
157
+ final channelMuted = store.subscriptions[channelId]? .isMuted;
158
+ final visibilityPolicy = store.topicVisibilityPolicy (channelId, topic);
159
+
156
160
final narrow = TopicNarrow (channelId, topic);
157
- UserTopicUpdateButton button ({
158
- UserTopicVisibilityPolicy ? from,
159
- required UserTopicVisibilityPolicy to,
160
- }) {
161
+ UserTopicUpdateButton button (UserTopicVisibilityPolicy to) {
161
162
return UserTopicUpdateButton (
162
- currentVisibilityPolicy: from ,
163
+ currentVisibilityPolicy: visibilityPolicy ,
163
164
newVisibilityPolicy: to,
164
165
narrow: narrow,
165
166
pageContext: context);
166
167
}
167
168
168
- final mute = button (to: UserTopicVisibilityPolicy .muted);
169
- final unmute = button (from: UserTopicVisibilityPolicy .muted,
170
- to: UserTopicVisibilityPolicy .none);
171
- final unmuteInMutedChannel = button (to: UserTopicVisibilityPolicy .unmuted);
172
- final follow = button (to: UserTopicVisibilityPolicy .followed);
173
- final unfollow = button (from: UserTopicVisibilityPolicy .followed,
174
- to: UserTopicVisibilityPolicy .none);
175
-
176
- final store = PerAccountStoreWidget .of (context);
177
- final channelMuted = store.subscriptions[channelId]? .isMuted;
178
- final visibilityPolicy = store.topicVisibilityPolicy (channelId, topic);
169
+ final mute = button (UserTopicVisibilityPolicy .muted);
170
+ final unmute = button (UserTopicVisibilityPolicy .none);
171
+ final unmuteInMutedChannel = button (UserTopicVisibilityPolicy .unmuted);
172
+ final follow = button (UserTopicVisibilityPolicy .followed);
173
+ final unfollow = button (UserTopicVisibilityPolicy .none);
179
174
180
175
// TODO(server-7): simplify this condition away
181
176
final supportsUnmutingTopics = store.connection.zulipFeatureLevel! >= 170 ;
@@ -253,13 +248,13 @@ void showTopicActionSheet(BuildContext context, {
253
248
class UserTopicUpdateButton extends ActionSheetMenuItemButton {
254
249
const UserTopicUpdateButton ({
255
250
super .key,
256
- this .currentVisibilityPolicy,
251
+ required this .currentVisibilityPolicy,
257
252
required this .newVisibilityPolicy,
258
253
required this .narrow,
259
254
required super .pageContext,
260
255
});
261
256
262
- final UserTopicVisibilityPolicy ? currentVisibilityPolicy;
257
+ final UserTopicVisibilityPolicy currentVisibilityPolicy;
263
258
final UserTopicVisibilityPolicy newVisibilityPolicy;
264
259
final TopicNarrow narrow;
265
260
0 commit comments