Merge pull request #41 from phantomate/dev

Dev

lib/blocs/login/login_bloc.dart

@@ -4,6 +4,7 @@ import 'package:bloc/bloc.dart';
 import 'package:hive/hive.dart';
 import 'package:untare/blocs/authentication/authentication_bloc.dart';
 import 'package:untare/blocs/authentication/authentication_event.dart';
+import 'package:untare/exceptions/api_connection_exception.dart';
 import 'package:untare/exceptions/api_exception.dart';
 import 'package:untare/models/user.dart';
 import 'package:untare/models/userToken.dart';
@@ -50,6 +51,8 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> {
       } else {
         emit(LoginFailure(error: e.message ?? e.toString()));
       }
+    } on ApiConnectionException catch(e) {
+      emit(LoginFailure(error: e.message));
     } catch (err) {
       emit(LoginFailure(error: err.toString()));
     }

lib/components/widgets/recipe_detail_tabbar_widget.dart

@@ -48,7 +48,7 @@ class RecipeDetailTabBarWidgetState extends State<RecipeDetailTabBarWidget> {
     return TabBarView(
       children: [
         ingredientTabView(),
-        directionsTabView()
+        directionsTabView(widget.recipe)
       ],
     );
   }
@@ -114,24 +114,24 @@ class RecipeDetailTabBarWidgetState extends State<RecipeDetailTabBarWidget> {
     }
   }
 
-  Widget directionsTabView() {
+  Widget directionsTabView(Recipe recipe) {
     List<Widget> directionsSteps = [];
 
-    if (widget.recipe.steps.isNotEmpty) {
-      if (widget.recipe.steps.length > 1) {
-        for (int i = 0; i < widget.recipe.steps.length; i++) {
+    if (recipe.steps.isNotEmpty) {
+      if (recipe.steps.length > 1) {
+        for (int i = 0; i < recipe.steps.length; i++) {
           List<Widget> stepList = [];
 
-          stepList.addAll(widget.recipe.steps[i].ingredients.map((item) => ingredientComponent(item, servings, newServings, true, context)).toList());
+          stepList.addAll(recipe.steps[i].ingredients.map((item) => ingredientComponent(item, servings, newServings, true, context)).toList());
 
-          stepList.add(Padding(padding: const EdgeInsets.fromLTRB(20, 12, 15, 10), child: Text(widget.recipe.steps[i].instruction ?? '', style: const TextStyle(fontSize: 15))));
+          stepList.add(Padding(padding: const EdgeInsets.fromLTRB(20, 12, 15, 10), child: Text(recipe.steps[i].instruction ?? '', style: const TextStyle(fontSize: 15))));
 
-          directionsSteps.add(directionStepLayout(context, Column(crossAxisAlignment: CrossAxisAlignment.start, children: stepList), i+1, widget.recipe.steps[i].time, widget.recipe.steps[i].name));
+          directionsSteps.add(directionStepLayout(context, Column(crossAxisAlignment: CrossAxisAlignment.start, children: stepList), i+1, recipe.steps[i].time, recipe.steps[i].name));
         }
 
-      } else if (widget.recipe.steps.length == 1) {
-        List<String> splitDirectionsStrings = (widget.recipe.steps.first.instruction != null && widget.recipe.steps.first.instruction != '')
-            ? widget.recipe.steps.first.instruction!.split("\n\n")
+      } else if (recipe.steps.length == 1) {
+        List<String> splitDirectionsStrings = (recipe.steps.first.instruction != null && recipe.steps.first.instruction != '')
+            ? recipe.steps.first.instruction!.split("\n\n")
             : [];
 
         if (splitDirectionsStrings.length <= 2) {
@@ -151,8 +151,8 @@ class RecipeDetailTabBarWidgetState extends State<RecipeDetailTabBarWidget> {
                 context,
                 Padding(padding: const EdgeInsets.fromLTRB(20, 12, 15, 10), child: Text(splitInstruction, style: const TextStyle(fontSize: 15))),
                 i+1,
-                widget.recipe.steps.first.time,
-                widget.recipe.steps.first.name
+                recipe.steps.first.time,
+                recipe.steps.first.name
               )
             );
           }
@@ -262,11 +262,28 @@ class RecipeDetailTabBarWidgetState extends State<RecipeDetailTabBarWidget> {
     SettingsCubit settingsCubit = context.read<SettingsCubit>();
     bool? useFractions = (settingsCubit.state.userServerSetting!.useFractions == true);
 
-    double rawAmount = (ingredient.amount * (((newServing/initServing))*100).ceil()/100);
+    double rawAmount = ingredient.amount * newServing / initServing;
     String amount = (ingredient.amount > 0) ? ('${rawAmount.toFormattedString()} ') : '';
     if (amount != '' && useFractions == true && (rawAmount % 1) != 0) {
-      amount = '${rawAmount.toMixedFraction()} ';
+      // If we have a complex decimal we build a "simple" fraction. Otherwise we do the normal one
+      if ((((rawAmount - rawAmount.toInt()) * 100) % 5) != 0) {
+        // Use this crap because we can't change precision programmatically
+        if (rawAmount.toInt() < 1) {
+          amount = '${MixedFraction.fromDouble(rawAmount, precision: 1.0e-1).reduce()} ';
+        } else if (rawAmount.toInt() < 10) {
+          amount = '${MixedFraction.fromDouble(rawAmount, precision: 1.0e-2).reduce()} ';
+        } else if (rawAmount.toInt() < 100) {
+          amount = '${MixedFraction.fromDouble(rawAmount, precision: 1.0e-3).reduce()} ';
+        } else if(rawAmount.toInt() < 1000) {
+          amount = '${MixedFraction.fromDouble(rawAmount, precision: 1.0e-4).reduce()} ';
+        } else {
+          amount = '${MixedFraction.fromDouble(rawAmount, precision: 1.0e-5).reduce()} ';
+        }
+      } else {
+        amount = '${MixedFraction.fromDouble(rawAmount)} ';
+      }
     }
+
     String unit = (ingredient.amount > 0 && ingredient.unit != null) ? ('${ingredient.unit!.getUnitName(rawAmount)} ') : '';
     String food = (ingredient.food != null) ? ('${ingredient.food!.getFoodName(rawAmount)} ') : '';
     String note = (ingredient.note != null && ingredient.note != '') ? ('(${ingredient.note!})') : '';

lib/components/widgets/recipe_shopping_list_stateful_widget.dart

@@ -223,11 +223,28 @@ class RecipeShoppingListWidgetState extends State<RecipeShoppingListWidget> {
     SettingsCubit settingsCubit = context.read<SettingsCubit>();
     bool? useFractions = (settingsCubit.state.userServerSetting!.useFractions == true);
 
-    double rawAmount = (ingredient.amount * (((newServing/initServing))*100).ceil()/100);
+    double rawAmount = ingredient.amount * newServing / initServing;
     String amount = (ingredient.amount > 0) ? ('${rawAmount.toFormattedString()} ') : '';
     if (amount != '' && useFractions == true && (rawAmount % 1) != 0) {
-      amount = '${rawAmount.toMixedFraction()} ';
+      // If we have a complex decimal we build a "simple" fraction. Otherwise we do the normal one
+      if ((((rawAmount - rawAmount.toInt()) * 100) % 5) != 0) {
+        // Use this crap because we can't change precision programmatically
+        if (rawAmount.toInt() < 1) {
+          amount = '${MixedFraction.fromDouble(rawAmount, precision: 1.0e-1).reduce()} ';
+        } else if (rawAmount.toInt() < 10) {
+          amount = '${MixedFraction.fromDouble(rawAmount, precision: 1.0e-2).reduce()} ';
+        } else if (rawAmount.toInt() < 100) {
+          amount = '${MixedFraction.fromDouble(rawAmount, precision: 1.0e-3).reduce()} ';
+        } else if(rawAmount.toInt() < 1000) {
+          amount = '${MixedFraction.fromDouble(rawAmount, precision: 1.0e-4).reduce()} ';
+        } else {
+          amount = '${MixedFraction.fromDouble(rawAmount, precision: 1.0e-5).reduce()} ';
+        }
+      } else {
+        amount = '${MixedFraction.fromDouble(rawAmount)} ';
+      }
     }
+
     String unit = (ingredient.unit != null && ingredient.amount > 0) ? ('${ingredient.unit!.getUnitName(rawAmount)} ') : '';
     String food = (ingredient.food != null) ? ('${ingredient.food!.getFoodName(rawAmount)} ') : '';
     bool? checkBoxValue = !(ingredient.food != null && ingredient.food!.onHand!);

lib/exceptions/api_connection_exception.dart

@@ -1,2 +1,5 @@
 class ApiConnectionException implements Exception{
+  final String message;
+
+  ApiConnectionException({this.message = 'Api error'});
 }

lib/main.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/scheduler.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_phoenix/flutter_phoenix.dart';
@@ -61,7 +60,7 @@ void main() async{
 
   await Workmanager().initialize(_callbackDispatcher);
 
-  SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp, DeviceOrientation.portraitDown]).then((_){
+  SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp, DeviceOrientation.portraitDown, DeviceOrientation.landscapeLeft, DeviceOrientation.landscapeRight]).then((_){
     runApp(
         Phoenix(
             child: const Tare()

lib/models/recipe.dart

@@ -30,7 +30,7 @@ class Recipe {
   @HiveField(10)
   final String? updatedAt;
   @HiveField(11)
-  final bool internal;
+  final bool? internal;
   @HiveField(12)
   final int? servings;
   @HiveField(13)
@@ -56,7 +56,7 @@ class Recipe {
     this.createdBy,
     this.createdAt,
     this.updatedAt,
-    required this.internal,
+    this.internal,
     this.servings,
     this.servingsText,
     this.rating,
@@ -158,7 +158,7 @@ class Recipe {
       createdBy: json['created_by'] as int?,
       createdAt: json['created_at'] as String?,
       updatedAt: json['updated_at'] as String?,
-      internal: json['internal'] as bool,
+      internal: json['internal'] as bool?,
       servings: (json['servings'] is int) ? json['servings'] : ((json['servings'] is double) ? json['servings'].toInt() : null),
       servingsText: json['servings_text'] as String?,
       rating: (json['rating'] is int) ? json['rating'] : ((json['rating'] is double) ? json['rating'].toInt() : null),

lib/models/step.dart

@@ -1,5 +1,6 @@
 import 'package:untare/models/ingredient.dart';
 import 'package:hive/hive.dart';
+import 'package:untare/models/recipe.dart';
 
 part 'step.g.dart';
 
@@ -22,6 +23,10 @@ class StepModel {
   final int? time;
   @HiveField(7)
   final int? order;
+  @HiveField(8)
+  final int? stepRecipe;
+  @HiveField(9)
+  final Recipe? stepRecipeData;
 
   StepModel({
     this.id,
@@ -31,7 +36,9 @@ class StepModel {
     this.ingredientsMarkdown,
     this.ingredientsVue,
     this.time,
-    this.order
+    this.order,
+    this.stepRecipe,
+    this.stepRecipeData
   });
 
   StepModel copyWith({
@@ -43,6 +50,8 @@ class StepModel {
     String? ingredientsVue,
     int? time,
     int? order,
+    int? stepRecipe,
+    Recipe? stepRecipeData
   }) {
     return StepModel(
       id: id ?? this.id,
@@ -52,7 +61,8 @@ class StepModel {
       ingredientsMarkdown: ingredientsMarkdown ?? this.ingredientsMarkdown,
       ingredientsVue: ingredientsVue ?? this.ingredientsVue,
       time: time ?? this.time,
-      order: order ?? this.order
+      order: order ?? this.order,
+      stepRecipe: stepRecipe ?? this.stepRecipe
     );
   }
 
@@ -71,7 +81,8 @@ class StepModel {
       'instruction': instruction ?? '',
       'ingredients': ingredients,
       'time': time ?? 0,
-      'order': order ?? 0
+      'order': order ?? 0,
+      'step_recipe': stepRecipe
     };
   }
 
@@ -85,6 +96,8 @@ class StepModel {
       ingredientsVue: json['ingredients_vue'] as String?,
       time: json['time'] as int?,
       order: json['order'] as int?,
+      stepRecipe: json['step_recipe'] as int?,
+      stepRecipeData: (json['step_recipe_data'] != null) ? Recipe.fromJson(json['step_recipe_data']) : null
     );
   }
 }

lib/pages/recipes_page.dart

@@ -126,6 +126,12 @@ class RecipesPageState extends State<RecipesPage> {
                 }
                 isLoading = false;
                 recipes.addAll(state.recipes);
+              } else if (state is RecipeListFetchedFromCache) {
+                if (state.recipes.isEmpty || state.recipes.length < pageSize) {
+                  isLastPage = true;
+                }
+                isLoading = false;
+                recipes.addAll(state.recipes);
               }
 
               if (state is RecipeError) {

lib/pages/starting_page.dart

@@ -152,7 +152,7 @@ class __SignInFormState extends State<_SignInForm> {
                                         hintText: 'https://recipes.excample.com'
                                     ),
                                     controller: _urlController,
-                                    keyboardType: TextInputType.name,
+                                    keyboardType: TextInputType.url,
                                     autocorrect: false,
                                     validator: (value){
                                       if (value == null){

lib/services/api/api_service.dart

@@ -86,7 +86,7 @@ class ApiService {
 
   Future sendRequest(BaseRequest request) async {
     try {
-      Response response = await Response.fromStream(await request.send());
+      Response response = await Response.fromStream(await request.send().timeout(const Duration(seconds: 10)));
 
       if (response.statusCode == 401) {
         box.clear();
@@ -111,7 +111,7 @@ class ApiService {
         );
       }
 
-      throw ApiConnectionException();
+      throw ApiConnectionException(message: e.toString());
     }
   }
 

pubspec.yaml

@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.1.1+3
+version: 1.1.2+4
 
 environment:
   sdk: ">=2.17.0 <3.0.0"