Code improvement

SinaSys · Jul 4, 2022 · e545bbf · e545bbf
1 parent 20a95e4
commit e545bbf
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 18 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -23,5 +23,5 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           artifacts: "build/app/outputs/apk/release/app-release.apk"
-          tag: v2.0.3
+          tag: v2.0.4
           token: ${{ secrets.TOKEN }}
diff --git a/lib/core/app_data.dart b/lib/core/app_data.dart
@@ -16,7 +16,7 @@ class AppData {
       isFavorite: false,
       title: 'Comhar All-in-One Standing Desk Glass',
       description: dummyText,
-      price: '\$469.99',
+      price: 469.99,
       score: 3.5,
       images: [
         AppAsset.comharStandingDesk1,
@@ -37,7 +37,7 @@ class AppData {
       quantity: 1,
       title: 'Ergonomic Gaming Desk with Mouse Pad',
       description: dummyText,
-      price: '\$299.99',
+      price: 299.99,
       score: 4.5,
       images: [
         AppAsset.ergonomicGamingDesk1,
@@ -56,7 +56,7 @@ class AppData {
       isFavorite: false,
       title: 'Kana Pro Bamboo Standing Desk',
       description: dummyText,
-      price: '\$659.99',
+      price: 659.99,
       score: 3.0,
       images: [
         AppAsset.kanaBambooDesk1,
@@ -76,7 +76,7 @@ class AppData {
       isFavorite: false,
       title: 'Soutien Ergonomic Office Chair',
       description: dummyText,
-      price: '\$349.99',
+      price: 349.99,
       score: 2.5,
       images: [
         AppAsset.soutienOfficeChair1,
@@ -96,7 +96,7 @@ class AppData {
       isFavorite: false,
       title: 'Theodore Standing Desk',
       description: dummyText,
-      price: '\$499.99',
+      price: 499.99,
       score: 2.8,
       images: [
         AppAsset.theodoreStandingDesk1,

diff --git a/lib/core/app_extension.dart b/lib/core/app_extension.dart
@@ -9,10 +9,6 @@ extension StringExtension on String {
       return "${substring(0, 15)}...";
     }
   }
-
-  double get dropSign {
-    return double.parse(replaceAll("\$", ""));
-  }
 }
 
 

diff --git a/lib/src/controller/office_furniture_controller.dart b/lib/src/controller/office_furniture_controller.dart
@@ -54,7 +54,7 @@ class OfficeFurnitureController extends GetxController {
   calculateTotalPrice() {
     totalPrice.value = 0;
     for (var element in cartFurniture) {
-      totalPrice.value += element.quantity *  element.price.dropSign;
+      totalPrice.value += element.quantity *  element.price;
     }
   }
 

diff --git a/lib/src/model/furniture.dart b/lib/src/model/furniture.dart
@@ -3,7 +3,7 @@ import 'package:office_furniture_store/src/model/furniture_color.dart';
 class Furniture {
   String title;
   String description;
-  String price;
+  double price;
   int quantity;
   double score;
   List<String> images;

diff --git a/lib/src/view/screen/office_furniture_detail_screen.dart b/lib/src/view/screen/office_furniture_detail_screen.dart
@@ -64,7 +64,7 @@ class OfficeFurnitureDetailScreen extends StatelessWidget {
                         color: Colors.black45, fontWeight: FontWeight.bold)),
               ),
               const SizedBox(height: 5),
-              FittedBox(child: Text(furniture.price, style: h2Style))
+              FittedBox(child: Text("\$${furniture.price}", style: h2Style))
             ],
           ),
           ElevatedButton(

diff --git a/lib/src/view/screen/office_furniture_list_screen.dart b/lib/src/view/screen/office_furniture_list_screen.dart
@@ -52,7 +52,7 @@ class OfficeFurnitureListScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    Future<Widget?> _navigate(Furniture furniture, int index) {
+    Future<Widget?> _navigate(Furniture furniture) {
       return Navigator.push(
         context,
         PageRouteBuilder(

diff --git a/lib/src/view/widget/cart_list_view.dart b/lib/src/view/widget/cart_list_view.dart
@@ -36,7 +36,7 @@ class CartListView extends StatelessWidget {
                 children: [
                   Text(furniture.title.addOverFlow, style: h4Style),
                   const SizedBox(height: 5),
-                  Text(furniture.price, style: h2Style),
+                  Text("\$${furniture.price}", style: h2Style),
                   const SizedBox(height: 5),
                   Row(
                     children: [

diff --git a/lib/src/view/widget/furniture_list_view.dart b/lib/src/view/widget/furniture_list_view.dart
@@ -6,7 +6,7 @@ import '../../model/furniture.dart';
 
 class FurnitureListView extends StatelessWidget {
   final bool isHorizontal;
-  final Function(Furniture furniture, int index)? onTap;
+  final Function(Furniture furniture)? onTap;
   final List<Furniture> furnitureList;
 
   const FurnitureListView(
@@ -77,7 +77,7 @@ class FurnitureListView extends StatelessWidget {
           );
 
     return GestureDetector(
-      onTap: () => onTap?.call(furniture, index),
+      onTap: () => onTap?.call(furniture),
       child: widget,
     );
   }
@@ -103,10 +103,11 @@ class FurnitureListView extends StatelessWidget {
           )
         : ListView.builder(
             shrinkWrap: true,
+            reverse: true,
             physics: const ClampingScrollPhysics(),
             itemCount: furnitureList.length,
             itemBuilder: (_, index) {
-              Furniture furniture = furnitureList.reversed.toList()[index];
+              Furniture furniture = furnitureList[index];
               return Padding(
                 padding: const EdgeInsets.only(bottom: 15, top: 10),
                 child: _listViewItem(furniture, index),
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,10 +9,6 @@ extension StringExtension on String { @@
           return "${substring(0, 15)}...";
         }
       }
-      double get dropSign {
-        return double.parse(replaceAll("\$", ""));
-      }
     }
@@ Expand Down @@