aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Android_Studio
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-05-28 13:56:27 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-05-28 13:56:27 +0300
commitc6ee9ffa1bffeb9f743d914e6ef0d326c8c27d4c (patch)
tree85f10f370c92c415aee0eea28318b2a3fac47451 /Software/Android_Studio
parent1616df43a043c24c9f788156234c04cf5305590a (diff)
downloadTango-c6ee9ffa1bffeb9f743d914e6ef0d326c8c27d4c.tar.gz
Tango-c6ee9ffa1bffeb9f743d914e6ef0d326c8c27d4c.zip
Attempt to fix camera sound on SnapMatch
Fixed long color names on SnapMatch. Clear email address and message when sending new email on SnapMatch. Working on Tango.Graphics2D...
Diffstat (limited to 'Software/Android_Studio')
-rw-r--r--Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/capture/CaptureFragmentVM.java9
-rw-r--r--Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/sendtoemail/SendToEmailFragmentVM.java2
-rw-r--r--Software/Android_Studio/ColorCapture/app/src/main/res/layout/color_result_item.xml3
3 files changed, 12 insertions, 2 deletions
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/capture/CaptureFragmentVM.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/capture/CaptureFragmentVM.java
index 5ce70e284..169f553a7 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/capture/CaptureFragmentVM.java
+++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/capture/CaptureFragmentVM.java
@@ -2,6 +2,8 @@ package com.twine.colorcapture.views.capture;
import android.graphics.Bitmap;
import android.media.MediaActionSound;
+import android.os.Handler;
+import android.os.Looper;
import android.util.Log;
import com.squareup.otto.Bus;
@@ -143,8 +145,11 @@ public class CaptureFragmentVM extends ViewModelBase<ICaptureFragment> implement
//ToneGenerator toneGen1 = new ToneGenerator(AudioManager.STREAM_MUSIC, 100);
//toneGen1.startTone(ToneGenerator.TONE_CDMA_PIP, 150);
- MediaActionSound sound = new MediaActionSound();
- sound.play(MediaActionSound.SHUTTER_CLICK);
+ new Handler(Looper.getMainLooper()).post(() ->
+ {
+ MediaActionSound sound = new MediaActionSound();
+ sound.play(MediaActionSound.SHUTTER_CLICK);
+ });
isCardDetected.set(true);
preventDetection = true;
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 2a89f706e..4cb2896fa 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
@@ -104,6 +104,8 @@ public class SendToEmailFragmentVM extends ViewModelBase<ISendToEmailFragment> i
@Override
public void onNavigationObjectReceived(ColorResult colorResult)
{
+ this.to.set("");
+ this.message.set("");
this.colorResult = colorResult;
}
}
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/color_result_item.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/color_result_item.xml
index 139ddc5b3..cc35b0f55 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/color_result_item.xml
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/color_result_item.xml
@@ -63,10 +63,13 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="5dp"
+ android:paddingRight="100dp"
android:fontFamily="@font/flexo_medium"
android:letterSpacing="0.07"
android:text="@{result.result.name}"
android:textSize="@dimen/medium_font_size"
+ android:maxLines="1"
+ android:ellipsize="end"
tools:text="Nike 100" />