Updated SnapMatch urls.

5 files changed, 16 insertions, 8 deletions

diff --git a/Software/Android_Studio/ColorCapture/app/build.gradle b/Software/Android_Studio/ColorCapture/app/build.gradle
index 61530ad11..6da2ed87d 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 12
-        versionName "2.2"
+        versionCode 13
+        versionName "2.3"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
@@ -23,7 +23,7 @@ android {
     buildTypes {
 
         debug {
-            buildConfigField "String", "WEB_SERVICE_ADDRESS", "\"http://tcc.twine-srv.com/api/\""
+            buildConfigField "String", "WEB_SERVICE_ADDRESS", "\"http://192.168.1.215:45457/api/\""
             buildConfigField "String", "WEB_SERVICE_APP_ID", "\"Tdf793i4ughsiduf8749509237885ehgfdlkghlT\""
         }
 
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/about/AboutFragmentVM.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/about/AboutFragmentVM.java
index f676709e6..5b5f49355 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/about/AboutFragmentVM.java
+++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/about/AboutFragmentVM.java
@@ -6,6 +6,7 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 
 import com.twine.colorcapture.App;
+import com.twine.colorcapture.R;
 import com.twine.colorcapture.browsing.IBrowserProvider;
 import com.twine.colorcapture.mvvm.DependencyProperty;
 import com.twine.colorcapture.mvvm.RelayCommand;
@@ -31,9 +32,9 @@ public class AboutFragmentVM extends ViewModelBase<IAboutFragment>
         this.navigationProvider = navigationProvider;
         this.browserProvider = browserProvider;
 
-        contactCommand = new RelayCommand(() -> openBrowser("http://twine-s.com/contact/contact-us"));
-        termsOfUseCommand = new RelayCommand(() -> openBrowser("http://twine-s.com/privacy-policy"));
-        privacyPolicyCommand = new RelayCommand(() -> openBrowser("http://twine-s.com/privacy-policy"));
+        contactCommand = new RelayCommand(() -> openBrowser(App.getContext().getResources().getString(R.string.contact_us_url)));
+        termsOfUseCommand = new RelayCommand(() -> openBrowser(App.getContext().getResources().getString(R.string.terms_and_conditions_url)));
+        privacyPolicyCommand = new RelayCommand(() -> openBrowser(App.getContext().getResources().getString(R.string.privacy_policy_url)));
         version = new DependencyProperty<>("");
 
         try
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/card/CardFragmentVM.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/card/CardFragmentVM.java
index cb8a84c58..2d5d8bd82 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/card/CardFragmentVM.java
+++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/card/CardFragmentVM.java
@@ -1,5 +1,7 @@
 package com.twine.colorcapture.views.card;
 
+import com.twine.colorcapture.App;
+import com.twine.colorcapture.R;
 import com.twine.colorcapture.browsing.IBrowserProvider;
 import com.twine.colorcapture.logging.LogManager;
 import com.twine.colorcapture.mvvm.RelayCommand;
@@ -64,7 +66,7 @@ public class CardFragmentVM extends ViewModelBase<ICardFragment>
 
     private void handleOrderCardCommand()
     {
-        openBrowser("http://twine-s.com/contact/contact-us");
+        openBrowser(App.getContext().getResources().getString(R.string.contact_us_url));
     }
 
     private void openBrowser(String url)
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/twine/TwineFragmentVM.java b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/twine/TwineFragmentVM.java
index aea4aca08..a4bba0770 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/twine/TwineFragmentVM.java
+++ b/Software/Android_Studio/ColorCapture/app/src/main/java/com/twine/colorcapture/views/twine/TwineFragmentVM.java
@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.net.Uri;
 
 import com.twine.colorcapture.App;
+import com.twine.colorcapture.R;
 import com.twine.colorcapture.browsing.IBrowserProvider;
 import com.twine.colorcapture.mvvm.RelayCommand;
 import com.twine.colorcapture.mvvm.ViewModelBase;
@@ -23,7 +24,7 @@ public class TwineFragmentVM extends ViewModelBase<ITwineFragment>
     {
         this.navigationProvider = navigationProvider;
         this.browserProvider = browserProvider;
-        contactCommand = new RelayCommand(() -> openBrowser("http://twine-s.com/contact/contact-us"));
+        contactCommand = new RelayCommand(() -> openBrowser(App.getContext().getResources().getString(R.string.contact_us_url)));
     }
 
     private void openBrowser(String url)
diff --git a/Software/Android_Studio/ColorCapture/app/src/main/res/values/strings.xml b/Software/Android_Studio/ColorCapture/app/src/main/res/values/strings.xml
index f187544db..aba5f1c51 100644
--- a/Software/Android_Studio/ColorCapture/app/src/main/res/values/strings.xml
+++ b/Software/Android_Studio/ColorCapture/app/src/main/res/values/strings.xml
@@ -33,4 +33,8 @@
     <string name="order_card_home">
         <![CDATA[Want to use the application right away? No problem. You can print the card using your office/home color printer.]]>
     </string>
+
+    <string name="terms_and_conditions_url">http://twine-s.com/terms-and-conditions/</string>
+    <string name="privacy_policy_url">http://twine-s.com/privacy-policy-mobile-app/</string>
+    <string name="contact_us_url">http://twine-s.com/contact/contact-us</string>
 </resources>