Migrated to Material You

lib/main.dart

@@ -1,9 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:obtainium/pages/apps.dart';
+import 'package:obtainium/pages/home.dart';
 import 'package:obtainium/services/apps_provider.dart';
 import 'package:obtainium/services/source_service.dart';
 import 'package:provider/provider.dart';
 import 'package:workmanager/workmanager.dart';
+import 'package:dynamic_color/dynamic_color.dart';
 
 void backgroundUpdateCheck() {
   Workmanager().executeTask((task, inputData) async {
@@ -36,6 +37,7 @@ void main() async {
   await Workmanager().registerPeriodicTask(
       'update-apps-task', 'backgroundUpdateCheck',
       frequency: const Duration(minutes: 15),
+      initialDelay: const Duration(minutes: 15),
       constraints: Constraints(networkType: NetworkType.connected));
   runApp(MultiProvider(
     providers: [ChangeNotifierProvider(create: (context) => AppsProvider())],
@@ -43,16 +45,35 @@ void main() async {
   ));
 }
 
+var defaultThemeColour = const Color(0xFF69F0AE);
+
 class MyApp extends StatelessWidget {
   const MyApp({super.key});
 
   @override
   Widget build(BuildContext context) {
+    return DynamicColorBuilder(
+        builder: (ColorScheme? lightDynamic, ColorScheme? darkDynamic) {
+      ColorScheme lightColorScheme;
+      ColorScheme darkColorScheme;
+      if (lightDynamic != null && darkDynamic != null) {
+        lightColorScheme = lightDynamic.harmonized();
+        darkColorScheme = darkDynamic.harmonized();
+      } else {
+        lightColorScheme = ColorScheme.fromSeed(seedColor: defaultThemeColour);
+        darkColorScheme = ColorScheme.fromSeed(
+            seedColor: defaultThemeColour, brightness: Brightness.dark);
+      }
+
       return MaterialApp(
           title: 'Obtainium',
           theme: ThemeData(
-          primarySwatch: Colors.blue,
+              useMaterial3: true,
-        ),
+              colorScheme: lightColorScheme,
-        home: const AppsPage());
+              fontFamily: 'Metropolis'),
+          darkTheme:
+              ThemeData(useMaterial3: true, colorScheme: darkColorScheme),
+          home: const HomePage());
+    });
   }
 }

lib/pages/add_app.dart

@@ -18,11 +18,7 @@ class _AddAppPageState extends State<AddAppPage> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return Center(
-      appBar: AppBar(
-        title: const Text('Obtainium - Add App'),
-      ),
-      body: Center(
         child: Form(
       key: _formKey,
       child: Column(
@@ -33,7 +29,6 @@ class _AddAppPageState extends State<AddAppPage> {
               padding: const EdgeInsets.symmetric(horizontal: 16.0),
               child: TextFormField(
                 decoration: const InputDecoration(
-                      border: OutlineInputBorder(),
                     hintText: 'https://github.com/Author/Project',
                     helperText: 'Enter the App source URL'),
                 controller: urlInputController,
@@ -48,7 +43,7 @@ class _AddAppPageState extends State<AddAppPage> {
               )),
           Padding(
             padding:
-                  const EdgeInsets.symmetric(vertical: 8.0, horizontal: 16.0),
+                const EdgeInsets.symmetric(vertical: 16.0, horizontal: 16.0),
             child: ElevatedButton(
               onPressed: gettingAppInfo
                   ? null
@@ -89,7 +84,6 @@ class _AddAppPageState extends State<AddAppPage> {
           if (gettingAppInfo) const LinearProgressIndicator(),
         ],
       ),
-      )),
+    ));
-    );
   }
 }

lib/pages/app.dart

@@ -38,7 +38,7 @@ class _AppPageState extends State<AppPage> {
                   mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                   children: [
                     Expanded(
-                        child: OutlinedButton(
+                        child: ElevatedButton(
                             onPressed: (app?.installedVersion == null ||
                                         appsProvider
                                             .checkAppObjectForUpdate(app!)) &&
@@ -52,7 +52,7 @@ class _AppPageState extends State<AppPage> {
                                 ? 'Install'
                                 : 'Update'))),
                     const SizedBox(width: 16.0),
-                    OutlinedButton(
+                    ElevatedButton(
                       onPressed: app?.currentDownloadId != null
                           ? null
                           : () {
@@ -85,7 +85,8 @@ class _AppPageState extends State<AppPage> {
                                   });
                             },
                       style: TextButton.styleFrom(
-                          foregroundColor: Theme.of(context).errorColor),
+                          foregroundColor: Theme.of(context).errorColor,
+                          surfaceTintColor: Theme.of(context).errorColor),
                       child: const Text('Remove'),
                     ),
                   ])),

lib/pages/apps.dart

@@ -17,11 +17,7 @@ class _AppsPageState extends State<AppsPage> {
     var appsProvider = context.watch<AppsProvider>();
     appsProvider.getUpdates();
 
-    return Scaffold(
+    return Center(
-      appBar: AppBar(
-        title: const Text('Obtainium'),
-      ),
-      body: Center(
       child: appsProvider.loadingApps
           ? const CircularProgressIndicator()
           : appsProvider.apps.isEmpty
@@ -46,8 +42,7 @@ class _AppsPageState extends State<AppsPage> {
                               Navigator.push(
                                 context,
                                 MaterialPageRoute(
-                                      builder: (context) =>
+                                    builder: (context) => AppPage(appId: e.id)),
-                                          AppPage(appId: e.id)),
                               );
                             },
                           ),
@@ -55,45 +50,6 @@ class _AppsPageState extends State<AppsPage> {
                         .toList(),
                   ),
                 ),
-      ),
-      bottomSheet: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          Padding(
-              padding:
-                  const EdgeInsets.symmetric(vertical: 8.0, horizontal: 16.0),
-              child: Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                  children: [
-                    Expanded(
-                        child: appsProvider.apps.values.toList().where((e) {
-                      return (e.installedVersion != null &&
-                          e.installedVersion != e.latestVersion);
-                    }).isNotEmpty
-                            ? OutlinedButton(
-                                onPressed: () {
-                                  appsProvider.installUpdates().catchError((e) {
-                                    ScaffoldMessenger.of(context).showSnackBar(
-                                      SnackBar(content: Text(e.toString())),
-                                    );
-                                  });
-                                },
-                                child: const Text('Update All'))
-                            : Container()),
-                    const SizedBox(width: 16.0),
-                    OutlinedButton(
-                      onPressed: () {
-                        Navigator.push(
-                          context,
-                          MaterialPageRoute(
-                              builder: (context) => const AddAppPage()),
-                        );
-                      },
-                      child: const Text('Add App'),
-                    ),
-                  ])),
-        ],
-      ),
     );
   }
 }

lib/pages/home.dart

@@ -0,0 +1,41 @@
+import 'package:flutter/material.dart';
+import 'package:obtainium/pages/add_app.dart';
+import 'package:obtainium/pages/apps.dart';
+import 'package:obtainium/pages/settings.dart';
+
+class HomePage extends StatefulWidget {
+  const HomePage({super.key});
+
+  @override
+  State<HomePage> createState() => _HomePageState();
+}
+
+class _HomePageState extends State<HomePage> {
+  int selectedIndex = 1;
+  List<Widget> pages = [
+    const SettingsPage(),
+    const AppsPage(),
+    const AddAppPage()
+  ];
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+        appBar: AppBar(title: const Text('Obtainium')),
+        body: pages.elementAt(selectedIndex),
+        bottomNavigationBar: NavigationBar(
+          destinations: const [
+            NavigationDestination(
+                icon: Icon(Icons.settings), label: 'Settings'),
+            NavigationDestination(icon: Icon(Icons.apps), label: 'Apps'),
+            NavigationDestination(icon: Icon(Icons.add), label: 'Add App'),
+          ],
+          onDestinationSelected: (int index) {
+            setState(() {
+              selectedIndex = index;
+            });
+          },
+          selectedIndex: selectedIndex,
+        ));
+  }
+}

lib/pages/settings.dart

@@ -0,0 +1,20 @@
+import 'package:flutter/material.dart';
+
+class SettingsPage extends StatefulWidget {
+  const SettingsPage({super.key});
+
+  @override
+  State<SettingsPage> createState() => _SettingsPageState();
+}
+
+class _SettingsPageState extends State<SettingsPage> {
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+        child: Text(
+      'No Configurable Settings Yet.',
+      style: Theme.of(context).textTheme.bodyLarge,
+      textAlign: TextAlign.center,
+    ));
+  }
+}

pubspec.lock

@@ -1,6 +1,13 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.3.1"
   args:
     dependency: transitive
     description:
@@ -29,6 +36,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.1"
+  checked_yaml:
+    dependency: transitive
+    description:
+      name: checked_yaml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.1"
+  cli_util:
+    dependency: transitive
+    description:
+      name: cli_util
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.5"
   clock:
     dependency: transitive
     description:
@@ -43,6 +64,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.16.0"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.2"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -57,6 +85,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.7.7"
+  dynamic_color:
+    dependency: "direct main"
+    description:
+      name: dynamic_color
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.5.3"
   fake_async:
     dependency: transitive
     description:
@@ -97,6 +132,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.0"
+  flutter_launcher_icons:
+    dependency: "direct dev"
+    description:
+      name: flutter_launcher_icons
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.10.0"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -149,6 +191,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "4.0.1"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.2.0"
   js:
     dependency: transitive
     description:
@@ -156,6 +205,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.6.4"
+  json_annotation:
+    dependency: transitive
+    description:
+      name: json_annotation
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.6.0"
   lints:
     dependency: transitive
     description:
@@ -413,6 +469,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "6.1.0"
+  yaml:
+    dependency: transitive
+    description:
+      name: yaml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.1.1"
 sdks:
   dart: ">=2.19.0-79.0.dev <3.0.0"
-  flutter: ">=3.0.0"
+  flutter: ">=3.1.0-0.0.pre.1036"

pubspec.yaml

@@ -45,10 +45,13 @@ dependencies:
   toast: ^0.3.0
   webview_flutter: ^3.0.4
   workmanager: ^0.5.0
+  dynamic_color: ^1.5.3
+
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
+  flutter_launcher_icons: ^0.10.0
 
   # The "flutter_lints" package below contains a set of recommended lints to
   # encourage good coding practices. The lint set provided by the package is
@@ -57,6 +60,12 @@ dev_dependencies:
   # rules and activating additional ones.
   flutter_lints: ^2.0.0
 
+flutter_icons:
+  android: true
+  image_path: "assets/icon.png"
+  adaptive_icon_background: "#282828"
+  adaptive_icon_foreground: "assets/icon.png"
+
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
 
@@ -98,3 +107,8 @@ flutter:
   #
   # For details regarding fonts from package dependencies,
   # see https://flutter.dev/custom-fonts/#from-packages
+
+  fonts:
+      - family: Metropolis
+        fonts:
+          - asset: assets/fonts/Metropolis-Regular.otf