Updated the About page to included the Privacy Policy and also disabl…

…ed the Precise Mode toggle until it is implemented.
robmonte · Dec 21, 2016 · 730ff47 · 730ff47
1 parent 92fa451
commit 730ff47
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/app/src/main/java/cs371m/chromavision/MainMenuActivity.java b/app/src/main/java/cs371m/chromavision/MainMenuActivity.java
@@ -109,9 +109,9 @@ public boolean onCreateOptionsMenu(Menu menu) {
         mTutorialMenuItem = checkTutorial;
         checkTutorial.setChecked(!showTutorial);
 
-        mPrecise = prefs.getBoolean("PreciseMode", true);
-        MenuItem checkPrecise = menu.findItem(R.id.precise_mode_checkbox);
-        checkPrecise.setChecked(mPrecise);
+//        mPrecise = prefs.getBoolean("PreciseMode", true);
+//        MenuItem checkPrecise = menu.findItem(R.id.precise_mode_checkbox);
+//        checkPrecise.setChecked(mPrecise);
 
         return true;
     }
@@ -128,12 +128,12 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 editor.putBoolean("ViewedWelcome", !showWelcome);
                 editor.apply();
                 return true;
-            case R.id.precise_mode_checkbox:
-                mPrecise = prefs.getBoolean("PreciseMode", true);
-                item.setChecked(!mPrecise);
-                editor.putBoolean("PreciseMode", !mPrecise);
-                editor.apply();
-                return true;
+//            case R.id.precise_mode_checkbox:
+//                mPrecise = prefs.getBoolean("PreciseMode", true);
+//                item.setChecked(!mPrecise);
+//                editor.putBoolean("PreciseMode", !mPrecise);
+//                editor.apply();
+//                return true;
             case R.id.tutorial_button_checkbox:
                 boolean hideTutorial = prefs.getBoolean("ViewedTutorial", false);
                 item.setChecked(hideTutorial);

diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
@@ -28,10 +28,11 @@
         android:layout_height="0dp"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:textSize="20sp"
-        android:text="An app by:\nRobert Montefusco\nTony Sampson\nYajie Niu\n\nFor CS371M Mobile Computing\nat the University of Texas at Austin\n\nAnd for those who need help with colors!\n\n\nSupport email: [email protected]"
+        android:text="Version 1.01\n\nAn app by:\nRobert Montefusco\nTony Sampson\nYajie Niu\n\nFor CS371M Mobile Computing\nat The University of Texas at Austin\n\nAnd for those who need help with colors!\n\n\nSupport email: [email protected] \n\n\nPrivacy policy: https://raw.githubusercontent.com/robmonte/ChromaVision/master/PRIVACY.txt"
         android:layout_weight="0.6"
         android:gravity="center_horizontal"
         android:id="@+id/textView2"
-        android:autoLink="email" />
+        android:autoLink="email|web"
+        android:linksClickable="true" />
 
 </LinearLayout>
diff --git a/app/src/main/res/menu/menu_main_menu.xml b/app/src/main/res/menu/menu_main_menu.xml
@@ -1,8 +1,8 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/precise_mode_checkbox"
-        android:checkable="true"
-        android:orderInCategory="1"
-        android:title="Precise mode" />
+    <!--<item android:id="@+id/precise_mode_checkbox"-->
+        <!--android:checkable="true"-->
+        <!--android:orderInCategory="1"-->
+        <!--android:title="Precise mode" />-->
     <item android:id="@+id/show_welcome_checkbox"
         android:title="Show welcome"
         android:checkable="true"