From 4cc4089f36b0a9b9d754e33acb49da930f846699 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 13 May 2019 13:58:45 +0300
Subject: Some fixed to TCC mobile design. Implemented DFU reset on Machine
 Operator.

---
 Software/Android_Studio/ColorCapture/app/build.gradle          |  4 ++--
 .../java/com/twine/colorcapture/views/main/MainActivityVM.java | 10 ++++++++--
 .../ColorCapture/app/src/main/res/layout/side_menu.xml         |  4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'Software/Android_Studio')

diff --git a/Software/Android_Studio/ColorCapture/app/build.gradle b/Software/Android_Studio/ColorCapture/app/build.gradle
index b733330cc..ef4857b1d 100644
--- a/Software/Android_Studio/ColorCapture/app/build.gradle
+++ b/Software/Android_Studio/ColorCapture/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "com.twine.colorcapture"
         minSdkVersion 22
         targetSdkVersion 27
-        versionCode 3
-        versionName "1.3"
+        versionCode 4
+        versionName "1.4"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/MainActivityVM.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/MainActivityVM.java
index 72a088fa2..673146417 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/MainActivityVM.java
+++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/MainActivityVM.java
@@ -1,5 +1,7 @@
 package com.twine.colorcapture.views.main;
 
+import android.os.Handler;
+
 import com.squareup.otto.Bus;
 import com.twine.colorcapture.dialogs.welcome.WelcomeDialog;
 import com.twine.colorcapture.mvvm.RelayCommand;
@@ -85,9 +87,13 @@ public class MainActivityVM extends ViewModelBase<IMainActivity>
     private void handleHowToUseCommand()
     {
         view.closeMenu();
-        notificationProvider.showDialog(new WelcomeDialog(), (vm) ->
+
+        new Handler().postDelayed(() ->
         {
-        });
+            notificationProvider.showDialog(new WelcomeDialog(), (vm) ->
+            {
+            });
+        },300);
     }
 
     private void handleAboutCommand()
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/side_menu.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/side_menu.xml
index e5e15f4b7..3369f0a35 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/side_menu.xml
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/side_menu.xml
@@ -175,8 +175,8 @@
             android:layout_marginLeft="20dp"
             android:layout_marginRight="20dp"
             android:layout_marginBottom="60dp"
-            bind:text="   Get a twine TTC™ card"
-            bind:textSize="@dimen/medium_font_size"
+            bind:text="Get a twine TTC™ card"
+            bind:textSize="@dimen/small_font_size"
             bind:src="@drawable/icon_twine_card"
             android:clickable="true" />
     </RelativeLayout>
-- 
cgit v1.3.1