Update to colorist_ui: ^0.1.0 and remove logging

domesticmouse · domesticmouse · commit f0da70ebbfe5 · 2025-04-03T12:26:36.000+11:00
diff --git a/colorist/codelab_rebuild.yaml b/colorist/codelab_rebuild.yaml
diff --git a/colorist/step_01/lib/main.dart b/colorist/step_01/lib/main.dart
@@ -2,26 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:colorist_ui/models/message.dart';
-import 'package:colorist_ui/providers/chat_state_notifier.dart';
-import 'package:colorist_ui/providers/log_state_notifier.dart';
-import 'package:colorist_ui/ui/screens/main_screen.dart';
-import 'package:flutter/foundation.dart';
+import 'package:colorist_ui/colorist_ui.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:logging/logging.dart';
 
 void main() async {
-  Logger.root.level = Level.ALL;
-  Logger.root.onRecord.listen((record) {
-    if (kDebugMode) {
-      print(
-        '${record.loggerName}: ${record.level.name}: '
-        '${record.time}: ${record.message}',
-      );
-    }
-  });
-
   runApp(ProviderScope(child: MainApp()));
 }
 
diff --git a/colorist/step_01/pubspec.yaml b/colorist/step_01/pubspec.yaml
@@ -9,9 +9,8 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  colorist_ui: ^0.0.6
+  colorist_ui: ^0.1.0
   flutter_riverpod: ^2.6.1
-  logging: ^1.3.0
   riverpod_annotation: ^2.6.1
 
 dev_dependencies:
diff --git a/colorist/step_02/lib/main.dart b/colorist/step_02/lib/main.dart
@@ -2,28 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:colorist_ui/ui/screens/error_screen.dart';
-import 'package:colorist_ui/ui/screens/loading_screen.dart';
-import 'package:colorist_ui/ui/screens/main_screen.dart';
-import 'package:flutter/foundation.dart';
+import 'package:colorist_ui/colorist_ui.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:logging/logging.dart';
 
 import 'providers/gemini.dart';
 import 'services/gemini_chat_service.dart';
 
 void main() async {
-  Logger.root.level = Level.ALL;
-  Logger.root.onRecord.listen((record) {
-    if (kDebugMode) {
-      print(
-        '${record.loggerName}: ${record.level.name}: '
-        '${record.time}: ${record.message}',
-      );
-    }
-  });
-
   runApp(ProviderScope(child: MainApp()));
 }
 
diff --git a/colorist/step_02/lib/services/gemini_chat_service.dart b/colorist/step_02/lib/services/gemini_chat_service.dart
@@ -4,8 +4,7 @@
 
 import 'dart:async';
 
-import 'package:colorist_ui/providers/chat_state_notifier.dart';
-import 'package:colorist_ui/providers/log_state_notifier.dart';
+import 'package:colorist_ui/colorist_ui.dart';
 import 'package:firebase_vertexai/firebase_vertexai.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
diff --git a/colorist/step_02/pubspec.yaml b/colorist/step_02/pubspec.yaml
@@ -9,9 +9,8 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  colorist_ui: ^0.0.6
+  colorist_ui: ^0.1.0
   flutter_riverpod: ^2.6.1
-  logging: ^1.3.0
   riverpod_annotation: ^2.6.1
   firebase_core: ^3.13.0
   firebase_vertexai: ^1.5.0
diff --git a/colorist/step_03/lib/main.dart b/colorist/step_03/lib/main.dart
@@ -2,28 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:colorist_ui/ui/screens/error_screen.dart';
-import 'package:colorist_ui/ui/screens/loading_screen.dart';
-import 'package:colorist_ui/ui/screens/main_screen.dart';
-import 'package:flutter/foundation.dart';
+import 'package:colorist_ui/colorist_ui.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:logging/logging.dart';
 
 import 'providers/gemini.dart';
 import 'services/gemini_chat_service.dart';
 
 void main() async {
-  Logger.root.level = Level.ALL;
-  Logger.root.onRecord.listen((record) {
-    if (kDebugMode) {
-      print(
-        '${record.loggerName}: ${record.level.name}: '
-        '${record.time}: ${record.message}',
-      );
-    }
-  });
-
   runApp(ProviderScope(child: MainApp()));
 }
 
diff --git a/colorist/step_03/lib/services/gemini_chat_service.dart b/colorist/step_03/lib/services/gemini_chat_service.dart
@@ -4,8 +4,7 @@
 
 import 'dart:async';
 
-import 'package:colorist_ui/providers/chat_state_notifier.dart';
-import 'package:colorist_ui/providers/log_state_notifier.dart';
+import 'package:colorist_ui/colorist_ui.dart';
 import 'package:firebase_vertexai/firebase_vertexai.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
diff --git a/colorist/step_03/pubspec.yaml b/colorist/step_03/pubspec.yaml
@@ -9,9 +9,8 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  colorist_ui: ^0.0.6
+  colorist_ui: ^0.1.0
   flutter_riverpod: ^2.6.1
-  logging: ^1.3.0
   riverpod_annotation: ^2.6.1
   firebase_core: ^3.13.0
   firebase_vertexai: ^1.5.0
diff --git a/colorist/step_04/lib/main.dart b/colorist/step_04/lib/main.dart
@@ -2,28 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:colorist_ui/ui/screens/error_screen.dart';
-import 'package:colorist_ui/ui/screens/loading_screen.dart';
-import 'package:colorist_ui/ui/screens/main_screen.dart';
-import 'package:flutter/foundation.dart';
+import 'package:colorist_ui/colorist_ui.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:logging/logging.dart';
 
 import 'providers/gemini.dart';
 import 'services/gemini_chat_service.dart';
 
 void main() async {
-  Logger.root.level = Level.ALL;
-  Logger.root.onRecord.listen((record) {
-    if (kDebugMode) {
-      print(
-        '${record.loggerName}: ${record.level.name}: '
-        '${record.time}: ${record.message}',
-      );
-    }
-  });
-
   runApp(ProviderScope(child: MainApp()));
 }
 
diff --git a/colorist/step_04/lib/services/gemini_chat_service.dart b/colorist/step_04/lib/services/gemini_chat_service.dart
@@ -4,8 +4,7 @@
 
 import 'dart:async';
 
-import 'package:colorist_ui/providers/chat_state_notifier.dart';
-import 'package:colorist_ui/providers/log_state_notifier.dart';
+import 'package:colorist_ui/colorist_ui.dart';
 import 'package:firebase_vertexai/firebase_vertexai.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
diff --git a/colorist/step_04/pubspec.yaml b/colorist/step_04/pubspec.yaml
@@ -9,9 +9,8 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  colorist_ui: ^0.0.6
+  colorist_ui: ^0.1.0
   flutter_riverpod: ^2.6.1
-  logging: ^1.3.0
   riverpod_annotation: ^2.6.1
   firebase_core: ^3.13.0
   firebase_vertexai: ^1.5.0
diff --git a/colorist/step_05/lib/main.dart b/colorist/step_05/lib/main.dart
@@ -2,28 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:colorist_ui/ui/screens/error_screen.dart';
-import 'package:colorist_ui/ui/screens/loading_screen.dart';
-import 'package:colorist_ui/ui/screens/main_screen.dart';
-import 'package:flutter/foundation.dart';
+import 'package:colorist_ui/colorist_ui.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:logging/logging.dart';
 
 import 'providers/gemini.dart';
 import 'services/gemini_chat_service.dart';
 
 void main() async {
-  Logger.root.level = Level.ALL;
-  Logger.root.onRecord.listen((record) {
-    if (kDebugMode) {
-      print(
-        '${record.loggerName}: ${record.level.name}: '
-        '${record.time}: ${record.message}',
-      );
-    }
-  });
-
   runApp(ProviderScope(child: MainApp()));
 }
 
diff --git a/colorist/step_05/lib/services/gemini_chat_service.dart b/colorist/step_05/lib/services/gemini_chat_service.dart
@@ -4,8 +4,7 @@
 
 import 'dart:async';
 
-import 'package:colorist_ui/providers/chat_state_notifier.dart';
-import 'package:colorist_ui/providers/log_state_notifier.dart';
+import 'package:colorist_ui/colorist_ui.dart';
 import 'package:firebase_vertexai/firebase_vertexai.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
diff --git a/colorist/step_05/lib/services/gemini_tools.dart b/colorist/step_05/lib/services/gemini_tools.dart
@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:colorist_ui/providers/color_state_notifier.dart';
-import 'package:colorist_ui/providers/log_state_notifier.dart';
+import 'package:colorist_ui/colorist_ui.dart';
 import 'package:firebase_vertexai/firebase_vertexai.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
diff --git a/colorist/step_05/pubspec.yaml b/colorist/step_05/pubspec.yaml
@@ -9,9 +9,8 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  colorist_ui: ^0.0.6
+  colorist_ui: ^0.1.0
   flutter_riverpod: ^2.6.1
-  logging: ^1.3.0
   riverpod_annotation: ^2.6.1
   firebase_core: ^3.13.0
   firebase_vertexai: ^1.5.0
diff --git a/colorist/step_06/lib/main.dart b/colorist/step_06/lib/main.dart
@@ -2,28 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:colorist_ui/ui/screens/error_screen.dart';
-import 'package:colorist_ui/ui/screens/loading_screen.dart';
-import 'package:colorist_ui/ui/screens/main_screen.dart';
-import 'package:flutter/foundation.dart';
+import 'package:colorist_ui/colorist_ui.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:logging/logging.dart';
 
 import 'providers/gemini.dart';
 import 'services/gemini_chat_service.dart';
 
 void main() async {
-  Logger.root.level = Level.ALL;
-  Logger.root.onRecord.listen((record) {
-    if (kDebugMode) {
-      print(
-        '${record.loggerName}: ${record.level.name}: '
-        '${record.time}: ${record.message}',
-      );
-    }
-  });
-
   runApp(ProviderScope(child: MainApp()));
 }
 
diff --git a/colorist/step_06/lib/services/gemini_chat_service.dart b/colorist/step_06/lib/services/gemini_chat_service.dart
@@ -4,9 +4,7 @@
 
 import 'dart:async';
 
-import 'package:colorist_ui/models/conversation_state.dart';
-import 'package:colorist_ui/providers/chat_state_notifier.dart';
-import 'package:colorist_ui/providers/log_state_notifier.dart';
+import 'package:colorist_ui/colorist_ui.dart';
 import 'package:firebase_vertexai/firebase_vertexai.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
diff --git a/colorist/step_06/lib/services/gemini_tools.dart b/colorist/step_06/lib/services/gemini_tools.dart
@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:colorist_ui/providers/color_state_notifier.dart';
-import 'package:colorist_ui/providers/log_state_notifier.dart';
+import 'package:colorist_ui/colorist_ui.dart';
 import 'package:firebase_vertexai/firebase_vertexai.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
diff --git a/colorist/step_06/pubspec.yaml b/colorist/step_06/pubspec.yaml
@@ -9,9 +9,8 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  colorist_ui: ^0.0.6
+  colorist_ui: ^0.1.0
   flutter_riverpod: ^2.6.1
-  logging: ^1.3.0
   riverpod_annotation: ^2.6.1
   firebase_core: ^3.13.0
   firebase_vertexai: ^1.5.0
diff --git a/colorist/step_07/lib/main.dart b/colorist/step_07/lib/main.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:colorist_ui/ui/screens/screens.dart';
+import 'package:colorist_ui/colorist_ui.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
diff --git a/colorist/step_07/lib/providers/system_prompt.g.dart b/colorist/step_07/lib/providers/system_prompt.g.dart
diff --git a/colorist/step_07/lib/services/gemini_chat_service.dart b/colorist/step_07/lib/services/gemini_chat_service.dart
@@ -5,8 +5,7 @@
 import 'dart:async';
 import 'dart:convert';
 
-import 'package:colorist_ui/models/models.dart';
-import 'package:colorist_ui/providers/providers.dart';
+import 'package:colorist_ui/colorist_ui.dart';
 import 'package:firebase_vertexai/firebase_vertexai.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -76,6 +75,7 @@ class GeminiChatService {
     final chatStateNotifier = ref.read(chatStateNotifierProvider.notifier);
     final logStateNotifier = ref.read(logStateNotifierProvider.notifier);
     final blockText = block.text;
+
     if (blockText != null) {
       logStateNotifier.logLlmText(blockText);
       chatStateNotifier.appendToMessage(llmMessageId, blockText);
diff --git a/colorist/step_07/lib/services/gemini_tools.dart b/colorist/step_07/lib/services/gemini_tools.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:colorist_ui/providers/providers.dart';
+import 'package:colorist_ui/colorist_ui.dart';
 import 'package:firebase_vertexai/firebase_vertexai.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
diff --git a/colorist/step_07/pubspec.yaml b/colorist/step_07/pubspec.yaml
@@ -1,6 +1,6 @@
 name: colorist
 description: "A new Flutter project."
-publish_to: "none"
+publish_to: 'none'
 version: 0.1.0
 
 environment:
@@ -9,7 +9,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  colorist_ui: ^0.0.7
+  colorist_ui: ^0.1.0
   flutter_riverpod: ^2.6.1
   riverpod_annotation: ^2.6.1
   firebase_core: ^3.13.0
