diff options
Diffstat (limited to 'Software/Android_Studio')
7 files changed, 22 insertions, 8 deletions
diff --git a/Software/Android_Studio/ColorCapture/app/build.gradle b/Software/Android_Studio/ColorCapture/app/build.gradle index f33a257b3..1fed98dc3 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 8 - versionName "1.8" + versionCode 9 + versionName "1.9" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" externalNativeBuild { cmake { diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/integration/ExternalBridgeScanner.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/integration/ExternalBridgeScanner.java index 9c87987bd..bca334fe6 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/integration/ExternalBridgeScanner.java +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/integration/ExternalBridgeScanner.java @@ -110,7 +110,7 @@ public class ExternalBridgeScanner if (!stream(machines).any(x -> x.getSerialNumber().equals(discoveryMessage.getSerialNumber()) && x.getIpAddress().equals(address))) { ExternalBridgeMachine newMachine = new ExternalBridgeMachine(address, discoveryMessage.getSerialNumber()); - machines.add(0, newMachine); + machines.add(newMachine); machineDiscoveredEvent.invoke(this, newMachine); } diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/navigation/AndroidNavigationProvider.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/navigation/AndroidNavigationProvider.java index 52c96ca35..ca51b48ff 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/navigation/AndroidNavigationProvider.java +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/navigation/AndroidNavigationProvider.java @@ -107,7 +107,10 @@ public class AndroidNavigationProvider extends ExtendedObject implements INaviga { if (currentFragment != null) { - currentFragment.getVM().notifyNavigatedTo(); + new Handler().postDelayed(() -> + { + currentFragment.getVM().notifyNavigatedTo(); + }, 300); } } @@ -135,7 +138,8 @@ public class AndroidNavigationProvider extends ExtendedObject implements INaviga { history.clear(); FragmentManager fm = activity.getFragmentManager(); - for(int i = 0; i < fm.getBackStackEntryCount(); ++i) { + for (int i = 0; i < fm.getBackStackEntryCount(); ++i) + { fm.popBackStack(); } } 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 161fc3579..6e5773e1b 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 @@ -236,6 +236,12 @@ public class CaptureFragmentVM extends ViewModelBase<ICaptureFragment> implement } @Override + public void onResume() + { + + } + + @Override protected void onNavigatedTo() { super.onNavigatedTo(); @@ -271,4 +277,5 @@ public class CaptureFragmentVM extends ViewModelBase<ICaptureFragment> implement super.onNavigatedFrom(); view.stopCamera(); } + } diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/capture/ICaptureFragment.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/capture/ICaptureFragment.java index 162de4b2e..09fbe7383 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/capture/ICaptureFragment.java +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/capture/ICaptureFragment.java @@ -21,5 +21,7 @@ public interface ICaptureFragment extends IView void onFrameAvailable(byte[] frame); void onPreviewSettingsAvailable(int previewWidth, int previewHeight); + + void onResume(); } } diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/sendtomachine/SendToMachineFragmentVM.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/sendtomachine/SendToMachineFragmentVM.java index 9c6d7003e..fe20dae45 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/sendtomachine/SendToMachineFragmentVM.java +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/sendtomachine/SendToMachineFragmentVM.java @@ -77,7 +77,7 @@ public class SendToMachineFragmentVM extends ViewModelBase<ISendToMachineFragmen { invokeUI(() -> { - machines.add(0, machine); + machines.add(machine); }); } } diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_result.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_result.xml index 3849397e5..05a0ad216 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_result.xml +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_result.xml @@ -20,7 +20,7 @@ <RelativeLayout android:id="@+id/result_main_container" - android:layout_width="@dimen/result_button_width" + android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/colorDarkBackground" android:layoutDirection="ltr" @@ -182,9 +182,10 @@ <LinearLayout - android:layout_width="match_parent" + android:layout_width="@dimen/result_button_width" android:layout_height="wrap_content" android:layout_alignParentBottom="true" + android:layout_centerHorizontal="true" android:orientation="vertical" android:paddingLeft="40dp" android:paddingRight="40dp" |