Tutorial local images added images

lib/components/Home/Sidebar.dart

@@ -23,7 +23,7 @@ class Sidebar extends HookConsumerWidget {
 
   Widget _buildSmallLogo() {
     return Image.asset(
-      "assets/spotube-logo.png",
+      "assets/images/spotube-logo.png",
       height: 50,
       width: 50,
     );

lib/components/Login/Login.dart

@@ -27,7 +27,7 @@ class Login extends HookConsumerWidget {
             child: Column(
               children: [
                 Image.asset(
-                  "assets/spotube-logo.png",
+                  "assets/images/spotube-logo.png",
                   width: MediaQuery.of(context).size.width *
                       (breakpoint <= Breakpoints.md ? .5 : .3),
                 ),

lib/components/Login/LoginTutorial.dart

@@ -40,13 +40,13 @@ class LoginTutorial extends ConsumerWidget {
         pages: [
           PageViewModel(
             title: "Step 1",
-            image: CachedNetworkImage(
+            image: Image.asset("assets/tutorial/step-1.png"),
-                imageUrl:
-                    "https://user-images.githubusercontent.com/61944859/111762106-d1d37680-88ca-11eb-9884-ec7a40c0dd27.png"),
             bodyWidget: Wrap(
               children: [
-                Text("First, Go to ",
+                Text(
-                    style: Theme.of(context).textTheme.bodyText1),
+                  "First, Go to ",
+                  style: Theme.of(context).textTheme.bodyText1,
+                ),
                 Hyperlink(
                   "developer.spotify.com/dashboard ",
                   "https://developer.spotify.com/dashboard",
@@ -61,9 +61,7 @@ class LoginTutorial extends ConsumerWidget {
           ),
           PageViewModel(
             title: "Step 2",
-            image: CachedNetworkImage(
+            image: Image.asset("assets/tutorial/step-2.png"),
-                imageUrl:
-                    "https://user-images.githubusercontent.com/61944859/111762507-473f4700-88cb-11eb-91f3-d480e9584883.png"),
             bodyWidget: Text(
               "Now, create an Spotify Developer Application by Clicking on the \"CREATE AN APP\" button. Give it a name and description too",
               textAlign: TextAlign.left,
@@ -84,16 +82,19 @@ class LoginTutorial extends ConsumerWidget {
                   crossAxisAlignment: WrapCrossAlignment.center,
                   children: [
                     Text(
-                      "Add",
+                      "Add ",
                       style: Theme.of(context).textTheme.bodyText1,
                     ),
-                    TextButton(
+                    OutlinedButton(
                       child: Text(
                         "http://localhost:4304/auth/spotify/callback",
                         style: Theme.of(context).textTheme.bodyText1?.copyWith(
                               color: Theme.of(context).primaryColor,
                             ),
                       ),
+                      style: OutlinedButton.styleFrom(
+                        shape: const RoundedRectangleBorder(),
+                      ),
                       onPressed: () async {
                         await Clipboard.setData(
                           const ClipboardData(
@@ -113,7 +114,7 @@ class LoginTutorial extends ConsumerWidget {
                       },
                     ),
                     Text(
-                      "to \"Redirect URIs\"",
+                      " to \"Redirect URIs\"",
                       style: Theme.of(context).textTheme.bodyText1,
                     ),
                   ],
@@ -125,16 +126,14 @@ class LoginTutorial extends ConsumerWidget {
                   children: [
                     ConstrainedBox(
                       constraints: const BoxConstraints(maxWidth: 500),
-                      child: CachedNetworkImage(
+                      child: Image.asset(
-                        imageUrl:
+                        "assets/tutorial/step-3a.jpg",
-                            "https://user-images.githubusercontent.com/61944859/172991668-fa40f247-1118-4aba-a749-e669b732fa4d.jpg",
                       ),
                     ),
                     ConstrainedBox(
                       constraints: const BoxConstraints(maxWidth: 700),
-                      child: CachedNetworkImage(
+                      child: Image.asset(
-                        imageUrl:
+                        "assets/tutorial/step-3b.jpg",
-                            "https://user-images.githubusercontent.com/61944859/111768971-d308a180-88d2-11eb-9108-3e7444cef049.png",
                       ),
                     ),
                   ],
@@ -144,34 +143,33 @@ class LoginTutorial extends ConsumerWidget {
           ),
           PageViewModel(
             title: "Step 4",
-            image: CachedNetworkImage(
+            image: Image.asset("assets/tutorial/step-4.jpg"),
-                imageUrl:
-                    "https://user-images.githubusercontent.com/61944859/111769501-7fe31e80-88d3-11eb-8fc1-f3655dbd4711.png"),
             body:
                 "Finally, reveal the \"Client Secret\" by clicking on the \"SHOW CLIENT SECRET\" text\n Copy the Client ID & Client Secret then Paste them in the next Screen",
           ),
-          PageViewModel(
-            title: "Step 5",
-            bodyWidget: Column(
-              children: [
-                Text(
-                  "Paste the Copied \"Client ID\" and \"Client Secret\" Here",
-                  style: Theme.of(context).textTheme.bodyText1,
-                ),
-                const SizedBox(height: 10),
-                LoginForm(),
-              ],
-            ),
-          ),
           if (auth.isLoggedIn)
             PageViewModel(
               decoration: const PageDecoration(
                 bodyAlignment: Alignment.center,
               ),
               title: "Success🥳",
-              image: Image.asset("assets/success.png"),
+              image: Image.asset("assets/images/success.png"),
               body:
                   "Now you're successfully Logged In with your Spotify account. Good Job, mate!",
+            )
+          else
+            PageViewModel(
+              title: "Step 5",
+              bodyWidget: Column(
+                children: [
+                  Text(
+                    "Paste the Copied \"Client ID\" and \"Client Secret\" Here",
+                    style: Theme.of(context).textTheme.bodyText1,
+                  ),
+                  const SizedBox(height: 10),
+                  LoginForm(),
+                ],
+              ),
             ),
         ],
       ),

lib/components/Search/Search.dart

@@ -39,7 +39,7 @@ class Search extends HookConsumerWidget {
 
     return Expanded(
       child: SafeArea(
-        child: Container(
+        child: Material(
           color: Theme.of(context).backgroundColor,
           child: Column(
             children: [

lib/components/Settings/About.dart

@@ -33,8 +33,8 @@ class About extends HookWidget {
       onTap: () {
         showAboutDialog(
             context: context,
-            applicationIcon:
+            applicationIcon: CircleAvatar(
-                CircleAvatar(child: Image.asset("assets/spotube-logo.png")),
+                child: Image.asset("assets/images/spotube-logo.png")),
             applicationName: "Spotube",
             applicationVersion: info.version,
             applicationLegalese: licenseText,

lib/components/Shared/NotFound.dart

@@ -10,7 +10,7 @@ class NotFound extends StatelessWidget {
       SizedBox(
         height: 150,
         width: 150,
-        child: Image.asset("assets/empty_box.png"),
+        child: Image.asset("assets/images/empty_box.png"),
       ),
       Column(
         crossAxisAlignment: CrossAxisAlignment.start,

lib/components/Shared/PlaybuttonCard.dart

@@ -54,7 +54,7 @@ class PlaybuttonCard extends StatelessWidget {
                       child: CachedNetworkImage(
                         imageUrl: imageUrl,
                         placeholder: (context, url) =>
-                            Image.asset("assets/placeholder.png"),
+                            Image.asset("assets/images/placeholder.png"),
                       ),
                     ),
                     Positioned.directional(

pubspec.yaml

@@ -93,7 +93,8 @@ flutter:
   # To add assets to your application, add an assets section, like this:
   assets:
     - assets/
-  #   - images/a_dot_ham.jpeg
+    - assets/images/
+    - assets/tutorial/
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/assets-and-images/#resolution-aware.
@@ -121,14 +122,6 @@ flutter:
   # For details regarding fonts from package dependencies,
   # see https://flutter.dev/custom-fonts/#from-packages
 
-msix_config:
-  display_name: Spotube
-  publisher_display_name: KRTirtho
-  identity_name: oss.krtirtho.spotube
-  msix_version: 1.0.1.0
-  logo_path: .\assets\spotube-logo.png
-  capabilities: "internetClient,internetClientServer,backgroundMediaPlayback"
-
 flutter_icons:
   android: true
   image_path: "assets/spotube-logo.png"