diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-05-10 14:50:37 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-05-10 14:50:37 +0300 |
| commit | f82ae06fbae6d69ea493906feb5ac13b57472b9d (patch) | |
| tree | 0b3c24f69ef85ea590cae7db4b97ca9db9caca3d /Software/Android_Studio | |
| parent | e5200c6ba6a1b13525cc1261992ad61b03f93951 (diff) | |
| download | Tango-f82ae06fbae6d69ea493906feb5ac13b57472b9d.tar.gz Tango-f82ae06fbae6d69ea493906feb5ac13b57472b9d.zip | |
MERGE
Diffstat (limited to 'Software/Android_Studio')
55 files changed, 303 insertions, 260 deletions
diff --git a/Software/Android_Studio/ColorCapture/app/build.gradle b/Software/Android_Studio/ColorCapture/app/build.gradle index b74f3a18c..495158238 100644 --- a/Software/Android_Studio/ColorCapture/app/build.gradle +++ b/Software/Android_Studio/ColorCapture/app/build.gradle @@ -23,7 +23,7 @@ android { buildTypes { debug { - buildConfigField "String", "WEB_SERVICE_ADDRESS", "\"http://192.168.1.229:45455/api/\"" + buildConfigField "String", "WEB_SERVICE_ADDRESS", "\"http://10.100.102.214:45455/api/\"" buildConfigField "String", "WEB_SERVICE_APP_ID", "\"Tdf793i4ughsiduf8749509237885ehgfdlkghlT\"" } diff --git a/Software/Android_Studio/ColorCapture/app/src/main/AndroidManifest.xml b/Software/Android_Studio/ColorCapture/app/src/main/AndroidManifest.xml index bbea0549e..d21611173 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/AndroidManifest.xml +++ b/Software/Android_Studio/ColorCapture/app/src/main/AndroidManifest.xml @@ -28,7 +28,8 @@ android:theme="@style/AppTheme"> <activity android:name=".views.loading.LoadingActivity" - android:noHistory="true"> + android:noHistory="true" + android:screenOrientation="portrait"> <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -45,8 +46,7 @@ android:host="twine-s.com" /> </intent-filter> </activity> - <activity android:name=".views.main.MainActivity"/> - <activity android:name=".views.sendtoemail.SendToEmailFragment" /> + <activity android:name=".views.main.MainActivity" android:screenOrientation="portrait" /> </application> </manifest>
\ No newline at end of file diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/IMainActivity.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/IMainActivity.java index 0835d4eef..9d1e33fa3 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/IMainActivity.java +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/IMainActivity.java @@ -4,5 +4,5 @@ import com.twine.colorcapture.mvvm.IView; public interface IMainActivity extends IView { - void cloneMenu(); + void closeMenu(); } diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/MainActivity.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/MainActivity.java index 4190175ce..2e6b70c02 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/MainActivity.java +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/main/MainActivity.java @@ -129,7 +129,7 @@ public class MainActivity extends ActivityBase<ActivityMainBinding, MainActivity } @Override - public void cloneMenu() + public void closeMenu() { drawerLayout.closeDrawer(Gravity.START); } 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 23f3e3868..c7c8eb7a1 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 @@ -2,8 +2,6 @@ package com.twine.colorcapture.views.main; import com.squareup.otto.Bus; import com.twine.colorcapture.dialogs.welcome.WelcomeDialog; -import com.twine.colorcapture.integration.ExternalBridgeScanner; -import com.twine.colorcapture.mvvm.DependencyProperty; import com.twine.colorcapture.mvvm.RelayCommand; import com.twine.colorcapture.mvvm.ViewModelBase; import com.twine.colorcapture.navigation.INavigationProvider; @@ -82,7 +80,7 @@ public class MainActivityVM extends ViewModelBase<IMainActivity> private void handleHowToUseCommand() { - view.cloneMenu(); + view.closeMenu(); notificationProvider.showDialog(new WelcomeDialog(), (vm) -> { }); } diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/about.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/about.png Binary files differnew file mode 100644 index 000000000..d5701a483 --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/about.png diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/darkening.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/darkening.png Binary files differnew file mode 100644 index 000000000..f50441f22 --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/darkening.png diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/delete_thin.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/delete_thin.png Binary files differnew file mode 100644 index 000000000..b6b951c0a --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/delete_thin.png diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/down.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/down.png Binary files differnew file mode 100644 index 000000000..b1e67433d --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/down.png diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/email.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/email.png Binary files differnew file mode 100644 index 000000000..341d122a6 --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/email.png diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/error.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/error.png Binary files differnew file mode 100644 index 000000000..41fa3df55 --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/error.png diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/got_it.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/got_it.png Binary files differnew file mode 100644 index 000000000..46e9288d6 --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/got_it.png diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/how_to.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/how_to.png Binary files differnew file mode 100644 index 000000000..fbeb31818 --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/how_to.png diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/icon.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/icon.png Binary files differnew file mode 100644 index 000000000..40e46cd1f --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/icon.png diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/icon_twine_card.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/icon_twine_card.png Binary files differnew file mode 100644 index 000000000..48e6595fa --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/icon_twine_card.png diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/icons_arrow_up.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/icons_arrow_up.png Binary files differnew file mode 100644 index 000000000..dc4d23f98 --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/icons_arrow_up.png diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/icons_close.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/icons_close.png Binary files differnew file mode 100644 index 000000000..f4e9e1c50 --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/icons_close.png diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/icons_delete.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/icons_delete.png Binary files differnew file mode 100644 index 000000000..55753d24a --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/icons_delete.png diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/icons_rename.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/icons_rename.png Binary files differnew file mode 100644 index 000000000..070a2f6e7 --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/icons_rename.png diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/info.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/info.png Binary files differnew file mode 100644 index 000000000..3e33de5a6 --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/info.png diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/logo.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/logo.png Binary files differnew file mode 100644 index 000000000..f6b3bf9be --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/logo.png diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/more_normal.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/more_normal.png Binary files differnew file mode 100644 index 000000000..a540c41be --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/more_normal.png diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/more_selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/more_selected.png Binary files differnew file mode 100644 index 000000000..60494cce8 --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/more_selected.png diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/my_colors.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/my_colors.png Binary files differnew file mode 100644 index 000000000..2eae175fd --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/my_colors.png diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/selected.png Binary files differnew file mode 100644 index 000000000..e1aa19889 --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/selected.png diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/snapmatch.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/snapmatch.png Binary files differnew file mode 100644 index 000000000..994d77ffe --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/snapmatch.png diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/success.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/success.png Binary files differnew file mode 100644 index 000000000..50819ef94 --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/success.png diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/twine_card.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/twine_card.png Binary files differnew file mode 100644 index 000000000..4eb5dc787 --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/twine_card.png diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/twine_card_icon.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/twine_card_icon.png Binary files differnew file mode 100644 index 000000000..ff3f1c99c --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/twine_card_icon.png diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/twine_logo.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/twine_logo.png Binary files differnew file mode 100644 index 000000000..9009dd34a --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/twine_logo.png diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/twinesnap_normal.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/twinesnap_normal.png Binary files differnew file mode 100644 index 000000000..bf6509ea2 --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/twinesnap_normal.png diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/twinesnap_selected.png b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/twinesnap_selected.png Binary files differnew file mode 100644 index 000000000..f71ff6ea5 --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/drawable-sw600dp-mdpi/twinesnap_selected.png diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/activity_loading.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/activity_loading.xml index 4e6183a4a..4adc4b6a2 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/activity_loading.xml +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/activity_loading.xml @@ -58,8 +58,8 @@ android:layout_marginTop="30dp" android:layout_below="@id/imageView2" android:layout_centerInParent="true" - android:layout_width="80dp" - android:layout_height="80dp" + android:layout_width="@dimen/progress_size" + android:layout_height="@dimen/progress_size" android:indeterminate="true" android:indeterminateDuration="500" android:indeterminateDrawable="@drawable/progress_ring_background"/> diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/activity_main.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/activity_main.xml index 7c55188cc..9830c53db 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/activity_main.xml +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/activity_main.xml @@ -37,8 +37,8 @@ <ImageButton android:id="@+id/btnMenu" - android:layout_width="68dp" - android:layout_height="65dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_alignParentStart="true" android:layout_centerVertical="true" android:layout_marginLeft="20dp" @@ -52,8 +52,8 @@ <ImageButton android:id="@+id/imageButton2" - android:layout_width="72dp" - android:layout_height="65dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_alignParentStart="true" android:layout_centerVertical="true" android:background="@drawable/button_transparent_fill_ripple" @@ -67,8 +67,8 @@ <ImageButton android:id="@+id/imageButton3" - android:layout_width="68dp" - android:layout_height="65dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_marginRight="20dp" android:layout_alignParentStart="true" android:layout_centerVertical="true" diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/circle_action_button.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/circle_action_button.xml index 0f34acc8f..30f2a57b6 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/circle_action_button.xml +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/circle_action_button.xml @@ -36,8 +36,8 @@ <com.github.florent37.shapeofview.shapes.RoundRectView android:id="@+id/actionButtonCircle" - android:layout_width="39dp" - android:layout_height="39dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" bind:shape_roundRect_borderColor="#ffffff" bind:shape_roundRect_borderWidth="0dp" bind:shape_roundRect_bottomLeftRadius="40dp" @@ -49,13 +49,14 @@ <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent" + android:padding="5dp" android:background="@drawable/button_gradient_fill"> <ImageView android:id="@+id/circleActionButtonImageView" - android:layout_width="33dp" - android:layout_height="28dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginTop="2dp" android:src="@drawable/email" /> 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 9be44f3da..139ddc5b3 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 @@ -34,8 +34,8 @@ <com.github.florent37.shapeofview.shapes.RoundRectView android:id="@+id/resultRect" - android:layout_width="67dp" - android:layout_height="67dp" + android:layout_width="@dimen/result_color_size" + android:layout_height="@dimen/result_color_size" bind:shape_roundRect_borderColor="@android:color/black" bind:shape_roundRect_borderWidth="0dp" bind:shape_roundRect_bottomLeftRadius="5dp" @@ -66,7 +66,7 @@ android:fontFamily="@font/flexo_medium" android:letterSpacing="0.07" android:text="@{result.result.name}" - android:textSize="15.4sp" + android:textSize="@dimen/medium_font_size" tools:text="Nike 100" /> @@ -83,7 +83,7 @@ android:fontFamily="@font/flexo_light" android:letterSpacing="0.07" android:text="RGB:" - android:textSize="15.4sp" /> + android:textSize="@dimen/medium_font_size" /> <android.support.v7.widget.AppCompatTextView android:layout_width="match_parent" @@ -94,7 +94,7 @@ android:layout_marginLeft="5dp" android:text="@{result.result.detectionResponse.getProcessedColor().toString()}" tools:text="200, 100, 0" - android:textSize="15.4sp" /> + android:textSize="@dimen/medium_font_size" /> </LinearLayout> </LinearLayout> </LinearLayout> @@ -110,8 +110,8 @@ </LinearLayout> <FrameLayout - android:layout_width="40dp" - android:layout_height="40dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_gravity="right|center" android:layout_marginRight="10dp" android:layout_marginBottom="10dp"> diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_confirm.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_confirm.xml index 1bad9d630..267b16249 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_confirm.xml +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_confirm.xml @@ -15,8 +15,8 @@ android:background="@color/colorBlueMask"> <RelativeLayout - android:layout_width="313.9dp" - android:layout_height="202.6dp" + android:layout_width="@dimen/dialog_width" + android:layout_height="@dimen/dialog_height" android:layout_centerVertical="true" android:layout_centerHorizontal="true" android:elevation="10dp" @@ -50,7 +50,7 @@ android:fontFamily="@font/flexo_bold" android:gravity="center" android:letterSpacing="0.07" - android:textSize="13.4sp" + android:textSize="@dimen/small_font_size" tools:text="Error title" android:text="@{vm.title}" /> @@ -64,7 +64,7 @@ android:fontFamily="@font/flexo_light" android:gravity="center" android:letterSpacing="0.07" - android:textSize="13.4sp" + android:textSize="@dimen/small_font_size" tools:text="Success message" android:text="@{vm.message}"/> @@ -78,7 +78,7 @@ bind:text="@{vm.confirmText}" bind:command="@{vm.confirmCommand}" tools:text="Delete" - bind:textSize="15.3sp" + bind:textSize="@dimen/medium_font_size" bind:src="@drawable/icons_delete" android:clickable="true" /> diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_error.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_error.xml index eee19cd3b..4e172c584 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_error.xml +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_error.xml @@ -15,8 +15,8 @@ android:background="@color/colorBlueMask"> <RelativeLayout - android:layout_width="313.9dp" - android:layout_height="202.6dp" + android:layout_width="@dimen/dialog_width" + android:layout_height="@dimen/dialog_height" android:layout_centerVertical="true" android:layout_centerHorizontal="true" android:background="@drawable/border_primary_background"> @@ -48,15 +48,15 @@ android:fontFamily="@font/flexo_bold" android:gravity="center" android:letterSpacing="0.07" - android:textSize="13.4sp" + android:textSize="@dimen/small_font_size" tools:text="Error title" android:text="@{vm.title}" /> <ImageView android:id="@+id/progress" - android:layout_width="51dp" - android:layout_height="70dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_marginTop="10dp" android:layout_below="@id/txtTitle" android:layout_centerHorizontal="true" @@ -72,7 +72,7 @@ android:fontFamily="@font/flexo_light" android:gravity="center" android:letterSpacing="0.07" - android:textSize="13.4sp" + android:textSize="@dimen/small_font_size" tools:text="Success message" android:text="@{vm.message}"/> diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_processing.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_processing.xml index 2d891b99b..d2218a018 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_processing.xml +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_processing.xml @@ -17,8 +17,8 @@ <ProgressBar android:id="@+id/progress" android:layout_centerInParent="true" - android:layout_width="80dp" - android:layout_height="80dp" + android:layout_width="@dimen/progress_size" + android:layout_height="@dimen/progress_size" android:indeterminate="true" android:indeterminateDuration="500" android:indeterminateDrawable="@drawable/progress_ring_background"/> @@ -31,7 +31,7 @@ android:layout_height="wrap_content" android:layout_marginTop="20dp" android:gravity="center" - android:textSize="13.4sp" + android:textSize="@dimen/small_font_size" android:letterSpacing="0.07" android:fontFamily="@font/flexo_medium" android:text="@string/processing_message"/> diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_progress.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_progress.xml index 34fe35210..b0cd8215a 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_progress.xml +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_progress.xml @@ -15,8 +15,8 @@ android:background="@color/colorBlueMask"> <RelativeLayout - android:layout_width="313.9dp" - android:layout_height="202.6dp" + android:layout_width="@dimen/dialog_width" + android:layout_height="@dimen/dialog_height" android:layout_centerVertical="true" android:layout_centerHorizontal="true" android:background="@drawable/border_primary_background"> @@ -30,14 +30,14 @@ android:fontFamily="@font/flexo_bold" android:gravity="center" android:letterSpacing="0.07" - android:textSize="13.4sp" + android:textSize="@dimen/small_font_size" tools:text="Progress title" android:text="@{vm.title}" /> <ProgressBar android:id="@+id/progress" - android:layout_width="80dp" - android:layout_height="80dp" + android:layout_width="@dimen/progress_size" + android:layout_height="@dimen/progress_size" android:layout_below="@id/txtTitle" android:layout_centerHorizontal="true" android:layout_marginTop="10dp" @@ -55,7 +55,7 @@ android:fontFamily="@font/flexo_light" android:gravity="center" android:letterSpacing="0.07" - android:textSize="13.4sp" + android:textSize="@dimen/small_font_size" tools:text="Progress message please wait..." android:text="@{vm.message}"/> diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_success.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_success.xml index aa4fb6639..8e6bfb3fc 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_success.xml +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_success.xml @@ -15,8 +15,8 @@ android:background="@color/colorBlueMask"> <RelativeLayout - android:layout_width="313.9dp" - android:layout_height="202.6dp" + android:layout_width="@dimen/dialog_width" + android:layout_height="@dimen/dialog_height" android:layout_centerVertical="true" android:layout_centerHorizontal="true" android:background="@drawable/border_primary_background"> @@ -48,15 +48,15 @@ android:fontFamily="@font/flexo_bold" android:gravity="center" android:letterSpacing="0.07" - android:textSize="13.4sp" + android:textSize="@dimen/small_font_size" tools:text="Success Title" android:text="@{vm.title}" /> <ImageView android:id="@+id/progress" - android:layout_width="51dp" - android:layout_height="70dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_marginTop="10dp" android:layout_below="@id/txtTitle" android:layout_centerHorizontal="true" @@ -72,7 +72,7 @@ android:fontFamily="@font/flexo_light" android:gravity="center" android:letterSpacing="0.07" - android:textSize="13.4sp" + android:textSize="@dimen/small_font_size" tools:text="Success message" android:text="@{vm.message}"/> diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_welcome.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_welcome.xml index bcc964288..44bc25f51 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_welcome.xml +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/dialog_welcome.xml @@ -27,7 +27,8 @@ android:layout_marginLeft="30dp" android:layout_marginRight="30dp" android:layout_marginTop="50dp" - android:layout_marginBottom="100dp"> + android:layout_marginBottom="100dp" + > @@ -38,7 +39,7 @@ android:layout_height="wrap_content" android:layout_centerHorizontal="true" android:layout_margin="30dp" - android:textSize="17.3sp" + android:textSize="@dimen/large_font_size" android:textStyle="bold" android:fontFamily="@font/flexo_bold" android:text="@string/welcome_title" /> @@ -62,7 +63,7 @@ android:layout_marginTop="20dp" android:layout_marginEnd="20dp" android:gravity="center" - android:textSize="15.4sp" + android:textSize="@dimen/medium_font_size" android:letterSpacing="0.08" android:lineSpacingExtra="7.7sp" android:fontFamily="@font/flexo_regular" @@ -75,14 +76,16 @@ <android.support.v7.widget.AppCompatButton android:id="@+id/button" android:layout_width="wrap_content" - android:layout_height="55dp" + android:layout_height="wrap_content" android:layout_alignBottom="@+id/frameLayout" android:layout_centerHorizontal="true" android:layout_marginBottom="-30dp" android:background="@drawable/button_gradient_fill_ripple" android:paddingStart="70dp" android:paddingEnd="70dp" - android:textSize="15.4sp" + android:paddingTop="15dp" + android:paddingBottom="15dp" + android:textSize="@dimen/medium_font_size" android:letterSpacing="0.07" android:textStyle="bold" android:text="@string/welcome_go_button" @@ -97,7 +100,7 @@ android:layout_below="@+id/button" android:layout_centerHorizontal="true" android:layout_marginTop="50dp" - android:textSize="15.4sp" + android:textSize="@dimen/medium_font_size" android:textColor="#ffffff" android:fontFamily="@font/flexo_bold" android:letterSpacing="0.09" diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/external_machine_item.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/external_machine_item.xml index 585829bcb..7d90e715d 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/external_machine_item.xml +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/external_machine_item.xml @@ -18,9 +18,10 @@ <ImageView android:id="@+id/imageView2" - android:layout_width="60dp" - android:layout_height="60dp" - android:scaleType="fitCenter" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:scaleType="fitStart" + android:layout_gravity="center" android:layout_marginRight="10dp" android:src="@drawable/icon" /> @@ -34,7 +35,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@{machine.serialNumber}" - android:textSize="18sp" + android:textSize="@dimen/large_font_size" tools:text="Serial Number" /> <TextView @@ -42,6 +43,7 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:text="@{machine.ipAddress}" + android:textSize="@dimen/small_font_size" tools:text="IP Address" /> </LinearLayout> </LinearLayout> diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_capture.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_capture.xml index a4c4affc8..23de66c2d 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_capture.xml +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_capture.xml @@ -117,14 +117,14 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center" - android:textSize="13.4sp" + android:textSize="@dimen/small_font_size" android:fontFamily="@font/flexo_medium" android:text="@string/twine_snap_message" android:visibility="@{vm.isCardDetected ? View.GONE : View.VISIBLE}"/> <ImageView - android:layout_width="51dp" - android:layout_height="70dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_gravity="center" android:src="@drawable/got_it" android:visibility="@{vm.isCardDetected ? View.VISIBLE : View.GONE}"/> diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_mycolors.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_mycolors.xml index 1fdcb2710..40b223a4e 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_mycolors.xml +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_mycolors.xml @@ -28,7 +28,7 @@ android:fontFamily="@font/flexo_bold" android:letterSpacing="0.07" android:text="My colors" - android:textSize="17.3sp" /> + android:textSize="@dimen/large_font_size" /> <ListView android:id="@+id/listResults" diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_register.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_register.xml index 51e174e29..b293c83eb 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_register.xml +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_register.xml @@ -32,7 +32,7 @@ android:letterSpacing="0.07" android:layout_gravity="left|center" android:text="Register your system" - android:textSize="17.3sp" /> + android:textSize="@dimen/large_font_size" /> <android.support.v7.widget.AppCompatButton @@ -41,7 +41,7 @@ android:layout_gravity="right" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="17.3sp" + android:textSize="@dimen/large_font_size" android:letterSpacing="0.07" android:textStyle="bold" android:text="Done" @@ -63,7 +63,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/flexo_light" android:letterSpacing="0.07" - android:textSize="13.4sp" + android:textSize="@dimen/small_font_size" android:text="Machine Serial Number:" /> <android.support.v7.widget.AppCompatEditText @@ -72,7 +72,7 @@ android:layout_marginTop="5dp" android:fontFamily="@font/flexo_light" android:letterSpacing="0.07" - android:textSize="15.4sp" + android:textSize="@dimen/medium_font_size" android:textDirection="ltr" android:inputType="textCapCharacters" android:text="@={vm.serialNumber}"/> diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_rename.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_rename.xml index fb95f1c14..341227a22 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_rename.xml +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_rename.xml @@ -32,7 +32,7 @@ android:letterSpacing="0.07" android:layout_gravity="left|center" android:text="Rename my color" - android:textSize="17.3sp" /> + android:textSize="@dimen/large_font_size" /> <android.support.v7.widget.AppCompatButton @@ -41,7 +41,7 @@ android:layout_gravity="right" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="17.3sp" + android:textSize="@dimen/large_font_size" android:letterSpacing="0.07" android:textStyle="bold" android:text="Done" @@ -63,7 +63,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/flexo_light" android:letterSpacing="0.07" - android:textSize="13.4sp" + android:textSize="@dimen/small_font_size" android:text="Name this color as:" /> <android.support.v7.widget.AppCompatEditText @@ -73,7 +73,7 @@ android:layout_marginTop="5dp" android:fontFamily="@font/flexo_light" android:letterSpacing="0.07" - android:textSize="15.4sp" + android:textSize="@dimen/medium_font_size" android:textDirection="ltr" android:text="@={vm.name}"/> 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 8ca28f881..a0716cb13 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 @@ -12,119 +12,41 @@ </data> <RelativeLayout - android:id="@+id/result_main_container" android:layout_width="match_parent" android:layout_height="match_parent" + android:gravity="center" android:background="@color/colorDarkBackground" - android:layoutDirection="ltr" - android:paddingLeft="20dp" - android:paddingRight="20dp" - tools:context="com.twine.colorcapture.views.result.ResultFragment"> + android:layoutDirection="ltr"> - <android.support.v7.widget.AppCompatTextView - android:id="@+id/txtTitle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_marginTop="15dp" - android:fontFamily="@font/flexo_bold" - android:gravity="center" - android:letterSpacing="0.07" - android:text="@{vm.colorResult.name}" - android:textSize="17.3sp" /> - - <com.github.florent37.shapeofview.shapes.RoundRectView - android:id="@+id/resultRect" - android:layout_width="match_parent" - android:layout_height="84.5dp" - android:layout_below="@id/txtTitle" - android:layout_marginTop="15dp" - android:elevation="4dp" - bind:shape_roundRect_borderColor="@android:color/black" - bind:shape_roundRect_borderWidth="0dp" - bind:shape_roundRect_bottomLeftRadius="5dp" - bind:shape_roundRect_bottomRightRadius="5dp" - bind:shape_roundRect_topLeftRadius="5dp" - bind:shape_roundRect_topRightRadius="5dp"> - - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@{vm.detectionResponse.getProcessedColor().getColor()}"/> - - </com.github.florent37.shapeofview.shapes.RoundRectView> - - <LinearLayout - android:id="@+id/rgbContainer" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_below="@id/resultRect" - android:layout_marginTop="15dp" - android:orientation="horizontal"> - - <android.support.v7.widget.AppCompatTextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:fontFamily="@font/flexo_bold" - android:letterSpacing="0.11" - android:text="RGB:" - android:textSize="17.4sp" /> + <RelativeLayout + android:id="@+id/result_main_container" + android:layout_width="@dimen/result_button_width" + android:layout_height="match_parent" + android:background="@color/colorDarkBackground" + android:layoutDirection="ltr" + android:paddingLeft="20dp" + android:paddingRight="20dp" + tools:context="com.twine.colorcapture.views.result.ResultFragment"> <android.support.v7.widget.AppCompatTextView + android:id="@+id/txtTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="5dp" + android:layout_centerHorizontal="true" + android:layout_marginTop="15dp" android:fontFamily="@font/flexo_bold" - android:letterSpacing="0.11" - android:text="@{vm.detectionResponse.getProcessedColor().toString()}" - android:textSize="17.4sp" /> - </LinearLayout> - - <FrameLayout - android:id="@+id/frameToggleBtn" - android:layout_width="match_parent" - android:layout_height="25dp" - android:layout_below="@id/rgbContainer" - android:layout_marginTop="15dp"> - - <android.support.v7.widget.AppCompatTextView - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:fontFamily="@font/flexo_light" + android:gravity="center" android:letterSpacing="0.07" - android:text="See how your camera got this" - android:textSize="15.4sp" /> - - <ImageView - android:layout_width="17dp" - android:layout_height="10dp" - android:layout_gravity="right" - android:layout_marginTop="5dp" - android:src="@{vm.isCameraColorToggled ? @drawable/icons_arrow_up : @drawable/down}" /> - - <Button - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@drawable/button_transparent_fill_ripple" - android:minHeight="0dp" - android:padding="0dp" - bind:command="@{vm.toggleCameraColorCommand}" /> - </FrameLayout> - - <FrameLayout - android:id="@+id/frameCameraRgbContainer" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_below="@id/frameToggleBtn" - android:layout_marginTop="5dp" - android:layout_marginBottom="10dp" - android:visibility="@{vm.isCameraColorToggled ? View.VISIBLE : View.GONE}"> + android:text="@{vm.colorResult.name}" + android:textSize="17.3sp" /> <com.github.florent37.shapeofview.shapes.RoundRectView - android:layout_width="67.2dp" - android:layout_height="59.5dp" + android:id="@+id/resultRect" + android:layout_width="match_parent" + android:layout_height="84.5dp" android:layout_below="@id/txtTitle" + android:layout_marginTop="15dp" + android:elevation="4dp" bind:shape_roundRect_borderColor="@android:color/black" bind:shape_roundRect_borderWidth="0dp" bind:shape_roundRect_bottomLeftRadius="5dp" @@ -136,113 +58,201 @@ <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@{vm.detectionResponse.getRawColor().getColor()}"/> + android:background="@{vm.detectionResponse.getProcessedColor().getColor()}" /> </com.github.florent37.shapeofview.shapes.RoundRectView> <LinearLayout - android:layout_width="wrap_content" + android:id="@+id/rgbContainer" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="center|center_horizontal" - android:layout_marginLeft="20dp" + android:layout_below="@id/resultRect" + android:layout_marginTop="15dp" android:orientation="horizontal"> <android.support.v7.widget.AppCompatTextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/flexo_light" + android:fontFamily="@font/flexo_bold" android:letterSpacing="0.11" android:text="RGB:" - android:textSize="15.4sp" /> + android:textSize="@dimen/large_font_size" /> <android.support.v7.widget.AppCompatTextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5dp" - android:fontFamily="@font/flexo_light" + android:fontFamily="@font/flexo_bold" android:letterSpacing="0.11" - android:text="@{vm.detectionResponse.getRawColor().toString()}" - android:textSize="15.4sp" /> + android:text="@{vm.detectionResponse.getProcessedColor().toString()}" + android:textSize="@dimen/large_font_size" /> </LinearLayout> - </FrameLayout> + <FrameLayout + android:id="@+id/frameToggleBtn" + android:layout_width="match_parent" + android:layout_height="25dp" + android:layout_below="@id/rgbContainer" + android:layout_marginTop="15dp"> - <FrameLayout - android:layout_width="match_parent" - android:layout_height="2dp" - android:layout_below="@id/frameCameraRgbContainer" - android:background="@drawable/button_gradient_fill"></FrameLayout> + <android.support.v7.widget.AppCompatTextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:fontFamily="@font/flexo_light" + android:letterSpacing="0.07" + android:text="See how your camera got this" + android:textSize="@dimen/medium_font_size" /> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:layout_marginTop="5dp" + android:src="@{vm.isCameraColorToggled ? @drawable/icons_arrow_up : @drawable/down}" /> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:orientation="vertical" - android:paddingBottom="20dp" - android:paddingLeft="40dp" - android:paddingRight="40dp"> + <Button + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@drawable/button_transparent_fill_ripple" + android:minHeight="0dp" + android:padding="0dp" + bind:command="@{vm.toggleCameraColorCommand}" /> + </FrameLayout> - <com.twine.colorcapture.controls.CircleActionButton + <FrameLayout + android:id="@+id/frameCameraRgbContainer" android:layout_width="match_parent" android:layout_height="wrap_content" - bind:src="@drawable/email" - bind:text="Email" - android:clickable="true" - bind:command="@{vm.emailCommand}"/> + android:layout_below="@id/frameToggleBtn" + android:layout_marginTop="5dp" + android:layout_marginBottom="10dp" + android:visibility="@{vm.isCameraColorToggled ? View.VISIBLE : View.GONE}"> - <com.twine.colorcapture.controls.CircleActionButton - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="15dp" - bind:src="@drawable/icons_rename" - bind:text="Rename" - android:clickable="true" - bind:command="@{vm.renameCommand}"/> + <com.github.florent37.shapeofview.shapes.RoundRectView + android:layout_width="@dimen/result_color_size" + android:layout_height="@dimen/result_color_size" + android:layout_below="@id/txtTitle" + bind:shape_roundRect_borderColor="@android:color/black" + bind:shape_roundRect_borderWidth="0dp" + bind:shape_roundRect_bottomLeftRadius="5dp" + bind:shape_roundRect_bottomRightRadius="5dp" + bind:shape_roundRect_topLeftRadius="5dp" + bind:shape_roundRect_topRightRadius="5dp"> - <com.twine.colorcapture.controls.CircleActionButton - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="15dp" - bind:src="@drawable/icon" - bind:text=" Send to Machine" - android:clickable="true" - bind:command="@{vm.sendToMachineCommand}" - android:visibility="@{vm.isMachineRegistred ? View.VISIBLE : View.GONE}"/> + + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@{vm.detectionResponse.getRawColor().getColor()}" /> + + </com.github.florent37.shapeofview.shapes.RoundRectView> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center|center_horizontal" + android:layout_marginLeft="20dp" + android:orientation="horizontal"> + + <android.support.v7.widget.AppCompatTextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:fontFamily="@font/flexo_light" + android:letterSpacing="0.11" + android:text="RGB:" + android:textSize="@dimen/medium_font_size" /> + + <android.support.v7.widget.AppCompatTextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="5dp" + android:fontFamily="@font/flexo_light" + android:letterSpacing="0.11" + android:text="@{vm.detectionResponse.getRawColor().toString()}" + android:textSize="@dimen/medium_font_size" /> + </LinearLayout> + + </FrameLayout> <FrameLayout - android:layout_marginLeft="5dp" - android:layout_marginRight="5dp" + android:layout_width="match_parent" + android:layout_height="2dp" + android:layout_below="@id/frameCameraRgbContainer" + android:background="@drawable/button_gradient_fill"></FrameLayout> + + + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="15dp" - android:visibility="@{vm.isMachineRegistred ? View.GONE : View.VISIBLE}"> + android:layout_alignParentBottom="true" + android:orientation="vertical" + android:paddingLeft="40dp" + android:paddingRight="40dp" + android:paddingBottom="20dp"> - <android.support.v7.widget.AppCompatTextView - android:layout_width="wrap_content" + <com.twine.colorcapture.controls.CircleActionButton + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="right|center" - android:fontFamily="@font/flexo_bold" - android:letterSpacing="0.07" - android:textSize="15.4sp" - android:text="@string/have_a_twine_system"/> + android:clickable="true" + bind:command="@{vm.emailCommand}" + bind:src="@drawable/email" + bind:text="Email" + bind:textSize="@dimen/medium_font_size" /> - <ImageView - android:layout_width="40dp" - android:layout_height="32dp" - android:layout_gravity="left" - android:src="@drawable/icon" /> + <com.twine.colorcapture.controls.CircleActionButton + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="15dp" + android:clickable="true" + bind:command="@{vm.renameCommand}" + bind:src="@drawable/icons_rename" + bind:text="Rename" + bind:textSize="@dimen/medium_font_size" /> - <Button + <com.twine.colorcapture.controls.CircleActionButton android:layout_width="match_parent" - android:layout_height="30dp" - android:background="@drawable/button_transparent_fill_ripple" - android:minHeight="0dp" - android:padding="0dp" - bind:command="@{vm.registerMachineCommand}" /> + android:layout_height="wrap_content" + android:layout_marginTop="15dp" + android:clickable="true" + android:visibility="@{vm.isMachineRegistred ? View.VISIBLE : View.GONE}" + bind:command="@{vm.sendToMachineCommand}" + bind:src="@drawable/icon" + bind:text=" Send to Machine" + bind:textSize="@dimen/medium_font_size" /> - </FrameLayout> - </LinearLayout> + <FrameLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="5dp" + android:layout_marginTop="15dp" + android:layout_marginRight="5dp" + android:visibility="@{vm.isMachineRegistred ? View.GONE : View.VISIBLE}"> + + <android.support.v7.widget.AppCompatTextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right|center" + android:fontFamily="@font/flexo_bold" + android:letterSpacing="0.07" + android:text="@string/have_a_twine_system" + android:textSize="@dimen/medium_font_size" /> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left|center" + android:src="@drawable/icon" /> + + <Button + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@drawable/button_transparent_fill_ripple" + android:padding="0dp" + bind:command="@{vm.registerMachineCommand}" /> + + </FrameLayout> + </LinearLayout> + </RelativeLayout> </RelativeLayout> </layout> diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_send_to_email.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_send_to_email.xml index f1c00d44e..f54d9139d 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_send_to_email.xml +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_send_to_email.xml @@ -32,7 +32,7 @@ android:fontFamily="@font/flexo_bold" android:letterSpacing="0.07" android:text="Send To Email" - android:textSize="17.3sp" /> + android:textSize="@dimen/large_font_size" /> <android.support.v7.widget.AppCompatButton android:id="@+id/btnDone" @@ -45,7 +45,7 @@ android:letterSpacing="0.07" android:text="Send" android:textAllCaps="false" - android:textSize="17.3sp" + android:textSize="@dimen/large_font_size" android:textStyle="bold" bind:command="@{vm.sendCommand}" /> @@ -77,11 +77,11 @@ android:letterSpacing="0.07" android:text="Your color is attached" android:textColor="@color/colorPrimaryBackground" - android:textSize="15.4sp" /> + android:textSize="@dimen/medium_font_size" /> <com.github.florent37.shapeofview.shapes.RoundRectView - android:layout_width="80dp" - android:layout_height="80dp" + android:layout_width="@dimen/result_color_size" + android:layout_height="@dimen/result_color_size" android:layout_margin="20dp" bind:shape_roundRect_borderColor="@android:color/black" bind:shape_roundRect_borderWidth="0dp" @@ -142,7 +142,7 @@ android:textDirection="ltr" android:completionThreshold="1" android:theme="@style/Autocomplete" - android:textSize="15.4sp"/> + android:textSize="@dimen/medium_font_size"/> </android.support.design.widget.TextInputLayout> @@ -165,7 +165,7 @@ android:textColor="@color/colorPrimaryBackground" android:textColorHint="@color/text_gray" android:textDirection="ltr" - android:textSize="15.4sp" /> + android:textSize="@dimen/medium_font_size" /> </LinearLayout> </ScrollView> diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_send_to_machine.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_send_to_machine.xml index 6881b50ff..f336c0ba1 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_send_to_machine.xml +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/layout/fragment_send_to_machine.xml @@ -28,7 +28,7 @@ android:fontFamily="@font/flexo_bold" android:letterSpacing="0.07" android:text="Send To Machine" - android:textSize="17.3sp" /> + android:textSize="@dimen/large_font_size" /> <android.support.v7.widget.AppCompatTextView android:id="@+id/txtScanning" @@ -41,7 +41,7 @@ android:fontFamily="@font/flexo_light" android:letterSpacing="0.07" android:text="Scanning your local network..." - android:textSize="15.3sp" /> + android:textSize="@dimen/medium_font_size" /> <ProgressBar android:layout_below="@id/txtScanning" 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 aa20bd3ef..3ee18a1b7 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 @@ -30,7 +30,7 @@ android:fontFamily="@font/flexo_bold" android:letterSpacing="0.07" android:text="@string/app_name" - android:textSize="17.3sp" /> + android:textSize="@dimen/large_font_size" /> <FrameLayout @@ -61,7 +61,7 @@ android:fontFamily="@font/flexo_medium" android:letterSpacing="0.06" android:text="About Twine" - android:textSize="15.4sp" /> + android:textSize="@dimen/medium_font_size" /> </LinearLayout> <LinearLayout @@ -106,7 +106,7 @@ android:fontFamily="@font/flexo_medium" android:letterSpacing="0.06" android:text="About SnapMatch" - android:textSize="15.4sp" /> + android:textSize="@dimen/medium_font_size" /> </LinearLayout> <LinearLayout @@ -151,7 +151,7 @@ android:fontFamily="@font/flexo_medium" android:letterSpacing="0.06" android:text="How to use" - android:textSize="15.4sp" /> + android:textSize="@dimen/medium_font_size" /> </LinearLayout> </LinearLayout> @@ -166,14 +166,15 @@ </LinearLayout> <com.twine.colorcapture.controls.CircleActionButton - android:layout_width="match_parent" + android:layout_width="@dimen/result_button_width" + android:layout_centerHorizontal="true" android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" android:layout_marginBottom="60dp" bind:text=" Get a twine TTC™ card" - bind:textSize="15.3sp" + bind:textSize="@dimen/medium_font_size" bind:src="@drawable/icon_twine_card" android:clickable="true" /> </RelativeLayout> diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/values-large/fonts.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/values-large/fonts.xml new file mode 100644 index 000000000..86340b463 --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/values-large/fonts.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <dimen name="large_font_size">30.3sp</dimen> + <dimen name="medium_font_size">27.4sp</dimen> + <dimen name="small_font_size">24.4sp</dimen> +</resources>
\ No newline at end of file diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/values-large/sizes.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/values-large/sizes.xml new file mode 100644 index 000000000..16bc4e434 --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/values-large/sizes.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <dimen name="dialog_width">613.9dp</dimen> + <dimen name="dialog_height">400.6dp</dimen> + <dimen name="progress_size">120dp</dimen> + <dimen name="result_color_size">90dp</dimen> + <dimen name="result_button_width">600dp</dimen> +</resources>
\ No newline at end of file diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/values/fonts.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/values/fonts.xml new file mode 100644 index 000000000..ae78b7eda --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/values/fonts.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <dimen name="large_font_size">17.3sp</dimen> + <dimen name="medium_font_size">15.4sp</dimen> + <dimen name="small_font_size">13.4sp</dimen> +</resources>
\ No newline at end of file diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/values/sizes.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/values/sizes.xml new file mode 100644 index 000000000..825ac5312 --- /dev/null +++ b/Software/Android_Studio/ColorCapture/app/src/main/res/values/sizes.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <dimen name="dialog_width">313.9dp</dimen> + <dimen name="dialog_height">202.6dp</dimen> + <dimen name="progress_size">80dp</dimen> + <dimen name="result_color_size">67dp</dimen> + <dimen name="result_button_width">-1</dimen> +</resources>
\ No newline at end of file |
