Fixed minor bugs

hariysu · Nov 9, 2019 · 690ce69 · 690ce69
1 parent 8125c57
commit 690ce69
Show file tree

Hide file tree

Showing 31 changed files with 50 additions and 24 deletions.
diff --git a/assets/FontManifest.json b/assets/FontManifest.json
@@ -0,0 +1,19 @@
+
+[
+  {
+    "family": "MaterialIcons",
+    "fonts": [
+      {
+        "asset": "https://fonts.gstatic.com/s/materialicons/v42/flUhRq6tzZclQEJ-Vdg-IuiaDsNcIhQ8tQ.woff2"
+      }
+    ]
+  },
+  {
+    "family": "GoogleSansRegular",
+    "fonts": [
+      {
+        "asset": "GoogleSansRegular.ttf"
+      }
+    ]
+  }
+]
diff --git a/assets/GoogleSansRegular.ttf b/assets/GoogleSansRegular.ttf
diff --git a/web/assets/about.html → assets/about.html b/web/assets/about.html → assets/about.html
diff --git a/assets/avatar.jpg b/assets/avatar.jpg
diff --git a/assets/facebook.png b/assets/facebook.png
diff --git a/assets/github.png b/assets/github.png
diff --git a/assets/instagram.png b/assets/instagram.png
diff --git a/assets/linkedin.png b/assets/linkedin.png
diff --git a/assets/medium.png b/assets/medium.png
diff --git a/assets/moon.png b/assets/moon.png
diff --git a/assets/twitter.png b/assets/twitter.png
diff --git a/assets/works/cocoapay.png b/assets/works/cocoapay.png
diff --git a/assets/works/facelyt.png b/assets/works/facelyt.png
diff --git a/assets/works/kharedi_now.png b/assets/works/kharedi_now.png
diff --git a/assets/works/messio.png b/assets/works/messio.png
diff --git a/assets/works/mydealer.png b/assets/works/mydealer.png
diff --git a/assets/works/mynewcar.png b/assets/works/mynewcar.png
diff --git a/assets/works/railenq.png b/assets/works/railenq.png
diff --git a/assets/works/rajasthan_tourism.png b/assets/works/rajasthan_tourism.png
diff --git a/assets/works/savaari_consumer.png b/assets/works/savaari_consumer.png
diff --git a/assets/works/savaari_partner.png b/assets/works/savaari_partner.png
diff --git a/assets/works/stattion.png b/assets/works/stattion.png
diff --git a/assets/works/trivz.png b/assets/works/trivz.png
diff --git a/assets/works/truelancer.png b/assets/works/truelancer.png
diff --git a/assets/works/vdrone.png b/assets/works/vdrone.png
diff --git a/assets/works/wheelie_repairs.png b/assets/works/wheelie_repairs.png
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,8 +1,8 @@
 import 'package:adityagurjar/pages/home_page.dart';
+import 'package:adityagurjar/widgets/theme_inherited_widget.dart';
 import 'package:flutter/material.dart';
 
 import 'config/themes.dart';
-import 'widgets/theme_inherited_widget.dart';
 
 void main() => runApp(MyApp());
 
@@ -26,6 +26,7 @@ class Adityadroid extends StatelessWidget {
     return MaterialApp(
       debugShowCheckedModeBanner: false,
       title: 'Aditya Gurjar',
+    //theme: lightTheme(context),
       theme:ThemeSwitcher.of(context).isDarkModeOn?darkTheme(context):lightTheme(context),
       home: HomePage(),
     );

diff --git a/lib/pages/home_page.dart b/lib/pages/home_page.dart
@@ -26,7 +26,7 @@ class _HomePageState extends State<HomePage> {
         appBar: AppBar(
           actions: <Widget>[
             IconButton(
-              icon: ThemeSwitcher.of(context).isDarkModeOn?Icon(Icons.wb_sunny):Image.asset('moon.png',height: 20,width: 20,),
+              icon: ThemeSwitcher.of(context).isDarkModeOn?Icon(Icons.wb_sunny):Image.asset('assets/moon.png',height: 20,width: 20,),
               onPressed: ()=> ThemeSwitcher.of(context).switchDarkMode(),
             )
           ],

diff --git a/lib/tabs/about_tab.dart b/lib/tabs/about_tab.dart
@@ -13,7 +13,7 @@ class AboutTab extends StatelessWidget {
             children: <Widget>[
               CircleAvatar(
                 radius: 100,
-                backgroundImage: Image.asset('avatar.jpg').image,
+                backgroundImage: Image.asset('assets/avatar.jpg').image,
               ),
               SizedBox(
                 height: 20,
@@ -42,21 +42,21 @@ class AboutTab extends StatelessWidget {
                     icon: SizedBox(
                         width: 20,
                         height: 20,
-                        child: Image.asset('github.png')),
+                        child: Image.asset('assets/github.png')),
                     label: Text('Github'),
                     onPressed:()=> html.window.open(Constants.PROFILE_GITHUB,'adityadroid' ),
                   ),FlatButton.icon(
                     icon: SizedBox(
                         width: 20,
                         height: 20,
-                        child: Image.asset('twitter.png')),
+                        child: Image.asset('assets/twitter.png')),
                     label: Text('Twitter'),
                     onPressed:()=> html.window.open(Constants.PROFILE_TWITTER,'adityadroid' ),
                   ),FlatButton.icon(
                     icon: SizedBox(
                         width: 20,
                         height: 20,
-                        child: Image.asset('medium.png')),
+                        child: Image.asset('assets/medium.png')),
                     label: Text('Medium'),
                     onPressed:()=> html.window.open(Constants.PROFILE_MEDIUM,'adityadroid' ),
                   )
@@ -70,21 +70,21 @@ class AboutTab extends StatelessWidget {
                     icon: SizedBox(
                         width: 20,
                         height: 20,
-                        child: Image.asset('instagram.png')),
+                        child: Image.asset('assets/instagram.png')),
                     label: Text('Instagram'),
                     onPressed:()=> html.window.open(Constants.PROFILE_INSTAGRAM,'adityadroid' ),
                   ),FlatButton.icon(
                     icon: SizedBox(
                         width: 20,
                         height: 20,
-                        child: Image.asset('facebook.png')),
+                        child: Image.asset('assets/facebook.png')),
                     label: Text('Facebook'),
                     onPressed:()=> html.window.open(Constants.PROFILE_FACEBOOK,'adityadroid' ),
                   ),FlatButton.icon(
                     icon: SizedBox(
                         width: 20,
                         height: 20,
-                        child: Image.asset('linkedin.png')),
+                        child: Image.asset('assets/linkedin.png')),
                     label: Text('Linkedin'),
                     onPressed:()=> html.window.open(Constants.PROFILE_LINKEDIN,'adityadroid' ),
                   )

diff --git a/lib/tabs/projects_tab.dart b/lib/tabs/projects_tab.dart
@@ -7,86 +7,86 @@ class ProjectsTab extends StatelessWidget {
   final List<Project> projects = [
     Project(
         name: 'Truelancer',
-        image: 'works/truelancer.png',
+        image: 'assets/works/truelancer.png',
         description:
             'Truelancer Mobile App is a Freelancing Platform. You can Search Jobs & Hire Freelancers for work.',
         link:
             'https://play.google.com/store/apps/details?id=com.truelancer.app'),
     Project(
         name: 'Messio',
-        image: 'works/messio.png',
+        image: 'assets/works/messio.png',
         description:
             'An Open-Source Messaging App built using Flutter and Firebase. Part of the series \'60 Days of Flutter',
         link: 'https://github.com/adityadroid/messio'),
     Project(
         name: 'Savaari',
-        image: 'works/savaari_consumer.png',
+        image: 'assets/works/savaari_consumer.png',
         description:
             'Savaari is the leading player in Outstation Cabs, Hourly Rental Cabs, Airport Pickups and Airport Drop Taxis. ',
         link: 'https://play.google.com/store/apps/details?id=com.savaari.app'),
     Project(
         name: 'Savaari Partner',
-        image: 'works/savaari_partner.png',
+        image: 'assets/works/savaari_partner.png',
         description:
             'This App allows cab drivers to conveniently share billing and other trip details scheduled to them.',
         link:
             'https://play.google.com/store/apps/details?id=com.savaari.driver.app'),
     Project(
         name: 'Mynewcar',
-        image: 'works/mynewcar.png',
+        image: 'assets/works/mynewcar.png',
         description:
             'Through this App, along with doorstep delivery of a new car, one can also select the accessories to buy.',
         link: 'https://play.google.com/store/apps/details?id=com.mynewcar.app'),
     Project(
         name: 'Trivz',
-        image: 'works/trivz.png',
+        image: 'assets/works/trivz.png',
         description:
             'With the Trivz app, car owners can give test drives to car buyers.',
         link:
             'https://play.google.com/store/apps/details?id=in.mynewcar.testdrives'),
     Project(
         name: 'Mydealer',
-        image: 'works/mydealer.png',
+        image: 'assets/works/mydealer.png',
         description:
             'Mydealer App helps a car dealership to manage sales process and improve the productivity`.',
         link: 'https://play.google.com/store/apps/details?id=in.mnc.mydealer'),
     Project(
         name: 'FaceLyt',
-        image: 'works/facelyt.png',
+        image: 'assets/works/facelyt.png',
         description:
             'FaceLyt is an alternative and free client to manage your Facebook account.',
         link:
             'https://apkpure.com/facelyt-for-facebook-lite/com.adityaadi1467.facelytx'),
     Project(
         name: 'Cocoapay',
-        image: 'works/cocoapay.png',
+        image: 'assets/works/cocoapay.png',
         description:
             'Cocoapay helps merchants start accepting payments through POS devices and bill through the app.',
         link: 'http://www.cocoapay.com/'),
     Project(
         name: 'VDrone',
-        image: 'works/vdrone.png',
+        image: 'assets/works/vdrone.png',
         description: 'A New company which does everything you dont want',
         link: 'http://www.vdrone.xyz/'),
     Project(
         name: 'Wheelie Repairs',
-        image: 'works/wheelie_repairs.png',
+        image: 'assets/works/wheelie_repairs.png',
         description:
             'Wheelie Repairs providers door to door garage services & breakdown assistance for vehicles.',
         link:
             'https://play.google.com/store/apps/details?id=com.wheelierepairs'),
     Project(
         name: 'Kharedi Now',
-        image: 'works/kharedi_now.png',
+        image: 'assets/works/kharedi_now.png',
         description: 'A Grocery app for the city of Latur.'),
     Project(
         name: 'Rajasthan Tourism',
-        image: 'works/rajasthan_tourism.png',
+        image: 'assets/works/rajasthan_tourism.png',
         description:
             'A app built using Cordova which had info about Rajasthan and its tourism destinations'),
     Project(
         name: 'Railenq',
-        image: 'works/railenq.png',
+        image: 'assets/works/railenq.png',
         description:
             'RailENQ is an app for trains and Railway Enquiries.'),
   ];

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -12,5 +12,11 @@ dependencies:
 
 flutter:
   uses-material-design: true
-
+  assets:
+  - assets/
+  - assets/works/
+  fonts:
+  - family: GoogleSansRegular
+    fonts:
+      - asset: assets/GoogleSansRegular.ttf