Fixed CircleActionButton on TCC.

Prevent continues messages from updating after complete or error.
Fixed diagnostics not resuming MS <=> PPC after PPC <=> Machine disconnection.

3 files changed, 20 insertions, 4 deletions

diff --git a/Software/Android_Studio/ColorCapture/app/build.gradle b/Software/Android_Studio/ColorCapture/app/build.gradle
index 495158238..b733330cc 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 2
-        versionName "1.0"
+        versionCode 3
+        versionName "1.3"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
@@ -23,7 +23,7 @@ android {
     buildTypes {
 
         debug {
-            buildConfigField "String", "WEB_SERVICE_ADDRESS", "\"http://10.100.102.214:45455/api/\""
+            buildConfigField "String", "WEB_SERVICE_ADDRESS", "\"http://192.168.1.229:45457/api/\""
             buildConfigField "String", "WEB_SERVICE_APP_ID", "\"Tdf793i4ughsiduf8749509237885ehgfdlkghlT\""
         }
 
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/controls/CircleActionButton.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/controls/CircleActionButton.java
index afa02c511..a054fb3b2 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/controls/CircleActionButton.java
+++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/controls/CircleActionButton.java
@@ -35,6 +35,7 @@ public class CircleActionButton extends FrameLayout implements View.OnTouchListe
     private AlphaAnimation alphaAnimationUp;
     private Drawable icon;
     private AppCompatTextView textView;
+    private boolean isWidthSet;
 
     public CircleActionButton(@NonNull Context context, @Nullable AttributeSet attrs)
     {
@@ -48,6 +49,7 @@ public class CircleActionButton extends FrameLayout implements View.OnTouchListe
 
         btn = findViewById(R.id.actionButtonCircleButton);
         circleActionButton = findViewById(R.id.actionButtonCircle);
+
         frameAfterPadding = findViewById(R.id.frameAfterPadding);
         ImageView imageView = findViewById(R.id.circleActionButtonImageView);
         textView = findViewById(R.id.circleActionButtonTextView);
@@ -73,6 +75,20 @@ public class CircleActionButton extends FrameLayout implements View.OnTouchListe
     }
 
     @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec)
+    {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+        if (!isWidthSet)
+        {
+            isWidthSet = true;
+            ViewGroup.LayoutParams layoutParams = circleActionButton.getLayoutParams();
+            layoutParams.width = circleActionButton.getMeasuredHeight();
+            circleActionButton.setLayoutParams(layoutParams);
+        }
+    }
+
+    @Override
     public boolean onTouch(View view, MotionEvent motionEvent)
     {
         if (motionEvent.getAction() == MotionEvent.ACTION_DOWN)
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/sendtoemail/SendToEmailFragmentVM.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/sendtoemail/SendToEmailFragmentVM.java
index 8638f8719..8056bcfe6 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/sendtoemail/SendToEmailFragmentVM.java
+++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/sendtoemail/SendToEmailFragmentVM.java
@@ -90,7 +90,7 @@ public class SendToEmailFragmentVM extends ViewModelBase<ISendToEmailFragment> i
                         vm.close();
                         notificationProvider.showSuccess("Send to email", "Your detected color result is on its way!", (x) ->
                         {
-                            closeActivity();
+                            navigationProvider.navigateBack();
                         });
                     }
                 }).build().start();