lib/l10n/app_cs.arb

@@ -72,8 +72,6 @@
     "graphTypeDesc":"Zvolte, zda-li použít sloupcový, nebo spojnicový graf, a kde",
     "lineChart":"Spojnicový",
     "barChart":"Sloupcový",
-    "selectType":"Zvolte typ",
+    "selectType":"Zvolte typ"
-    "enableYou":"Povolit Material You (Může vyžadovat restart aplikace)",
-    "enableYouDesc":"Aplikace použije barevné schéma z vaší tapety"
 
 }

lib/l10n/app_en.arb

@@ -152,7 +152,5 @@
     "graphTypeDesc":"Choose whether to show line or bar chart and where",
     "lineChart":"Line chart",
     "barChart":"Bar chart",
-    "selectType":"Select type",
+    "selectType":"Select type"
-    "enableYou":"Enable Material You (May require an app restart)",
-    "enableYouDesc":"The app will use a color scheme from your wallpaper"
 }

lib/main.dart

@@ -8,13 +8,8 @@ import 'package:logger/logger.dart';
 import 'package:prasule/util/color_schemes.g.dart';
 import 'package:prasule/views/home.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 
-var _materialYou = false;
+void main() {
-void main() async {
-  WidgetsFlutterBinding.ensureInitialized();
-  var s = await SharedPreferences.getInstance();
-  _materialYou = s.getBool("useMaterialYou") ?? true;
   runApp(const MyApp());
 }
 
@@ -22,37 +17,29 @@ final logger = Logger();
 
 class MyApp extends StatelessWidget {
   const MyApp({super.key});
-  static bool appliedYou = false;
+
   // This widget is the root of your application.
   @override
   Widget build(BuildContext context) {
     return (Platform.isAndroid)
         ? DynamicColorBuilder(
-            builder: (light, dark) {
+            builder: (light, dark) => MaterialApp(
-              appliedYou = light != null;
+              debugShowCheckedModeBanner: false,
-              return MaterialApp(
+              localizationsDelegates: const [
-                debugShowCheckedModeBanner: false,
+                AppLocalizations.delegate,
-                localizationsDelegates: const [
+                ...GlobalMaterialLocalizations.delegates,
-                  AppLocalizations.delegate,
+                ...GlobalCupertinoLocalizations.delegates
-                  ...GlobalMaterialLocalizations.delegates,
+              ],
-                  ...GlobalCupertinoLocalizations.delegates
+              supportedLocales: AppLocalizations.supportedLocales,
-                ],
+              title: 'Prašule',
-                supportedLocales: AppLocalizations.supportedLocales,
+              theme: ThemeData(
-                title: 'Prašule',
+                colorScheme: light ?? lightColorScheme,
-                theme: ThemeData(
+                useMaterial3: true,
-                  colorScheme: (_materialYou)
+              ),
-                      ? light ?? lightColorScheme
+              darkTheme: ThemeData(
-                      : lightColorScheme,
+                  useMaterial3: true, colorScheme: dark ?? darkColorScheme),
-                  useMaterial3: true,
+              home: const HomeView(),
-                ),
+            ),
-                darkTheme: ThemeData(
-                    useMaterial3: true,
-                    colorScheme: (_materialYou)
-                        ? dark ?? darkColorScheme
-                        : darkColorScheme),
-                home: const HomeView(),
-              );
-            },
           )
         : Theme(
             data: ThemeData(

lib/pw/platformbutton.dart

@@ -5,16 +5,12 @@ import 'package:prasule/pw/platformwidget.dart';
 class PlatformButton extends PlatformWidget<TextButton, CupertinoButton> {
   final String text;
   final void Function()? onPressed;
-  final ButtonStyle? style;
   const PlatformButton(
-      {super.key, required this.text, required this.onPressed, this.style});
+      {super.key, required this.text, required this.onPressed});
 
   @override
-  TextButton createAndroidWidget(BuildContext context) => TextButton(
+  TextButton createAndroidWidget(BuildContext context) =>
-        onPressed: onPressed,
+      TextButton(onPressed: onPressed, child: Text(text));
-        style: style,
-        child: Text(text),
-      );
 
   @override
   CupertinoButton createIosWidget(BuildContext context) =>

lib/util/graphs.dart

@@ -1,5 +1,4 @@
 import 'package:currency_picker/currency_picker.dart';
-import 'package:dynamic_color/dynamic_color.dart';
 import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
@@ -103,8 +102,7 @@ class ExpensesLineChart extends StatelessWidget {
               isStrokeCapRound: true,
               dotData: const FlDotData(show: false),
               belowBarData: BarAreaData(show: false),
-              color: Colors.green
+              color: Theme.of(context).colorScheme.primary,
-                  .harmonizeWith(Theme.of(context).colorScheme.secondary),
               spots: List.generate(
                 (yearly) ? 12 : DateTime(date.year, date.month, 0).day,
                 (index) => FlSpot(index.toDouble(), incomeData[index]),
@@ -117,8 +115,7 @@ class ExpensesLineChart extends StatelessWidget {
               isStrokeCapRound: true,
               dotData: const FlDotData(show: false),
               belowBarData: BarAreaData(show: false),
-              color: Colors.red
+              color: Theme.of(context).colorScheme.error,
-                  .harmonizeWith(Theme.of(context).colorScheme.secondary),
               spots: List.generate(
                 (yearly) ? 12 : DateTime(date.year, date.month, 0).day,
                 (index) => FlSpot(index.toDouble() + 1, expenseData[index]),
@@ -280,14 +277,12 @@ class ExpensesBarChart extends StatelessWidget {
                 if (incomeData.isNotEmpty)
                   BarChartRodData(
                     toY: incomeData[index],
-                    color: Colors.green
+                    color: Theme.of(context).colorScheme.primary,
-                        .harmonizeWith(Theme.of(context).colorScheme.secondary),
                   ),
                 if (expenseData.isNotEmpty)
                   BarChartRodData(
                     toY: expenseData[index],
-                    color: Colors.red
+                    color: Theme.of(context).colorScheme.error,
-                        .harmonizeWith(Theme.of(context).colorScheme.secondary),
                   ),
               ],
             ),

lib/views/graph_view.dart

@@ -153,7 +153,7 @@ class _GraphViewState extends State<GraphView> {
                   strokeWidth: 5,
                 )
               : SizedBox(
-                  width: MediaQuery.of(context).size.width,
+                  width: MediaQuery.of(context).size.width * 0.9,
                   height: MediaQuery.of(context).size.height,
                   child: Column(
                     mainAxisAlignment: MainAxisAlignment.center,
@@ -212,13 +212,6 @@ class _GraphViewState extends State<GraphView> {
                           child: Column(
                             children: [
                               PlatformButton(
-                                style: ButtonStyle(
-                                    backgroundColor: MaterialStateProperty.all(
-                                        Theme.of(context).colorScheme.primary),
-                                    foregroundColor: MaterialStateProperty.all(
-                                        Theme.of(context)
-                                            .colorScheme
-                                            .onPrimary)),
                                 text: (yearly)
                                     ? DateFormat.y(locale).format(_selectedDate)
                                     : DateFormat.yMMMM(locale)

lib/views/settings/settings.dart

@@ -1,13 +1,9 @@
-import 'dart:io';
-
 import 'package:flutter/material.dart';
-import 'package:prasule/main.dart';
 import 'package:prasule/pw/platformroute.dart';
 import 'package:prasule/views/settings/graph_type.dart';
 import 'package:prasule/views/settings/tessdata_list.dart';
 import 'package:settings_ui/settings_ui.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 
 class SettingsView extends StatefulWidget {
   const SettingsView({super.key});
@@ -17,17 +13,6 @@ class SettingsView extends StatefulWidget {
 }
 
 class _SettingsViewState extends State<SettingsView> {
-  var _useMaterialYou = true;
-  final _supportsYou = MyApp.appliedYou;
-  @override
-  void initState() {
-    super.initState();
-    SharedPreferences.getInstance().then((s) {
-      _useMaterialYou = s.getBool("useMaterialYou") ?? true;
-      setState(() {});
-    });
-  }
-
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -63,19 +48,7 @@ class _SettingsViewState extends State<SettingsView> {
                     (p0) => const GraphTypeSettingsView(),
                   ),
                 ),
-              ),
+              )
-              if (Platform.isAndroid && _supportsYou)
-                SettingsTile.switchTile(
-                  initialValue: _useMaterialYou,
-                  onToggle: (v) async {
-                    var s = await SharedPreferences.getInstance();
-                    s.setBool("useMaterialYou", v);
-                    _useMaterialYou = v;
-                    setState(() {});
-                  },
-                  title: Text(AppLocalizations.of(context).enableYou),
-                  description: Text(AppLocalizations.of(context).enableYouDesc),
-                )
             ],
           )
         ],