Skip to content

Commit

Permalink
Merge pull request #282 from LezdCS/develop
Browse files Browse the repository at this point in the history
add back overlay tab for ios SE
  • Loading branch information
LezdCS authored Oct 10, 2024
2 parents fba8bee + a0361f8 commit 79e05ec
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 16 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'dart:async';
import 'dart:io';

import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
Expand Down Expand Up @@ -48,11 +47,7 @@ class StreamelementsViewController extends GetxController

@override
Future<void> 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();

Expand Down
12 changes: 3 additions & 9 deletions lib/src/presentation/widgets/tabs/streamelements_tab_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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<StreamelementsViewController> {
const StreamelementsTabView({super.key});
Expand All @@ -13,21 +12,16 @@ class StreamelementsTabView extends GetView<StreamelementsViewController> {
Widget build(BuildContext context) {
List<Widget> tabsTiles = [
const Text("Activities"),
const Text("Song Requests"),
const Text("Song Requests"),
const Text("Overlays")
];

if (!Platform.isIOS) {
tabsTiles.add(const Text("Overlays"));
}

List<Widget> tabs = [
const SeActivitiesList(),
const SeSongRequests(),
const SeOverlays()
];

if (!Platform.isIOS) {
tabs.add(const SeOverlays());
}
return Obx(
() => controller.isSocketConnected.value
? Column(
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

0 comments on commit 79e05ec

Please sign in to comment.