diff --git a/lib/api/seventv_api.dart b/lib/api/seventv_api.dart index 1b94db5d..f21eea19 100644 --- a/lib/api/seventv_api.dart +++ b/lib/api/seventv_api.dart @@ -19,7 +19,7 @@ class SevenTVApi { final decoded = jsonDecode(response.body) as List; final emotes = decoded.map((emote) => Emote7TV.fromJson(emote)); - return emotes.map((emote) => Emote.from7TV(emote, EmoteType.sevenTvGlobal)).toList(); + return emotes.map((emote) => Emote.from7TV(emote, EmoteType.sevenTVGlobal)).toList(); } else { return Future.error('Failed to get 7TV global emotes'); } @@ -34,7 +34,7 @@ class SevenTVApi { final decoded = jsonDecode(response.body) as List; final emotes = decoded.map((emote) => Emote7TV.fromJson(emote)); - return emotes.map((emote) => Emote.from7TV(emote, EmoteType.sevenTvChannel)).toList(); + return emotes.map((emote) => Emote.from7TV(emote, EmoteType.sevenTVChannel)).toList(); } else { return Future.error('Failed to get 7TV channel emotes'); } diff --git a/lib/main.dart b/lib/main.dart index ec898779..e59e0120 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -45,7 +45,7 @@ Future main() async { final twitchApiService = TwitchApi(client); final bttvApiService = BTTVApi(client); final ffzApiService = FFZApi(client); - final sevenTvApiService = SevenTVApi(client); + final sevenTVApiService = SevenTVApi(client); // Create and initialize the authentication store final authStore = AuthStore(twitchApi: twitchApiService); @@ -59,7 +59,7 @@ Future main() async { Provider(create: (_) => twitchApiService), Provider(create: (_) => bttvApiService), Provider(create: (_) => ffzApiService), - Provider(create: (_) => sevenTvApiService), + Provider(create: (_) => sevenTVApiService), ], child: const MyApp(), ), diff --git a/lib/models/badges.dart b/lib/models/badges.dart index 4e61b620..574837fa 100644 --- a/lib/models/badges.dart +++ b/lib/models/badges.dart @@ -159,7 +159,7 @@ class Badge { factory Badge.from7TV(BadgeInfo7TV badge) => Badge( name: badge.tooltip, url: badge.urls[2][1], - type: BadgeType.sevenTv, + type: BadgeType.sevenTV, ); } @@ -167,5 +167,5 @@ enum BadgeType { twitch, bttv, ffz, - sevenTv, + sevenTV, } diff --git a/lib/models/emotes.dart b/lib/models/emotes.dart index 3d08f31a..54dc30fb 100644 --- a/lib/models/emotes.dart +++ b/lib/models/emotes.dart @@ -315,6 +315,6 @@ enum EmoteType { bttvGlobal, bttvChannel, bttvShared, - sevenTvGlobal, - sevenTvChannel, + sevenTVGlobal, + sevenTVChannel, } diff --git a/lib/screens/channel/chat/emote_menu/emote_menu.dart b/lib/screens/channel/chat/emote_menu/emote_menu.dart index 06ead1b6..147cbcf0 100644 --- a/lib/screens/channel/chat/emote_menu/emote_menu.dart +++ b/lib/screens/channel/chat/emote_menu/emote_menu.dart @@ -49,7 +49,7 @@ class EmoteMenu extends StatelessWidget { Observer( builder: (_) => EmoteMenuPanel( textController: textController, - emotes: assetsStore.sevenTvEmotes, + emotes: assetsStore.sevenTVEmotes, ), ), ], diff --git a/lib/screens/channel/chat/emote_menu/emote_menu_panel.dart b/lib/screens/channel/chat/emote_menu/emote_menu_panel.dart index 2f63a8af..2b58d7fa 100644 --- a/lib/screens/channel/chat/emote_menu/emote_menu_panel.dart +++ b/lib/screens/channel/chat/emote_menu/emote_menu_panel.dart @@ -16,7 +16,7 @@ class EmoteMenuPanel extends StatelessWidget { emote.type == EmoteType.twitchGlobal || emote.type == EmoteType.bttvGlobal || emote.type == EmoteType.ffzGlobal || - emote.type == EmoteType.sevenTvGlobal) + emote.type == EmoteType.sevenTVGlobal) .toList(); final channelEmotes = emotes @@ -25,7 +25,7 @@ class EmoteMenuPanel extends StatelessWidget { emote.type == EmoteType.bttvChannel || emote.type == EmoteType.bttvShared || emote.type == EmoteType.ffzChannel || - emote.type == EmoteType.sevenTvChannel) + emote.type == EmoteType.sevenTVChannel) .toList(); final subEmotes = emotes.where((emote) => emote.type == EmoteType.twitchSub).toList(); diff --git a/lib/screens/channel/stores/chat_assets_store.dart b/lib/screens/channel/stores/chat_assets_store.dart index a6a8316a..424d4cb2 100644 --- a/lib/screens/channel/stores/chat_assets_store.dart +++ b/lib/screens/channel/stores/chat_assets_store.dart @@ -14,7 +14,7 @@ abstract class _ChatAssetsStoreBase with Store { final TwitchApi twitchApi; final BTTVApi bttvApi; final FFZApi ffzApi; - final SevenTVApi sevenTvApi; + final SevenTVApi sevenTVApi; /// Contains any custom FFZ mod and vip badges for the channel. RoomFFZ? ffzRoomInfo; @@ -26,7 +26,7 @@ abstract class _ChatAssetsStoreBase with Store { List get ffzEmotes => _emoteToObject.values.where((emote) => isFFZ(emote)).toList(); @computed - List get sevenTvEmotes => _emoteToObject.values.where((emote) => is7TV(emote)).toList(); + List get sevenTVEmotes => _emoteToObject.values.where((emote) => is7TV(emote)).toList(); /// The map of badges ids to their object representation. final twitchBadgesToObject = ObservableMap(); @@ -68,14 +68,14 @@ abstract class _ChatAssetsStoreBase with Store { } bool is7TV(Emote emote) { - return emote.type == EmoteType.sevenTvChannel || emote.type == EmoteType.sevenTvGlobal; + return emote.type == EmoteType.sevenTVChannel || emote.type == EmoteType.sevenTVGlobal; } _ChatAssetsStoreBase({ required this.twitchApi, required this.bttvApi, required this.ffzApi, - required this.sevenTvApi, + required this.sevenTVApi, }); /// Fetches global and channel assets (badges and emotes) and stores them in [_emoteToUrl] @@ -119,8 +119,8 @@ abstract class _ChatAssetsStoreBase with Store { bttvApi.getEmotesChannel(id: channelId).catchError(onError), twitchApi.getEmotesGlobal(headers: headers).catchError(onError), twitchApi.getEmotesChannel(id: channelId, headers: headers).catchError(onError), - sevenTvApi.getEmotesGlobal().catchError(onError), - sevenTvApi.getEmotesChannel(user: channelName).catchError(onError), + sevenTVApi.getEmotesGlobal().catchError(onError), + sevenTVApi.getEmotesChannel(user: channelName).catchError(onError), ffzApi.getRoomInfo(name: channelName).then((ffzRoom) { ffzRoomInfo = ffzRoom.item1; return ffzRoom.item2; @@ -139,7 +139,7 @@ abstract class _ChatAssetsStoreBase with Store { .then((badges) => twitchBadgesToObject.addAll(badges)) .then((_) => twitchApi.getBadgesChannel(id: channelId).then((badges) => twitchBadgesToObject.addAll(badges)).catchError(onError)), ffzApi.getBadges().then((badges) => _userToFFZBadges = badges).catchError(onError), - sevenTvApi.getBadges().then((badges) => _userTo7TVBadges = badges).catchError(onError), + sevenTVApi.getBadges().then((badges) => _userTo7TVBadges = badges).catchError(onError), bttvApi.getBadges().then((badges) => _userToBTTVBadges = badges).catchError(onError), ]); diff --git a/lib/screens/channel/stores/chat_assets_store.g.dart b/lib/screens/channel/stores/chat_assets_store.g.dart index 7db0dce5..6cfce0fb 100644 --- a/lib/screens/channel/stores/chat_assets_store.g.dart +++ b/lib/screens/channel/stores/chat_assets_store.g.dart @@ -23,12 +23,12 @@ mixin _$ChatAssetsStore on _ChatAssetsStoreBase, Store { (_$ffzEmotesComputed ??= Computed>(() => super.ffzEmotes, name: '_ChatAssetsStoreBase.ffzEmotes')) .value; - Computed>? _$sevenTvEmotesComputed; + Computed>? _$sevenTVEmotesComputed; @override - List get sevenTvEmotes => (_$sevenTvEmotesComputed ??= - Computed>(() => super.sevenTvEmotes, - name: '_ChatAssetsStoreBase.sevenTvEmotes')) + List get sevenTVEmotes => (_$sevenTVEmotesComputed ??= + Computed>(() => super.sevenTVEmotes, + name: '_ChatAssetsStoreBase.sevenTVEmotes')) .value; final _$_emoteToObjectAtom = @@ -232,7 +232,7 @@ emoteMenuIndex: ${emoteMenuIndex}, showEmoteMenu: ${showEmoteMenu}, bttvEmotes: ${bttvEmotes}, ffzEmotes: ${ffzEmotes}, -sevenTvEmotes: ${sevenTvEmotes} +sevenTVEmotes: ${sevenTVEmotes} '''; } } diff --git a/lib/screens/home/search/search_results_channels.dart b/lib/screens/home/search/search_results_channels.dart index 098c2363..ed2542fe 100644 --- a/lib/screens/home/search/search_results_channels.dart +++ b/lib/screens/home/search/search_results_channels.dart @@ -44,7 +44,7 @@ class SearchResultsChannels extends StatelessWidget { twitchApi: context.read(), ffzApi: context.read(), bttvApi: context.read(), - sevenTvApi: context.read(), + sevenTVApi: context.read(), ), auth: searchStore.authStore, settings: context.read(), @@ -120,7 +120,7 @@ class SearchResultsChannels extends StatelessWidget { twitchApi: context.read(), ffzApi: context.read(), bttvApi: context.read(), - sevenTvApi: context.read(), + sevenTVApi: context.read(), ), auth: searchStore.authStore, settings: context.read(), diff --git a/lib/screens/home/widgets/stream_card.dart b/lib/screens/home/widgets/stream_card.dart index cc011db7..b89a8a64 100644 --- a/lib/screens/home/widgets/stream_card.dart +++ b/lib/screens/home/widgets/stream_card.dart @@ -58,7 +58,7 @@ class StreamCard extends StatelessWidget { twitchApi: context.read(), ffzApi: context.read(), bttvApi: context.read(), - sevenTvApi: context.read(), + sevenTVApi: context.read(), ), ), ), diff --git a/pubspec.lock b/pubspec.lock index 119e360a..b1563226 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -98,7 +98,7 @@ packages: name: built_value url: "https://pub.dartlang.org" source: hosted - version: "8.1.3" + version: "8.1.4" cached_network_image: dependency: "direct main" description: @@ -1007,7 +1007,7 @@ packages: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "2.3.3" + version: "2.3.4" xdg_directories: dependency: transitive description: