From a0361f86a42a3b94bf7856489d825d71cb6aa2e2 Mon Sep 17 00:00:00 2001 From: LezdCS Date: Thu, 10 Oct 2024 09:02:14 +0900 Subject: [PATCH] add back overlay tab for ios SE --- .../controllers/streamelements_view_controller.dart | 7 +------ .../widgets/tabs/streamelements_tab_view.dart | 12 +++--------- pubspec.yaml | 2 +- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/lib/src/presentation/controllers/streamelements_view_controller.dart b/lib/src/presentation/controllers/streamelements_view_controller.dart index 26cc16d8..a434a4d5 100644 --- a/lib/src/presentation/controllers/streamelements_view_controller.dart +++ b/lib/src/presentation/controllers/streamelements_view_controller.dart @@ -1,5 +1,4 @@ import 'dart:async'; -import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -48,11 +47,7 @@ class StreamelementsViewController extends GetxController @override Future onInit() async { - if(!Platform.isIOS) { - tabController = TabController(length: 3, vsync: this); - } else { - tabController = TabController(length: 2, vsync: this); - } + tabController = TabController(length: 3, vsync: this); activitiesScrollController = ScrollController(); songRequestScrollController = ScrollController(); diff --git a/lib/src/presentation/widgets/tabs/streamelements_tab_view.dart b/lib/src/presentation/widgets/tabs/streamelements_tab_view.dart index 614fc40e..af891ed2 100644 --- a/lib/src/presentation/widgets/tabs/streamelements_tab_view.dart +++ b/lib/src/presentation/widgets/tabs/streamelements_tab_view.dart @@ -4,7 +4,6 @@ import 'package:irllink/src/presentation/controllers/streamelements_view_control import 'package:irllink/src/presentation/widgets/stream_elements/se_activities_list.dart'; import 'package:irllink/src/presentation/widgets/stream_elements/se_overlays.dart'; import 'package:irllink/src/presentation/widgets/stream_elements/se_song_requests.dart'; -import 'dart:io'; class StreamelementsTabView extends GetView { const StreamelementsTabView({super.key}); @@ -13,21 +12,16 @@ class StreamelementsTabView extends GetView { Widget build(BuildContext context) { List tabsTiles = [ const Text("Activities"), - const Text("Song Requests"), + const Text("Song Requests"), + const Text("Overlays") ]; - if (!Platform.isIOS) { - tabsTiles.add(const Text("Overlays")); - } - List tabs = [ const SeActivitiesList(), const SeSongRequests(), + const SeOverlays() ]; - if (!Platform.isIOS) { - tabs.add(const SeOverlays()); - } return Obx( () => controller.isSocketConnected.value ? Column( diff --git a/pubspec.yaml b/pubspec.yaml index ee93ed55..8efcd3ba 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 2.7.1+85 +version: 2.7.2+86 environment: sdk: '>=2.19.0-0 <4.0.0'