Merge pull request #4 from manuelvargastapia/development

Development
manuelvargastapia · Dec 11, 2020 · 9869af4 · 9869af4
2 parents 13369f6 + 3e52d0e
commit 9869af4
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 6 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -53,6 +53,15 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+
+    splits {
+        abi {
+            enable true
+            reset()
+            include "x86_64", "arm64-v8a", "armeabi-v7a"
+            universalApk true
+        }
+    }
 }
 
 flutter {

diff --git a/assets/fonts/Lato-Bold.ttf b/assets/fonts/Lato-Bold.ttf
diff --git a/assets/fonts/Lato-Italic.ttf b/assets/fonts/Lato-Italic.ttf
diff --git a/assets/fonts/Lato-Regular.ttf b/assets/fonts/Lato-Regular.ttf
diff --git a/assets/fonts/Roboto-Bold.ttf b/assets/fonts/Roboto-Bold.ttf
diff --git a/assets/fonts/Roboto-Italic.ttf b/assets/fonts/Roboto-Italic.ttf
diff --git a/assets/fonts/Roboto-Regular.ttf b/assets/fonts/Roboto-Regular.ttf
diff --git a/lib/blocs/download_bloc.dart b/lib/blocs/download_bloc.dart
@@ -72,7 +72,13 @@ class DownloadBloc extends Bloc<DownloadEvent, DownloadState> {
     final author = book.author != null ? " - " + book.author : "";
     final publisher = book.publisher != null ? " - " + book.publisher : "";
     final year = book.year != null ? " - " + book.year.toString() : "";
-    return "$title$author$publisher$year".replaceAll(RegExp(r'\/'), ' ');
+
+    // Needed to allow devices recognize the files in Downloads folder
+    final fileExtension =
+        book.fileExtension != null ? "." + book.fileExtension : "";
+
+    return "$title$author$publisher$year$fileExtension"
+        .replaceAll(RegExp(r'\/'), ' ');
   }
 
   @override

diff --git a/lib/global/theme/themes.dart b/lib/global/theme/themes.dart
@@ -29,7 +29,7 @@ final _primarySwatchDark = _createMaterialColor(Colors.blueAccent);
 final _secondarySwatch = _createMaterialColor(Colors.deepOrange);
 const _iconThemeData = const IconThemeData(color: Colors.white);
 
-const String _fontFamily = 'Roboto';
+const String _fontFamily = 'Lato';
 const PageTransitionsTheme _transition = const PageTransitionsTheme(
   builders: {
     TargetPlatform.android: FadeTransitionBuilder(),

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -82,13 +82,13 @@ flutter:
     - assets/images/app_icon.png
 
   fonts:
-    - family: Roboto
+    - family: Lato
       fonts:
-        - asset: assets/fonts/Roboto-Bold.ttf
+        - asset: assets/fonts/Lato-Bold.ttf
           weight: 700
-        - asset: assets/fonts/Roboto-Italic.ttf
+        - asset: assets/fonts/Lato-Italic.ttf
           style: italic
-        - asset: assets/fonts/Roboto-Regular.ttf
+        - asset: assets/fonts/Lato-Regular.ttf
 
 flutter_intl:
   main_locale: en_US