migrate flutter theme code

pebble-dev · Jul 31, 2024 · 3e5e6b2 · 3e5e6b2
1 parent dc001ac
commit 3e5e6b2
Show file tree

Hide file tree

Showing 20 changed files with 94 additions and 1,352 deletions.
diff --git a/android/app/src/test/java/io/rebble/cobble/bluetooth/GATTPacketTest.kt b/android/app/src/test/java/io/rebble/cobble/bluetooth/GATTPacketTest.kt
@@ -27,12 +27,12 @@ internal class GATTPacketTest {
     @Test
     fun decodeValidPacket() {
         val expectedType = GATTPacket.PacketType.DATA
-        val expectedSeq = 16U.toUShort()
+        val expectedSeq = 16
         val expectedPayload = payload.serialize().toByteArray()
 
         val gattPacket = GATTPacket(byteArrayOf(0b10000000.toByte()) + expectedPayload)
         assertEquals(expectedSeq, gattPacket.sequence)
         assertEquals(expectedType, gattPacket.type)
-        assertArrayEquals(expectedPayload, gattPacket.data.slice(1..gattPacket.data.size - 1).toByteArray())
+        assertArrayEquals(expectedPayload, gattPacket.data.slice(1..<gattPacket.data.size).toByteArray())
     }
 }
diff --git a/lib/domain/calendar/calendar_pin_convert.dart b/lib/domain/calendar/calendar_pin_convert.dart
diff --git a/lib/domain/calendar/device_calendar_plugin_provider.dart b/lib/domain/calendar/device_calendar_plugin_provider.dart
@@ -1,7 +1,4 @@
 import 'package:cobble/infrastructure/pigeons/pigeons.g.dart';
-import 'package:device_calendar/device_calendar.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
-final deviceCalendarPluginProvider = Provider<DeviceCalendarPlugin>((ref) => DeviceCalendarPlugin());
-
 final calendarControlProvider = Provider<CalendarControl>((ref) => CalendarControl());
diff --git a/lib/domain/calendar/result_converter.dart b/lib/domain/calendar/result_converter.dart
diff --git a/lib/infrastructure/datasources/dev_connection.dart b/lib/infrastructure/datasources/dev_connection.dart
@@ -6,7 +6,6 @@ import 'package:cobble/domain/apps/app_manager.dart';
 import 'package:cobble/domain/connection/raw_incoming_packets_provider.dart';
 import 'package:cobble/infrastructure/pigeons/pigeons.g.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:network_info_plus/network_info_plus.dart';
 import 'package:path_provider/path_provider.dart';
 
 final ConnectionControl connectionControl = ConnectionControl();
@@ -124,7 +123,8 @@ class DevConnection extends StateNotifier<DevConnState> {
   }
 
   Future<void> start() async {
-    _localIp = await (NetworkInfo().getWifiIP()) ?? "";
+    //_localIp = await (NetworkInfo().getWifiIP()) ?? "";
+    _localIp = "";
 
     final server = await HttpServer.bind(
       InternetAddress.anyIPv4,

diff --git a/lib/main.dart b/lib/main.dart
@@ -19,7 +19,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:noob/noob.dart';
 
 import 'domain/permissions.dart';
 import 'infrastructure/datasources/paired_storage.dart';

diff --git a/lib/ui/common/components/cobble_card.dart b/lib/ui/common/components/cobble_card.dart
@@ -123,15 +123,15 @@ class CobbleCard extends StatelessWidget {
                 children: [
                   Text(
                     title,
-                    style: context.textTheme.headline6!.copyWith(
+                    style: context.textTheme.headlineMedium!.copyWith(
                       color: scheme.text,
                     ),
                   ),
                   if (subtitle != null) ...[
                     SizedBox(height: 4),
                     Text(
                       subtitle!,
-                      style: context.textTheme.bodyText2!.copyWith(
+                      style: context.textTheme.bodyMedium!.copyWith(
                         color: scheme.text,
                       ),
                     ),

diff --git a/lib/ui/common/components/cobble_dialog.dart b/lib/ui/common/components/cobble_dialog.dart
@@ -83,15 +83,15 @@ class CobbleDialog extends StatelessWidget {
             if (title is String)
               Text(
                 title!,
-                style: context.textTheme.headline6!.copyWith(
+                style: context.textTheme.headlineMedium!.copyWith(
                   color: scheme.text,
                 ),
               ),
             if (title is String && content is String) SizedBox(height: 4),
             if (content is String)
               Text(
                 content!,
-                style: context.textTheme.bodyText2!.copyWith(
+                style: context.textTheme.bodyMedium!.copyWith(
                   color: scheme.text,
                 ),
               ),

diff --git a/lib/ui/common/components/cobble_sheet.dart b/lib/ui/common/components/cobble_sheet.dart
@@ -108,7 +108,7 @@ class CobbleSheet {
   /// }
   /// ```
   static InlineCobbleSheet useInline() {
-    final _controller = useState<PersistentBottomSheetController<void>?>(null);
+    final _controller = useState<PersistentBottomSheetController?>(null);
     final _sheet = useMemoized(() => InlineCobbleSheet(_controller));
     return _sheet;
   }
@@ -124,11 +124,11 @@ class CobbleSheet {
 /// * [CobbleSheet.useInline]
 /// * [InlineCobbleSheet.show]
 class InlineCobbleSheet {
-  final ValueNotifier<PersistentBottomSheetController<void>?> _controller;
+  final ValueNotifier<PersistentBottomSheetController?> _controller;
 
   InlineCobbleSheet(this._controller);
 
-  set _ctr(PersistentBottomSheetController<void> controller) {
+  set _ctr(PersistentBottomSheetController controller) {
     _controller.value = controller;
     if (controller != null) {
       _shown = true;