Organize directory

shirne · Dec 23, 2023 · 7bedb86 · 7bedb86
1 parent d719538
commit 7bedb86
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 50 deletions.
diff --git a/lib/shirne_dialog.dart b/lib/shirne_dialog.dart
@@ -5,11 +5,11 @@ export 'src/controller.dart';
 export 'src/localizations.dart';
 export 'src/theme.dart';
 export 'src/dialog_icons.dart';
-export 'src/image_preview.dart';
-export 'src/popup.dart';
-export 'src/progress.dart';
-export 'src/snack.dart';
-export 'src/toast.dart';
-export 'src/dropdown.dart';
+export 'src/widgets/image_preview.dart';
+export 'src/widgets/popup.dart';
+export 'src/widgets/progress.dart';
+export 'src/widgets/snack.dart';
+export 'src/widgets/toast.dart';
+export 'src/widgets/dropdown.dart';
 
 export 'package:combined_animation/combined_animation.dart';
diff --git a/lib/src/dialog_icons.dart b/lib/src/dialog_icons.dart
@@ -1,35 +1,21 @@
 import 'package:flutter/widgets.dart';
 
-const _fontPackage = 'shirne_dialog';
+const _pkg = 'shirne_dialog';
+const _fmly = 'shirne_dialog_icons';
 
 class DialogIcons {
-  static const _fontFamily = 'dicons';
-  static const checkmark =
-      IconData(0xe900, fontFamily: _fontFamily, fontPackage: _fontPackage);
-  static const checkmarkCircle =
-      IconData(0xe901, fontFamily: _fontFamily, fontPackage: _fontPackage);
-  static const checkmarkFill =
-      IconData(0xe902, fontFamily: _fontFamily, fontPackage: _fontPackage);
-  static const close =
-      IconData(0xe903, fontFamily: _fontFamily, fontPackage: _fontPackage);
-  static const closeCircle =
-      IconData(0xe904, fontFamily: _fontFamily, fontPackage: _fontPackage);
-  static const closeFill =
-      IconData(0xe905, fontFamily: _fontFamily, fontPackage: _fontPackage);
-  static const help =
-      IconData(0xe906, fontFamily: _fontFamily, fontPackage: _fontPackage);
-  static const helpCircle =
-      IconData(0xe907, fontFamily: _fontFamily, fontPackage: _fontPackage);
-  static const helpFill =
-      IconData(0xe908, fontFamily: _fontFamily, fontPackage: _fontPackage);
-  static const information =
-      IconData(0xe909, fontFamily: _fontFamily, fontPackage: _fontPackage);
-  static const informationCircle =
-      IconData(0xe90a, fontFamily: _fontFamily, fontPackage: _fontPackage);
-  static const informationFill =
-      IconData(0xe90b, fontFamily: _fontFamily, fontPackage: _fontPackage);
-  static const warningFill =
-      IconData(0xe90c, fontFamily: _fontFamily, fontPackage: _fontPackage);
-  static const warningOutline =
-      IconData(0xe90d, fontFamily: _fontFamily, fontPackage: _fontPackage);
+  static const checkmark = IconData(0xe900, fontFamily: _fmly, fontPackage: _pkg);
+  static const checkmarkCircle = IconData(0xe901, fontFamily: _fmly, fontPackage: _pkg);
+  static const checkmarkFill = IconData(0xe902, fontFamily: _fmly, fontPackage: _pkg);
+  static const close = IconData(0xe903, fontFamily: _fmly, fontPackage: _pkg);
+  static const closeCircle = IconData(0xe904, fontFamily: _fmly, fontPackage: _pkg);
+  static const closeFill = IconData(0xe905, fontFamily: _fmly, fontPackage: _pkg);
+  static const help = IconData(0xe906, fontFamily: _fmly, fontPackage: _pkg);
+  static const helpCircle = IconData(0xe907, fontFamily: _fmly, fontPackage: _pkg);
+  static const helpFill = IconData(0xe908, fontFamily: _fmly, fontPackage: _pkg);
+  static const information = IconData(0xe909, fontFamily: _fmly, fontPackage: _pkg);
+  static const informationCircle = IconData(0xe90a, fontFamily: _fmly, fontPackage: _pkg);
+  static const informationFill = IconData(0xe90b, fontFamily: _fmly, fontPackage: _pkg);
+  static const warningFill = IconData(0xe90c, fontFamily: _fmly, fontPackage: _pkg);
+  static const warningOutline = IconData(0xe90d, fontFamily: _fmly, fontPackage: _pkg);
 }
diff --git a/lib/src/my_dialog.dart b/lib/src/my_dialog.dart
@@ -5,15 +5,15 @@ import 'dart:async';
 import 'package:combined_animation/combined_animation.dart';
 import 'package:flutter/material.dart';
 
-import 'dropdown.dart';
+import 'widgets/dropdown.dart';
 import 'localizations.dart';
 import 'controller.dart';
-import 'image_preview.dart';
-import 'popup.dart';
-import 'progress.dart';
-import 'snack.dart';
+import 'widgets/image_preview.dart';
+import 'widgets/progress.dart';
+import 'widgets/popup.dart';
+import 'widgets/snack.dart';
 import 'theme.dart';
-import 'toast.dart';
+import 'widgets/toast.dart';
 
 enum IconType {
   none,

diff --git a/lib/src/dropdown.dart → lib/src/widgets/dropdown.dart b/lib/src/dropdown.dart → lib/src/widgets/dropdown.dart
@@ -1,7 +1,7 @@
 import 'dart:math' as math;
 import 'package:flutter/material.dart';
 
-import '../shirne_dialog.dart';
+import '../../shirne_dialog.dart';
 
 class DropdownWidget extends StatefulWidget {
   const DropdownWidget({

diff --git a/lib/src/image_preview.dart → lib/src/widgets/image_preview.dart b/lib/src/image_preview.dart → lib/src/widgets/image_preview.dart
@@ -4,7 +4,7 @@ import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
 
-import '../shirne_dialog.dart';
+import '../../shirne_dialog.dart';
 
 final _placementImage = MemoryImage(
   Uint8List.fromList([

diff --git a/lib/src/popup.dart → lib/src/widgets/popup.dart b/lib/src/popup.dart → lib/src/widgets/popup.dart
@@ -2,7 +2,7 @@ library shirne_dialog;
 
 import 'package:flutter/material.dart';
 
-import 'theme.dart';
+import '../theme.dart';
 
 /// A popup Widget wrapper
 class PopupWidget extends StatefulWidget {

diff --git a/lib/src/progress.dart → lib/src/widgets/progress.dart b/lib/src/progress.dart → lib/src/widgets/progress.dart
@@ -2,7 +2,7 @@ library shirne_dialog;
 
 import 'package:flutter/material.dart';
 
-import 'theme.dart';
+import '../theme.dart';
 
 /// a progress Widget
 class ProgressWidget extends StatefulWidget {

diff --git a/lib/src/snack.dart → lib/src/widgets/snack.dart b/lib/src/snack.dart → lib/src/widgets/snack.dart
@@ -4,7 +4,7 @@ import 'dart:math' as math;
 
 import 'package:flutter/material.dart';
 
-import 'theme.dart';
+import '../theme.dart';
 
 /// a [SnickBar] like Widget
 class SnackWidget extends StatefulWidget {

diff --git a/lib/src/toast.dart → lib/src/widgets/toast.dart b/lib/src/toast.dart → lib/src/widgets/toast.dart
@@ -4,8 +4,8 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 
-import 'my_dialog.dart';
-import 'theme.dart';
+import '../my_dialog.dart';
+import '../theme.dart';
 
 const _defaultDuration = Duration(milliseconds: 300);
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -30,6 +30,6 @@ dev_dependencies:
 
 flutter:
   fonts:
-    - family: dicons
+    - family: shirne_dialog_icons
       fonts:
         - asset: assets/fonts/icons.ttf