Cleaned up a few tiny things, changed the support email, and added a …

…texture to the about page
robmonte · Sep 19, 2016 · df0cfc5 · df0cfc5
1 parent 2aec28f
commit df0cfc5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,7 +13,7 @@ android {
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }

diff --git a/app/src/main/java/cs371m/chromavision/MainMenuActivity.java b/app/src/main/java/cs371m/chromavision/MainMenuActivity.java
@@ -369,12 +369,12 @@ private Bitmap resizeImageToScreen(Bitmap scale) {
         double screenWidth = dm.widthPixels;
         double screenHeight = dm.heightPixels;
 
-        if (screenWidth >= 1440) {
-            screenWidth = 1080;
-            double bigScreenScale = screenHeight / screenWidth;
-            screenHeight = bigScreenScale * 1080;
-            screenWidth = 1080;
-        }
+//        // Enables strict scaling of images
+//        if (screenWidth >= 720) {
+//            screenWidth = 720;
+//            double bigScreenScale = screenHeight / screenWidth;
+//            screenHeight = bigScreenScale * 720;
+//        }
 
         int width = scale.getWidth();
         int height = scale.getHeight();

diff --git a/app/src/main/java/cs371m/chromavision/ResultActivity.java b/app/src/main/java/cs371m/chromavision/ResultActivity.java
@@ -149,10 +149,19 @@ public boolean onTouch(View view, MotionEvent motionEvent){
             mImageView.setImageURI(pictureUri);
         }
 
+        InputStream cameraInput = null;
+        try {
+            cameraInput = getContentResolver().openInputStream(pictureUri);
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        }
+        Bitmap scale = BitmapFactory.decodeStream(cameraInput);
+
+        System.out.println(scale.getWidth() + " " + scale.getHeight());
+
         mTextView = (TextView)findViewById(R.id.colorDataView);
 
         mRunPicture = new GenerateColorDataAsync();
-        // generateColorData(picture);
         mRunPicture.execute(pictureUri);
 
     }

diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
@@ -2,7 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent"
+    android:background="@drawable/grey_squares_repeating" >
 
     <TextView
         android:layout_width="match_parent"
@@ -27,7 +28,7 @@
         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="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:layout_weight="0.6"
         android:gravity="center_horizontal"
         android:id="@+id/textView2"