update changes

nixrajput · Feb 12, 2022 · e185fec · e185fec
1 parent 452d447
commit e185fec
Show file tree

Hide file tree

Showing 18 changed files with 1,144 additions and 473 deletions.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -29,4 +29,28 @@
             android:name="flutterEmbedding"
             android:value="2" />
     </application>
+
+    <queries>
+        <!-- If your app opens https URLs -->
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="https" />
+        </intent>
+        <!-- If your app makes calls -->
+        <intent>
+            <action android:name="android.intent.action.DIAL" />
+            <data android:scheme="tel" />
+        </intent>
+        <!-- If your sends SMS messages -->
+        <intent>
+            <action android:name="android.intent.action.SENDTO" />
+            <data android:scheme="smsto" />
+        </intent>
+        <!-- If your app sends emails -->
+        <intent>
+            <action android:name="android.intent.action.SEND" />
+            <data android:mimeType="*/*" />
+        </intent>
+    </queries>
+
 </manifest>
diff --git a/assets/ingredients.png b/assets/ingredients.png
diff --git a/assets/wishlist.png b/assets/wishlist.png
diff --git a/lib/constants/app_themes.dart b/lib/constants/app_themes.dart
@@ -13,7 +13,7 @@ class AppThemes {
     ),
     dialogBackgroundColor: lightBGColor,
     popupMenuTheme: const PopupMenuThemeData(
-      color: lightBGColor,
+      color: lightColor,
     ),
     elevatedButtonTheme: ElevatedButtonThemeData(
       style: ButtonStyle(
@@ -25,6 +25,9 @@ class AppThemes {
         foregroundColor: MaterialStateProperty.all(darkColor),
       ),
     ),
+    appBarTheme: const AppBarTheme(
+      backgroundColor: lightColor,
+    ),
     textTheme: const TextTheme(
       bodyText1: TextStyle(color: darkColor),
       bodyText2: TextStyle(color: darkColor),
@@ -63,6 +66,9 @@ class AppThemes {
         foregroundColor: MaterialStateProperty.all(lightColor),
       ),
     ),
+    appBarTheme: const AppBarTheme(
+      backgroundColor: darkColor,
+    ),
     textTheme: const TextTheme(
       bodyText1: TextStyle(color: lightColor),
       bodyText2: TextStyle(color: lightColor),

diff --git a/lib/main.dart b/lib/main.dart
@@ -7,11 +7,13 @@ import 'package:grocery_list_maker/constants/colors.dart';
 import 'package:grocery_list_maker/constants/strings.dart';
 import 'package:grocery_list_maker/providers/grocery_provider.dart';
 import 'package:grocery_list_maker/views/home.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 import 'package:tekartik_app_flutter_sqflite/sqflite.dart';
 
 import 'app_platform/app_platform.dart';
 
 late GroceryProvider groceryProvider;
+late PackageInfo packageInfo;
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
@@ -27,6 +29,8 @@ void main() async {
   groceryProvider = GroceryProvider(databaseFactory);
   await groceryProvider.ready;
 
+  packageInfo = await PackageInfo.fromPlatform();
+
   runApp(const MyApp());
 }
 

diff --git a/lib/models/grocery_list.dart b/lib/models/grocery_list.dart
@@ -4,9 +4,8 @@ import 'package:grocery_list_maker/models/constant.dart';
 
 class GroceryList extends DbRecord {
   final title = CvField<String>(columnTitle);
-  final description = CvField<String>(columnDescription);
   final addedAt = CvField<String>(columnAddedAt);
 
   @override
-  List<CvField<dynamic>> get fields => [id, title, description, addedAt];
+  List<CvField<dynamic>> get fields => [id, title, addedAt];
 }
diff --git a/lib/providers/grocery_provider.dart b/lib/providers/grocery_provider.dart
@@ -102,7 +102,7 @@ class GroceryProvider {
         '$columnListId INTEGER, $columnAddedAt TEXT)');
     await db.execute(
         'CREATE TABLE $tableGroceryLists($columnId INTEGER PRIMARY KEY, '
-        '$columnTitle TEXT, $columnDescription TEXT, $columnAddedAt DATE)');
+        '$columnTitle TEXT, $columnAddedAt TEXT)');
     await db.execute(
         'CREATE INDEX ItemAddedAt ON $tableGroceryItems ($columnAddedAt)');
     await db.execute(
@@ -144,11 +144,11 @@ class GroceryProvider {
       columns: [
         columnId,
         columnTitle,
-        columnDescription,
         columnAddedAt,
       ],
       where: '$columnId = ?',
       whereArgs: <Object?>[id],
+      orderBy: '$columnAddedAt DESC',
     ));
 
     if (list.isNotEmpty) {
@@ -342,7 +342,8 @@ class GroceryProvider {
         ],
         where: '$columnListId = ?',
         whereArgs: <Object?>[listId],
-        orderBy: '$columnAddedAt ${(descending ?? false) ? 'ASC' : 'DESC'}',
+        // orderBy: '$columnTitle ${(descending ?? false) ? 'ASC' : 'DESC'}',
+        orderBy: columnTitle,
         limit: limit,
         offset: offset,
       ));
@@ -371,7 +372,11 @@ class GroceryProvider {
       {int? offset, int? limit, bool? descending}) async {
     var list = (await db!.query(
       tableGroceryLists,
-      columns: [columnId, columnTitle, columnDescription, columnAddedAt],
+      columns: [
+        columnId,
+        columnTitle,
+        columnAddedAt,
+      ],
       orderBy: '$columnAddedAt ${(descending ?? false) ? 'ASC' : 'DESC'}',
       limit: limit,
       offset: offset,