Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ekran wyniku nie powinien przysłaniać tabów #149

Merged
merged 2 commits into from
Jan 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 2 additions & 30 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,9 @@ import 'package:logging/logging.dart';
import 'package:pola_flutter/analytics/analytics_main_tab.dart';
import 'package:pola_flutter/analytics/pola_analytics.dart';
import 'package:pola_flutter/i18n/strings.g.dart';
import 'package:pola_flutter/models/search_result.dart';
import 'package:pola_flutter/pages/dialpad/dialpad.dart';
import 'package:pola_flutter/pages/scan/scan.dart';
import 'package:pola_flutter/pages/scan/scan_navigator.dart';
import 'package:pola_flutter/ui/web_view_tab.dart';
import 'firebase_options.dart';
import 'pages/detail/detail.dart';

void main() async {
WidgetsFlutterBinding.ensureInitialized();
Expand Down Expand Up @@ -45,7 +42,6 @@ class _PolaAppState extends State<PolaApp> {
theme: ThemeData(
colorScheme: ColorScheme.light().copyWith(primary: Colors.red),
),
onGenerateRoute: RouteGenerator.generateRoute,
home: DefaultTabController(
length: 3,
child: Scaffold(
Expand Down Expand Up @@ -76,7 +72,7 @@ class _PolaAppState extends State<PolaApp> {
}

final List<Widget> _tabs = [
MainPage(),
ScanNavigator(),
WebViewTab(title: "Wyszukiwarka", url: "https://www.pola-app.pl/m/search/"),
WebViewTab(title: "Wiadomości", url: "https://www.pola-app.pl/m/blog/")
];
Expand All @@ -102,30 +98,6 @@ class _PolaAppState extends State<PolaApp> {
}
}

class RouteGenerator {
static Route<dynamic> generateRoute(RouteSettings settings) {
final args = settings.arguments;

switch (settings.name) {
case '/':
return MaterialPageRoute(builder: (_) => MainPage());
case '/detail':
if (args is SearchResult) {
return MaterialPageRoute(
builder: (_) => DetailPage(
searchResult: args,
),
);
}
return MaterialPageRoute(builder: (_) => MainPage());
case '/dialpad':
return MaterialPageRoute(builder: (_) => DialPadPage());
default:
return MaterialPageRoute(builder: (_) => MainPage());
}
}
}

class SimpleBlocObserver extends BlocObserver {
@override
void onTransition(Bloc bloc, Transition transition) {
Expand Down
37 changes: 37 additions & 0 deletions lib/pages/scan/scan_navigator.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import 'package:flutter/material.dart';
import 'package:pola_flutter/models/search_result.dart';
import 'package:pola_flutter/pages/detail/detail.dart';
import 'package:pola_flutter/pages/dialpad/dialpad.dart';
import 'package:pola_flutter/pages/scan/scan.dart';

class ScanNavigator extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Navigator(
onGenerateRoute: generateRoute,
initialRoute: '/',
);
}

Route<dynamic> generateRoute(RouteSettings settings) {
final args = settings.arguments;

switch (settings.name) {
case '/':
return MaterialPageRoute(builder: (_) => MainPage());
case '/detail':
if (args is SearchResult) {
return MaterialPageRoute(
builder: (_) => DetailPage(
searchResult: args,
),
);
}
return MaterialPageRoute(builder: (_) => MainPage());
case '/dialpad':
return MaterialPageRoute(builder: (_) => DialPadPage());
default:
return MaterialPageRoute(builder: (_) => MainPage());
}
}
}
1 change: 1 addition & 0 deletions lib/ui/menu_icon_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class MenuIconButton extends StatelessWidget {
backgroundColor: Colors.transparent,
isScrollControlled: true,
context: context,
useRootNavigator: true,
builder: (BuildContext context) {
return MenuBottomSheet(analytics: _analytics);
}
Expand Down
Loading