diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-05-19 10:21:20 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-05-19 10:21:20 +0300 |
| commit | de07f2351711a9d70f1b25fe0fff84c72b85ec53 (patch) | |
| tree | 132cd5af77867b830f86cd3b482770867b9f5e32 /Software/Android_Studio | |
| parent | 224dbed27bca922d8c97150fa9768ce268f325c6 (diff) | |
| download | Tango-de07f2351711a9d70f1b25fe0fff84c72b85ec53.tar.gz Tango-de07f2351711a9d70f1b25fe0fff84c72b85ec53.zip | |
Redundant.
Diffstat (limited to 'Software/Android_Studio')
3 files changed, 3 insertions, 20 deletions
diff --git a/Software/Android_Studio/ColorCapture/app/build.gradle b/Software/Android_Studio/ColorCapture/app/build.gradle index e5d67ac98..f33a257b3 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 7 - versionName "1.7" + versionCode 8 + versionName "1.8" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" externalNativeBuild { cmake { diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/mvvm/DialogBase.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/mvvm/DialogBase.java index ab78dddcb..91948ea64 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/mvvm/DialogBase.java +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/mvvm/DialogBase.java @@ -131,27 +131,10 @@ public abstract class DialogBase<BindingView extends ViewDataBinding, VM extends } @Override - public void onAttach(Context context) - { - super.onAttach(context); - - if (dismissed) - { - this.getDialog().onBackPressed(); - } - } - - @Override public void onStart() { super.onStart(); - if (dismissed) - { - this.getDialog().onBackPressed(); - return; - } - //getDialog().getWindow().setBackgroundDrawableResource(android.R.color.transparent); // View group = this.getView(); 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 a0716cb13..3849397e5 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 @@ -91,7 +91,7 @@ <FrameLayout android:id="@+id/frameToggleBtn" android:layout_width="match_parent" - android:layout_height="25dp" + android:layout_height="wrap_content" android:layout_below="@id/rgbContainer" android:layout_marginTop="15dp"> |