Merge pull request #37 from Robert3141/beta

v6.2.1
Robert3141 · Sep 22, 2019 · c84ee7d · c84ee7d
2 parents 50eae20 + dec64ae
commit c84ee7d
Show file tree

Hide file tree

Showing 7 changed files with 1,445 additions and 22 deletions.
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -1 +1,2 @@
 org.gradle.jvmargs=-Xmx1536M
+android.enableR8=true
diff --git a/ios/Flutter/flutter_export_environment.sh b/ios/Flutter/flutter_export_environment.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+# This is a generated file; do not edit or check into version control.
+export "FLUTTER_ROOT=C:\src\flutter"
+export "FLUTTER_APPLICATION_PATH=C:\Users\Robert\AndroidStudioProjects\Flashcards\master\flashcards"
+export "FLUTTER_TARGET=lib\main.dart"
+export "FLUTTER_BUILD_DIR=build"
+export "SYMROOT=${SOURCE_ROOT}/../build\ios"
+export "FLUTTER_FRAMEWORK_DIR=C:\src\flutter\bin\cache\artifacts\engine\ios"
+export "FLUTTER_BUILD_NAME=6.2.1"
+export "FLUTTER_BUILD_NUMBER=22"
diff --git a/lib/main.dart b/lib/main.dart
@@ -77,6 +77,8 @@ class Strings{
   static String editCardsCardNo = "Card Number: ";
   static String editCardsFront = "Front of Card";
   static String editCardsRear = "Back of Card";
+  static String editDelete = "Deleting Card";
+  static String editDeleting = "Are you sure you want to delete this?";
 
   //Error Messages
   static String errorImport = "Error Importing Flashcards:\n";
@@ -86,7 +88,6 @@ class Strings{
   static String errorEdit = "Error Editing Flashcards:\n";
   static String errorLoad = "Error Loading Flashcards:\n";
   static String errorDelete = "Error Deleting Flashcards:\n";
-  static String errorDeleting = "Are you sure you want to delete this?";
   static String errorNewCard = "Error Getting Next Flashcard:\n";
   static String errorLoadPrefs = "Error Loading Settings:\n";
   static String errorSettingsOrdered = "Error Changing Ordered Cards:\n";
@@ -389,8 +390,8 @@ class _MyHomePageState extends State<MyHomePage> {
       showDialog(
         context: context,
         builder: (BuildContext context) => AlertDialog(
-          title: Text(Strings.errorDelete),
-          content: Text(Strings.errorDeleting),
+          title: Text(Strings.editDelete),
+          content: Text(Strings.editDeleting),
           actions: <Widget>[
             FlatButton(
               child: Text(Strings.errorCancel),
@@ -584,7 +585,7 @@ class _MyHomePageState extends State<MyHomePage> {
     final _tabPages = <Widget>[
       //Main Tab
       Container(
-          child: Column(
+        child: Column(
               mainAxisAlignment: MainAxisAlignment.start,
               children: <Widget>[
                 Card(
@@ -712,8 +713,7 @@ class _MyHomePageState extends State<MyHomePage> {
 
       //Settings Tab
       Container(
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.start,
+        child: ListView(
           children: <Widget>[
             // Cards Ordered
             InkWell(
@@ -823,7 +823,7 @@ class _MyHomePageState extends State<MyHomePage> {
               ),
             ),
           ],
-        )
+        ),
       ),
     ];
 
@@ -924,7 +924,7 @@ class _FlashcardsPage extends MaterialPageRoute<Null> {
           //generate random
           Random _rng = new Random();
           int _randomNumber = 0;
-          int _amountOfFlashcards = _currentFileData.length ~/ 2 - 1;
+          int _amountOfFlashcards = _currentFileData.length ~/ 2;
 
           // make random flashcard as next in list
           _randomNumber = _rng.nextInt(_amountOfFlashcards) * 2;
@@ -967,7 +967,7 @@ class _FlashcardsPage extends MaterialPageRoute<Null> {
                   controller: _scrollControl,
                   itemBuilder: (BuildContext context, int index) {
                     return FlipCard(
-                      key: UniqueKey(),
+                      //key: UniqueKey(),
                       direction: FlipDirection.HORIZONTAL,
                       speed: 1500,
                       front: InkWell(
@@ -1196,8 +1196,8 @@ class _EditCardsState extends State<EditCards> {
         showDialog<String>(
           context: context,
           builder: (BuildContext context) => AlertDialog(
-            title: Text(Strings.errorEditDelete),
-            content: Text(Strings.errorDeleting),
+            title: Text(Strings.editDelete),
+            content: Text(Strings.editDeleting),
             actions: <Widget>[
               FlatButton(
                 child: Text(Strings.errorCancel),