diff options
5 files changed, 21 insertions, 5 deletions
diff --git a/Software/Android_Studio/ColorCapture/app/build.gradle b/Software/Android_Studio/ColorCapture/app/build.gradle index b45606e5c..36b02ddef 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.218:45455/api/\"" + buildConfigField "String", "WEB_SERVICE_ADDRESS", "\"http://tcc.twine-srv.com/api/\"" buildConfigField "String", "WEB_SERVICE_APP_ID", "\"Tdf793i4ughsiduf8749509237885ehgfdlkghlT\"" } diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/dagger/ViewModelsModule.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/dagger/ViewModelsModule.java index 7982268c0..468db5da4 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/dagger/ViewModelsModule.java +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/dagger/ViewModelsModule.java @@ -174,8 +174,8 @@ public class ViewModelsModule @Provides @Singleton - public WelcomeDialogVM provideWelcomeDialogVM() + public WelcomeDialogVM provideWelcomeDialogVM(INavigationProvider navigationProvider) { - return new WelcomeDialogVM(); + return new WelcomeDialogVM(navigationProvider); } } diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/dialogs/welcome/WelcomeDialogVM.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/dialogs/welcome/WelcomeDialogVM.java index acfc08e05..42d605854 100644 --- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/dialogs/welcome/WelcomeDialogVM.java +++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/dialogs/welcome/WelcomeDialogVM.java @@ -2,17 +2,24 @@ package com.twine.colorcapture.dialogs.welcome; import com.twine.colorcapture.mvvm.DialogViewModelBase; import com.twine.colorcapture.mvvm.RelayCommand; +import com.twine.colorcapture.navigation.INavigationProvider; +import com.twine.colorcapture.navigation.NavigationFragment; import javax.inject.Inject; public class WelcomeDialogVM extends DialogViewModelBase { + private INavigationProvider navigationProvider; + public RelayCommand startCommand; + public RelayCommand getCardCommand; @Inject - public WelcomeDialogVM() + public WelcomeDialogVM(INavigationProvider navigationProvider) { + this.navigationProvider = navigationProvider; startCommand = new RelayCommand(this::close); + getCardCommand = new RelayCommand(this::handleGetCardCommand); } public String getText() @@ -20,6 +27,12 @@ public class WelcomeDialogVM extends DialogViewModelBase return "Hi Roy"; } + private void handleGetCardCommand() + { + close(); + navigationProvider.navigateTo(NavigationFragment.Card, true, false); + } + @Override protected void onBackPressed() { 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 e9dc5d0b9..81cdf64dc 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 @@ -105,6 +105,9 @@ android:textColor="#ffffff" android:fontFamily="@font/flexo_bold" android:letterSpacing="0.09" + android:clickable="true" + android:focusable="true" + bind:command="@{vm.getCardCommand}" android:text="@string/welcome_have_a_twine_card_message" /> </RelativeLayout> diff --git a/Software/Visual_Studio/TCC/Tango.TCC.Service/Controllers/ColorDetectionController.cs b/Software/Visual_Studio/TCC/Tango.TCC.Service/Controllers/ColorDetectionController.cs index 011b7f3be..ac2bbd8b1 100644 --- a/Software/Visual_Studio/TCC/Tango.TCC.Service/Controllers/ColorDetectionController.cs +++ b/Software/Visual_Studio/TCC/Tango.TCC.Service/Controllers/ColorDetectionController.cs @@ -329,7 +329,7 @@ namespace Tango.TCC.Service.Controllers SendGridMessage msg = new SendGridMessage(); msg.SetFrom("info@twine-s.com", "Twine Solutions LTD"); msg.AddTo(request.Address); - msg.Subject = "Print a twine TTC™ card"; + msg.Subject = "Print a Twine TCC card"; msg.SetTemplateId("d-43b1aa3fe9c140349e3fb0ba2d1afff1"); var dynamicTemplateData = new { |