migrate to go_router

lib/app_page.dart

@@ -18,13 +18,13 @@ class _AppPageState extends State<AppPage> {
     super.initState();
     _loadAppInfo();
   }
+
   void _loadAppInfo() async {
-    var rq = await http.get(
+    var rq = await http.get(Uri.https(
-      Uri.https(
       "backapi.rustore.ru",
       "/applicationData/overallInfo/${widget.packageName}",
-      )
+    ));
-    );
+    print(widget.packageName + "PN");
     if (rq.statusCode != 200) {
       showDialog(
           context: context,
@@ -41,16 +41,19 @@ class _AppPageState extends State<AppPage> {
                     child: const Text("ок"),
                   )
                 ],
-        )
+              ));
-      );
     }
     setState(() {
-      _appInfo = json.decode(utf8.decode(rq.bodyBytes))["body"];
+      _appInfo = json.decode(utf8.decode(rq.bodyBytes))["body"] ?? {};
     });
   }
+
   @override
   Widget build(BuildContext context) {
-    return _appInfo != null ? ListView(
+    return Scaffold(
+        appBar: AppBar(),
+        body: _appInfo != null
+            ? ListView(
                 padding: const EdgeInsets.fromLTRB(15, 0, 15, 15),
                 children: [
                   Row(
@@ -59,35 +62,40 @@ class _AppPageState extends State<AppPage> {
                       ClipRRect(
                         borderRadius: BorderRadius.circular(25),
                         child: Image.network(
-                  _appInfo?["iconUrl"],
+                          _appInfo?["iconUrl"] ?? "",
                           width: 120,
                         ),
                       ),
-              const SizedBox(width: 15,),
+                      const SizedBox(
+                        width: 15,
+                      ),
                       Expanded(
                           child: Column(
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
                           Text(
-                        _appInfo?["appName"],
+                            _appInfo?["appName"] ?? "null",
                             //overflow: TextOverflow.ellipsis,
                             style: const TextStyle(
                               fontSize: 21,
                               fontWeight: FontWeight.bold,
                             ),
                           ),
-                      const SizedBox(height: 10,),
+                          const SizedBox(
+                            height: 10,
+                          ),
                           Text(
-                        _appInfo?["companyName"],
+                            _appInfo?["companyName"] ?? "null",
                             overflow: TextOverflow.ellipsis,
                             softWrap: false,
                           ),
                         ],
-                )
+                      )),
-              ),
                     ],
                   ),
-          const SizedBox(height: 20,),
+                  const SizedBox(
+                    height: 20,
+                  ),
                   FilledButton.icon(
                     style: FilledButton.styleFrom(
                       minimumSize: const Size.fromHeight(40),
@@ -104,11 +112,12 @@ class _AppPageState extends State<AppPage> {
                       scrollDirection: Axis.horizontal,
                       children: [
                         _InfoCard(
-                  topText: "${(_appInfo?["fileSize"]/1024/1024).toStringAsFixed(1)} MB",
+                          topText:
+                              "${((_appInfo?["fileSize"] ?? 0) / 1024 / 1024).toStringAsFixed(1)} MB",
                           bottomText: "Размер",
                         ),
                         _InfoCard(
-                  topText: _appInfo?["versionName"],
+                          topText: _appInfo?["versionName"] ?? "0",
                           bottomText: "Версия",
                         ),
                         _InfoCard(
@@ -116,11 +125,12 @@ class _AppPageState extends State<AppPage> {
                           bottomText: "minSdkVersion",
                         ),
                         _InfoCard(
-                  topText: _appInfo?["ageRestriction"]["category"] ?? "?",
+                          topText:
+                              _appInfo?["ageRestriction"]?["category"] ?? "?",
                           bottomText: "Возраст",
                         ),
                         _InfoCard(
-                  topText: _appInfo?["categories"][0] ?? "?",
+                          topText: _appInfo?["categories"]?[0] ?? "?",
                           bottomText: "Категория",
                         )
                       ],
@@ -131,10 +141,11 @@ class _AppPageState extends State<AppPage> {
                     height: 250,
                     child: ListView.builder(
                         scrollDirection: Axis.horizontal,
-              itemCount: _appInfo?["fileUrls"].length,
+                        itemCount: _appInfo?["fileUrls"]?.length ?? 0,
                         itemBuilder: (context, i) {
                           var file = _appInfo?["fileUrls"][i];
-                if (file["type"] != "SCREENSHOT" && file["orientation"] != "PORTRAIT") {
+                          if (file["type"] != "SCREENSHOT" &&
+                              file["orientation"] != "PORTRAIT") {
                             return const SizedBox();
                           }
                           //return Text("data${i}");
@@ -147,17 +158,23 @@ class _AppPageState extends State<AppPage> {
                               ),
                             ),
                           );
-              }
+                        }),
-            ),
                   ),
                   const SizedBox(height: 15),
-          const Text("Что нового?", style: TextStyle(fontSize: 21, fontWeight: FontWeight.bold),),
+                  const Text(
-          Text(_appInfo?["whatsNew"]),
+                    "Что нового?",
+                    style: TextStyle(fontSize: 21, fontWeight: FontWeight.bold),
+                  ),
+                  Text(_appInfo?["whatsNew"] ?? "null"),
                   const SizedBox(height: 15),
-          const Text("Описание", style: TextStyle(fontSize: 21, fontWeight: FontWeight.bold),),
+                  const Text(
-          Text(_appInfo?["fullDescription"]),
+                    "Описание",
+                    style: TextStyle(fontSize: 21, fontWeight: FontWeight.bold),
+                  ),
+                  Text(_appInfo?["fullDescription"] ?? "null"),
                 ],
-      ) : const LinearProgressIndicator();
+              )
+            : const LinearProgressIndicator());
   }
 }
 
@@ -183,5 +200,4 @@ class _InfoCard extends StatelessWidget {
       ),
     );
   }
-
 }

lib/main.dart

@@ -1,17 +1,44 @@
 import 'package:flutter/material.dart';
+import 'package:openstore/app_page.dart';
 import 'package:openstore/search_page.dart';
+import 'package:go_router/go_router.dart';
 
 void main() {
   runApp(const MyApp());
 }
 
+final _router = GoRouter(
+  routes: [
+    GoRoute(path: '/', builder: (context, state) => const HomePage(), routes: [
+      GoRoute(
+        path: '/app/:id',
+        builder: (context, state) =>
+            AppPage(packageName: state.pathParameters['id'] ?? ""),
+      ),
+      GoRoute(
+          path: 'instruction',
+          builder: (context, state) {
+            print(state.uri.queryParameters["utm_campaign"]);
+            return AppPage(packageName: "ru.nspk.mirpay");
+          })
+    ]),
+    GoRoute(
+        path: '/search',
+        builder: (context, state) =>
+            SearchPage(search: state.uri.queryParameters["q"] ?? "")),
+    GoRoute(
+        path: '/catalog/app/:id',
+        redirect: (_, state) => "/app/${state.pathParameters["id"]}"),
+  ],
+);
+
 class MyApp extends StatelessWidget {
   const MyApp({super.key});
 
   // This widget is the root of your application.
   @override
   Widget build(BuildContext context) {
-    return MaterialApp(
+    return MaterialApp.router(
       title: 'OpenStore',
       theme: ThemeData(
         colorScheme: ColorScheme.fromSeed(
@@ -20,7 +47,7 @@ class MyApp extends StatelessWidget {
         ),
         useMaterial3: true,
       ),
-      home: const HomePage(),
+      routerConfig: _router,
     );
   }
 }
@@ -37,38 +64,28 @@ class HomePage extends StatelessWidget {
       body: Center(
         child: Row(
           children: [
-            const SizedBox(width: 15,),
+            const SizedBox(
+              width: 15,
+            ),
             Flexible(
               child: TextField(
-                onSubmitted: (value) {
+                onSubmitted: (value) => context.push(
-                  Navigator.of(context).push(
+                    Uri(path: '/search', queryParameters: {'q': value})
-                    MaterialPageRoute(
+                        .toString()),
-                      builder: (context) {
-                        return Scaffold(
-                          appBar: AppBar(
-                            title: Text("Поиск: "+value),
-                            
-                          ),
-                          body: SearchPage(search: value,),
-                        );
-                      }
-                    )
-                  );
-                },
                 textInputAction: TextInputAction.search,
                 decoration: InputDecoration(
                     prefixIcon: Icon(Icons.search),
-                  border: OutlineInputBorder()
+                    border: OutlineInputBorder()),
-                ),
               ),
             ),
             //const SizedBox(width: 5,),
             //FilledButton(onPressed: (){}, child: Text("GO")),
-            const SizedBox(width: 15,),
+            const SizedBox(
+              width: 15,
+            ),
           ],
         ),
       ),
     );
   }
-
 }

lib/search_page.dart

@@ -2,6 +2,7 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:go_router/go_router.dart';
 import 'package:http/http.dart' as http;
 import 'package:openstore/app_page.dart';
 import 'package:openstore/get_app_link.dart';
@@ -21,17 +22,13 @@ class _SearchPageState extends State<SearchPage> {
     super.initState();
     _loadResults();
   }
+
   void _loadResults() async {
-    var rq = await http.get(
+    var rq = await http
-      Uri.https(
+        .get(Uri.https("backapi.rustore.ru", "/applicationData/apps", {
-        "backapi.rustore.ru",
-        "/applicationData/apps",
-        {
       "pageSize": "20",
       "query": widget.search,
-        }
+    }));
-      )
-    );
     if (rq.statusCode != 200) {
       showDialog(
           context: context,
@@ -48,19 +45,21 @@ class _SearchPageState extends State<SearchPage> {
                     child: const Text("ок"),
                   )
                 ],
-        )
+              ));
-      );
     }
     setState(() {
-      _searchResults = json.decode(utf8.decode(rq.bodyBytes))["body"]["content"];
+      _searchResults =
+          json.decode(utf8.decode(rq.bodyBytes))["body"]["content"];
     });
   }
+
   @override
   Widget build(BuildContext context) {
-    if (_searchResults == null) {
+    return Scaffold(
-      return const LinearProgressIndicator();
+        appBar: AppBar(title: Text("Поиск")),
-    }
+        body: _searchResults == null
-    return ListView.builder(
+            ? LinearProgressIndicator()
+            : ListView.builder(
                 itemCount: _searchResults?.length,
                 padding: const EdgeInsets.fromLTRB(15, 0, 15, 0),
                 itemBuilder: (context, i) {
@@ -68,16 +67,8 @@ class _SearchPageState extends State<SearchPage> {
                   return Card(
                       clipBehavior: Clip.hardEdge,
                       child: InkWell(
-            onTap: () async {
+                        onTap: () =>
-              Navigator.of(context).push(
+                            context.push("/app/${appInfo["packageName"]}"),
-                MaterialPageRoute(builder: (ctx) =>
-                  Scaffold(
-                    appBar: AppBar(),
-                    body: AppPage(packageName: appInfo["packageName"]),
-                  )
-                )
-              );
-            },
                         child: Padding(
                           padding: const EdgeInsets.all(15),
                           child: Row(
@@ -85,11 +76,11 @@ class _SearchPageState extends State<SearchPage> {
                               ClipRRect(
                                 borderRadius: BorderRadius.circular(15),
                                 child: Image.network(
-                      width: 60,
+                                    width: 60, appInfo["iconUrl"]),
-                      appInfo["iconUrl"]
                               ),
+                              const SizedBox(
+                                width: 15,
                               ),
-                  const SizedBox(width: 15,),
                               Expanded(
                                 child: Column(
                                   crossAxisAlignment: CrossAxisAlignment.start,
@@ -110,18 +101,17 @@ class _SearchPageState extends State<SearchPage> {
                               ),
                               IconButton.filledTonal(
                                 onPressed: () async {
-                      Clipboard.setData(
+                                  Clipboard.setData(ClipboardData(
-                        ClipboardData(text: (await getAppLink(appInfo?["appId"], context)).toString())
+                                      text: (await getAppLink(
-                      );
+                                              appInfo?["appId"], context))
+                                          .toString()));
                                 },
                                 icon: const Icon(Icons.link),
                               ),
                             ],
                           ),
                         ),
-          )
+                      ));
-        );
+                }));
-      }
-    );
   }
 }

pubspec.lock

@@ -80,6 +80,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  go_router:
+    dependency: "direct main"
+    description:
+      name: go_router
+      sha256: "2b9ba6d4c247457c35a6622f1dee6aab6694a4e15237ff7c32320345044112b6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "15.1.1"
   http:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -36,6 +36,7 @@ dependencies:
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.6
   http: ^1.2.1
+  go_router: ^15.1.1
 
 dev_dependencies:
   flutter_test: