release: hot fix to 1.0.3 (#66)

* fix: phone call (#61) * fix: call + sms phone format * chore: update TASKS * fix: bad state error (#62) * chore: UI clean up I somehow couldn't reproduce the bug. I ended up cleaning up some UI. * chore: update TASKS * refactor: redux reset store on logout (#63) * chore: first look * chore: code clean up * chore(redux): second draft * feat(redux): clean up store on logout * feat: reset store on logout * chore: update TASKS * feat: version check (#64) * feat: version check * chore: update TASKS * feat: bump to 1.0.3 * fix: reference upload (#65) * chore: code clean up * fix: reference upload Fixes the bad state as well. Turns out firstWhere throws on Empty. * chore: update TASKS
jogboms · Jul 21, 2018 · 021776c · 021776c
1 parent ae00c4e
commit 021776c
Show file tree

Hide file tree

Showing 39 changed files with 642 additions and 447 deletions.
diff --git a/TASKS.todo b/TASKS.todo
@@ -7,9 +7,14 @@ PENDING:
   ☐ On account create, send personal email + email to user @high
   ☐ personalize measurements w/ account @critical
   ☐ indicator for premium accounts @today
-  ☐ reference upload issue @critical
 
 COMPLETED:
+  ✔ reference upload issue @critical @done(18-07-21 16:40)
+  ✔ stats image count on job update image @today @done(18-07-21 15:49)
+  ✔ check for outdated version + template @today @done(18-07-21 15:40)
+  ✔ reset local store on logout @critical @done(18-07-21 14:18)
+  ✔ on dismiss contact creation, bad state error @critical @done(18-07-21 10:18)
+  ✔ phone number call + sms issue @critical @done(18-07-21 09:59)
   ✔ fix homepage height issue @today @done(18-07-20 20:39)
   ✔ sort + search jobs & contacts @today @done(18-07-20 20:00)
   ✔ friendly error on log in @today @done(18-07-20 19:34)

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -20,7 +20,7 @@ keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 ext.versionMajor = 1
 ext.versionMinor = 0
-ext.versionPatch = 2
+ext.versionPatch = 3
 ext.versionClassifier = "beta"
 ext.isSnapshot = false
 ext.minimumSdkVersion = 16

diff --git a/lib/models/settings.dart b/lib/models/settings.dart
@@ -1,14 +1,17 @@
 class SettingsModel {
-  String premiumNotice;
+  final String premiumNotice;
+  final String versionName;
 
   SettingsModel({
     this.premiumNotice,
+    this.versionName,
   });
 
   factory SettingsModel.fromJson(Map<String, dynamic> json) {
     assert(json != null);
     return new SettingsModel(
       premiumNotice: json['premiumNotice'],
+      versionName: json['versionName'],
     );
   }
 }
diff --git a/lib/pages/contacts/contacts.dart b/lib/pages/contacts/contacts.dart
@@ -113,7 +113,7 @@ class _ContactsPageState extends State<ContactsPage> {
   AppBar buildAppBar(TMTheme theme, ContactsViewModel vm) {
     return appBar(
       context,
-      title: "Clients",
+      title: "Contacts",
       actions: <Widget>[
         new IconButton(
           icon: new Icon(

diff --git a/lib/pages/contacts/ui/contact_appbar.dart b/lib/pages/contacts/ui/contact_appbar.dart
@@ -49,7 +49,7 @@ class ContactAppBarState extends State<ContactAppBar> {
           ContactsEditPage(contact: widget.contact),
         );
       case Choice.SendText:
-        return sms(int.parse(widget.contact.phone));
+        return sms(widget.contact.phone);
       default:
         break;
     }
@@ -77,7 +77,7 @@ class ContactAppBarState extends State<ContactAppBar> {
             ),
             appBarIcon(
               icon: Icons.call,
-              onTap: () => call(int.parse(widget.contact.phone)),
+              onTap: () => call(widget.contact.phone),
             ),
             new PopupMenuButton<Choice>(
               icon: Icon(Icons.more_vert, color: Colors.white),

diff --git a/lib/pages/contacts/ui/contacts_filter_button.dart b/lib/pages/contacts/ui/contacts_filter_button.dart
@@ -43,7 +43,7 @@ class ContactsFilterButton extends StatelessWidget {
                       SortType.recent,
                     ),
                     buildTextOption(
-                      "Reset Sort",
+                      "No Sort",
                       SortType.reset,
                     ),
                   ],

diff --git a/lib/pages/contacts/ui/contacts_list_item.dart b/lib/pages/contacts/ui/contacts_list_item.dart
@@ -75,8 +75,8 @@ class ContactsListItem extends StatelessWidget {
       mainAxisSize: MainAxisSize.min,
       mainAxisAlignment: MainAxisAlignment.spaceEvenly,
       children: <Widget>[
-        iconCircle(Icons.call, () => call(int.parse(contact.phone))),
-        iconCircle(Icons.message, () => sms(int.parse(contact.phone))),
+        iconCircle(Icons.call, () => call(contact.phone)),
+        iconCircle(Icons.message, () => sms(contact.phone)),
       ],
     );
 
@@ -97,7 +97,10 @@ class ContactsListItem extends StatelessWidget {
           () => TMNavigate(context, ContactPage(contact: contact)),
       leading: avatar(),
       title: title,
-      subtitle: Text(pending >= 1 ? "$pending pending" : "No pending wears",
+      subtitle: Text(
+          pending >= 1
+              ? "$pending pending"
+              : "${contact.totalJobs > 0 ? contact.totalJobs : 'none'} completed",
           style: TextStyle(fontSize: 14.0, color: kTextBaseColor)),
       trailing: showActions ? icons : null,
     );

diff --git a/lib/pages/gallery/gallery_view.dart b/lib/pages/gallery/gallery_view.dart
@@ -71,21 +71,25 @@ class MyAppBar extends StatelessWidget implements PreferredSizeWidget {
                 icon: Icon(Icons.arrow_back),
               ),
               Expanded(child: SizedBox()),
-              IconButton(
-                icon: Icon(
-                  Icons.work,
-                  color: Colors.white,
-                ),
-                onPressed: () => TMNavigate(context, JobPage(job: job)),
-              ),
-              IconButton(
-                icon: Icon(
-                  Icons.person,
-                  color: Colors.white,
-                ),
-                onPressed: () =>
-                    TMNavigate(context, ContactPage(contact: contact)),
-              ),
+              job != null
+                  ? IconButton(
+                      icon: Icon(
+                        Icons.work,
+                        color: Colors.white,
+                      ),
+                      onPressed: () => TMNavigate(context, JobPage(job: job)),
+                    )
+                  : SizedBox(),
+              contact != null
+                  ? IconButton(
+                      icon: Icon(
+                        Icons.person,
+                        color: Colors.white,
+                      ),
+                      onPressed: () =>
+                          TMNavigate(context, ContactPage(contact: contact)),
+                    )
+                  : SizedBox(),
               IconButton(
                 icon: Icon(
                   Icons.share,

diff --git a/lib/pages/homepage/home_view_model.dart b/lib/pages/homepage/home_view_model.dart
@@ -2,6 +2,7 @@ import 'package:redux/redux.dart';
 import 'package:tailor_made/models/account.dart';
 import 'package:tailor_made/models/contact.dart';
 import 'package:tailor_made/redux/actions/account.dart';
+import 'package:tailor_made/redux/actions/main.dart';
 import 'package:tailor_made/redux/states/account.dart';
 import 'package:tailor_made/redux/states/contacts.dart';
 import 'package:tailor_made/redux/states/main.dart';
@@ -35,4 +36,6 @@ class HomeViewModel extends StatsViewModel {
   void onReadNotice() => store.dispatch(OnReadNotice(payload: account));
 
   void onSkipedPremium() => store.dispatch(OnSkipedPremium());
+
+  void logout() => store.dispatch(OnLogoutEvent());
 }