diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index 47c6ce4..64f84ec 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -9,24 +9,24 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -86,6 +86,13 @@
+
+
+
+
+
+
+
@@ -114,17 +121,17 @@
-
+
-
+
-
+
-
+
@@ -184,6 +191,13 @@
+
+
+
+
+
+
+
@@ -282,10 +296,10 @@
-
+
-
+
@@ -352,13 +366,6 @@
-
-
-
-
-
-
-
@@ -471,6 +478,13 @@
+
+
+
+
+
+
+
@@ -481,10 +495,11 @@
+
+
-
@@ -496,8 +511,8 @@
+
-
@@ -505,6 +520,7 @@
+
@@ -519,7 +535,7 @@
-
+
@@ -529,7 +545,6 @@
-
@@ -545,6 +560,7 @@
+
diff --git a/.idea/libraries/Flutter_Plugins.xml b/.idea/libraries/Flutter_Plugins.xml
index 215451c..961cfd9 100644
--- a/.idea/libraries/Flutter_Plugins.xml
+++ b/.idea/libraries/Flutter_Plugins.xml
@@ -7,8 +7,6 @@
-
-
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e6ce982..3db64b2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,5 +1,10 @@
+
+
+
+
+
@@ -10,9 +15,20 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -30,14 +46,11 @@
-
-
+
+
-
-
-
-
-
+
+
@@ -48,6 +61,7 @@
@@ -73,7 +87,6 @@
-
@@ -101,6 +114,11 @@
+
+
+
+
+
@@ -110,13 +128,98 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -349,29 +452,31 @@
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -410,44 +515,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -598,9 +665,6 @@
-
-
-
@@ -622,9 +686,6 @@
-
-
-
@@ -639,9 +700,6 @@
-
-
-
@@ -649,9 +707,6 @@
-
-
-
@@ -666,9 +721,6 @@
-
-
-
@@ -790,14 +842,47 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 352b7e6..b6a5d37 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -16,7 +16,7 @@
FlutterApplication and put your custom class here. -->
-
+
+
-
+ android:src="@drawable/ic_launcher" />
+
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index db77bb4..4427d27 100644
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 17987b7..e76759e 100644
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 09d4391..67c0ce7 100644
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index d5f1c8d..ce89876 100644
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 4d6372e..d8cdef3 100644
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 00fa441..628635f 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -4,5 +4,8 @@
- @drawable/launch_background
+ - true
+
+ #795548
diff --git a/assets/icon/ic_launcher.png b/assets/icon/ic_launcher.png
new file mode 100644
index 0000000..70d5433
Binary files /dev/null and b/assets/icon/ic_launcher.png differ
diff --git a/pubspec.lock b/pubspec.lock
index ede6d3f..0a04aa8 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -8,6 +8,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.33.0"
+ archive:
+ dependency: transitive
+ description:
+ name: archive
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "2.0.4"
args:
dependency: transitive
description:
@@ -22,13 +29,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.8"
- audioplayers:
- dependency: "direct main"
- description:
- name: audioplayers
- url: "https://pub.dartlang.org"
- source: hosted
- version: "0.7.8"
boolean_selector:
dependency: transitive
description:
@@ -85,6 +85,15 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.2"
+ dart_config:
+ dependency: transitive
+ description:
+ path: "."
+ ref: HEAD
+ resolved-ref: c5727795659e886a7db8b39a14e2c8987280fe1f
+ url: "https://github.com/MarkOSullivan94/dart_config.git"
+ source: git
+ version: "0.5.0"
firebase_auth:
dependency: "direct main"
description:
@@ -111,20 +120,20 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
- flutter_sound:
+ flutter_launcher_icons:
dependency: "direct main"
description:
- name: flutter_sound
+ name: flutter_launcher_icons
url: "https://pub.dartlang.org"
source: hosted
- version: "1.1.5"
- flutter_staggered_grid_view:
+ version: "0.6.1"
+ flutter_sound:
dependency: "direct main"
description:
- name: flutter_staggered_grid_view
+ name: flutter_sound
url: "https://pub.dartlang.org"
source: hosted
- version: "0.2.3"
+ version: "1.1.5"
flutter_test:
dependency: "direct dev"
description: flutter
@@ -179,6 +188,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "3.1.3"
+ image:
+ dependency: transitive
+ description:
+ name: image
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "2.0.4"
intl:
dependency: "direct main"
description:
@@ -277,13 +293,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.6.2"
- path_provider:
+ petitparser:
dependency: transitive
description:
- name: path_provider
+ name: petitparser
url: "https://pub.dartlang.org"
source: hosted
- version: "0.4.1"
+ version: "2.0.2"
plugin:
dependency: transitive
description:
@@ -347,13 +363,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.2+4"
- simple_coverflow:
- dependency: "direct main"
- description:
- name: simple_coverflow
- url: "https://pub.dartlang.org"
- source: hosted
- version: "0.0.6"
sky_engine:
dependency: transitive
description: flutter
@@ -464,6 +473,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.9"
+ xml:
+ dependency: transitive
+ description:
+ name: xml
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "3.2.3"
yaml:
dependency: transitive
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 32b45d0..536e0ec 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -19,7 +19,7 @@ dependencies:
flutter_sound: ^1.1.5
# audio_recorder: ^0.0.6
- audioplayers: ^0.7.8
+ # audioplayers: ^0.7.8
firebase_auth: ^0.6.2+1
google_sign_in: ^3.2.4
scoped_model: ^0.3.0
@@ -27,8 +27,9 @@ dependencies:
intl: ^0.15.6
firebase_storage: ^1.0.4
uuid: ^1.0.0
- flutter_staggered_grid_view: ^0.2.3
- simple_coverflow: ^0.0.6
+ # flutter_staggered_grid_view: ^0.2.3
+ # simple_coverflow: ^0.0.6
+ flutter_launcher_icons: ^0.6.1
# The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons.
@@ -39,6 +40,15 @@ dev_dependencies:
flutter_test:
sdk: flutter
+flutter_icons:
+ android: true
+ ios: true
+ image_path: "assets/icon/ic_launcher.png"
+ image_path_android: "assets/icon/ic_launcher.png"
+ image_path_ios: "assets/icon/ic_launcher.png"
+ adaptive_icon_background: "#FF795548"
+ adaptive_icon_foreground: "assets/icon/ic_launcher.png"
+
analyzer:
language:
enableSuperMixins: true