moved constants and strings to new library project, added swipe to ch…

…ange picture preview
grubFX · Jun 19, 2015 · 537a771 · 537a771
1 parent c0317f0
commit 537a771
Show file tree

Hide file tree

Showing 24 changed files with 249 additions and 271 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/mobile/build.gradle b/mobile/build.gradle
@@ -21,6 +21,7 @@ android {
 }
 
 dependencies {
+    compile project(':mylibrary')
     compile 'com.google.android.gms:play-services:7.5.0'
     compile 'com.google.android.gms:play-services-ads:7.3.0'
     compile 'com.google.android.support:wearable:+'

diff --git a/mobile/mobile.iml b/mobile/mobile.iml
@@ -71,10 +71,8 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.0.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/mediarouter-v7/22.0.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/22.0.0/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.0.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads/7.5.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-analytics/7.5.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-appindexing/7.5.0/jars" />
@@ -114,16 +112,16 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="appcompat-v7-22.0.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-wallet-7.5.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-cast-7.5.0" level="project" />
     <orderEntry type="library" exported="" name="mediarouter-v7-22.0.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-drive-7.5.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-analytics-7.5.0" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-22.0.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-panorama-7.5.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-appindexing-7.5.0" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-location-7.5.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-ads-7.5.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-safetynet-7.5.0" level="project" />
@@ -132,7 +130,7 @@
     <orderEntry type="library" exported="" name="play-services-gcm-7.5.0" level="project" />
     <orderEntry type="library" exported="" name="wearable-1.2.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-appinvite-7.5.0" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-fitness-7.5.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-nearby-7.5.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-plus-7.5.0" level="project" />
@@ -141,5 +139,6 @@
     <orderEntry type="library" exported="" name="play-services-games-7.5.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-identity-7.5.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-maps-7.5.0" level="project" />
+    <orderEntry type="module" module-name="mylibrary" exported="" />
   </component>
 </module>
diff --git a/mobile/src/main/java/mc/fhooe/at/wearcam/MainActivity.java b/mobile/src/main/java/mc/fhooe/at/wearcam/MainActivity.java
@@ -63,7 +63,6 @@
 public class MainActivity extends Activity implements DataApi.DataListener, GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener, Camera.PreviewCallback, MessageListener, NodeApi.NodeListener, SurfaceHolder.Callback, Camera.PictureCallback, Camera.ShutterCallback, View.OnTouchListener {
     private GoogleApiClient mGoogleApiClient;
     private String TAG = "PhoneTag", path = null;
-    public static final String PHOTO_ALBUM = "wearcam";
     private int currentCameraId = Camera.CameraInfo.CAMERA_FACING_BACK, index, angleRotateMatrix, anglePreview;
     private static final int REQUEST_RESOLVE_ERROR = 1001, IMG_SIZE = 200, QUALITY_IN_PERCENT = 20;
     private Camera cam;
@@ -76,17 +75,14 @@ public class MainActivity extends Activity implements DataApi.DataListener, Goog
     private float mDist;
     private Vector<Node> mNodeList;
     private OrientationEventListener mOrientationEventListener;
+    private Utils utils;
+    private ArrayList<String> imagePaths = new ArrayList<String>();
 
-    //----------------------------------------------------
     // SD card image directory
-
+    public static final String PHOTO_ALBUM = "wearcam";
     // supported file formats
     public static final List<String> FILE_EXTN = Arrays.asList("jpg", "jpeg", "png");
 
-    private Utils utils;
-    private ArrayList<String> imagePaths = new ArrayList<String>();
-
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -111,15 +107,19 @@ protected void onCreate(Bundle savedInstanceState) {
         pictureButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                takePicture();
+                if (!isGalleryModeOn) {
+                    takePicture();
+                }
             }
         });
 
         videoButton = (ImageButton) findViewById(R.id.videoButton);
         videoButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                takeVideo();
+                if (!isGalleryModeOn) {
+                    takeVideo();
+                }
             }
         });
 
@@ -341,7 +341,7 @@ protected void onStart() {
             mGoogleApiClient.connect();
             Log.d(TAG, "connedted, jippieeeeeeee!!!!! ");
         }
-        Uri uri = new Uri.Builder().scheme(PutDataRequest.WEAR_URI_SCHEME).path("/image").build();
+        Uri uri = new Uri.Builder().scheme(PutDataRequest.WEAR_URI_SCHEME).path(MyConstants.PATH_IMAGE).build();
         Wearable.DataApi.deleteDataItems(mGoogleApiClient, uri).setResultCallback(new ResultCallback<DataApi.DeleteDataItemsResult>() {
             @Override
             public void onResult(DataApi.DeleteDataItemsResult deleteDataItemsResult) {
@@ -389,8 +389,6 @@ public void onOrientationChanged(int _rot) {
         if (mOrientationEventListener.canDetectOrientation()) {
             mOrientationEventListener.enable();
         }
-
-
     }
 
     @Override
@@ -464,9 +462,9 @@ public void onPreviewFrame(byte[] data, Camera camera) {
                 }
             }
             if (asset != null) {
-                PutDataMapRequest dataMap = PutDataMapRequest.create("/image");
-                dataMap.getDataMap().putLong("timestamp", System.currentTimeMillis());
-                dataMap.getDataMap().putAsset("img", asset);
+                PutDataMapRequest dataMap = PutDataMapRequest.create(MyConstants.PATH_IMAGE);
+                dataMap.getDataMap().putLong(MyConstants.DATA_ITEM_TIMESTAMP, System.currentTimeMillis());
+                dataMap.getDataMap().putAsset(MyConstants.DATA_ITEM_IMAGE, asset);
                 PutDataRequest request = dataMap.asPutDataRequest();
 
                 PendingResult<DataApi.DataItemResult> pendingResult = Wearable.DataApi
@@ -485,49 +483,49 @@ public void onResult(DataApi.DataItemResult dataItemResult) {
     public void onMessageReceived(MessageEvent messageEvent) {
         final String temp = messageEvent.getPath();
 
-        Log.d("LOG", "received path:  " + temp);
+        Log.d(TAG, "received path:  " + temp);
 
-        if (temp.equals("/cam")) {
+        if (temp.equals(MyConstants.PATH_CAM)) {
             isGalleryModeOn = false;
             changeView();
 
-        } else if (temp.equals("/gallery")) {
+        } else if (temp.equals(MyConstants.PATH_GALLERY)) {
             isGalleryModeOn = true;
             changeView();
             sendStoredImageToPhone(index);
-        } else if (temp.equals("/stop")) {
+        } else if (temp.equals(MyConstants.PATH_STOP)) {
             finish();
-        } else if (temp.equals("/takePic")) {
+        } else if (temp.equals(MyConstants.PATH_TAKE_PIC)) {
             runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
                     takePicture();
                 }
             });
-        } else if (temp.equals("/flash")) {
+        } else if (temp.equals(MyConstants.PATH_FLASH)) {
             runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
                     flashLightAction();
                 }
             });
-        } else if (temp.equals("/changeCam")) {
+        } else if (temp.equals(MyConstants.PATH_CHANGE_CAM)) {
             runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
                     changeCamera();
                 }
             });
-        } else if (temp.equals("/takeVid")) {
+        } else if (temp.equals(MyConstants.PATH_TAKE_VID)) {
             runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
                     takeVideo();
                 }
             });
-        } else if (temp.equals("/nextPic")) {
+        } else if (temp.equals(MyConstants.PATH_NEXT_PIC)) {
             sendStoredImageToPhone((++index) % imagePaths.size());
-        } else if (temp.equals("/prevPic")) {
+        } else if (temp.equals(MyConstants.PATH_PREV_PIC)) {
             sendStoredImageToPhone((--index) % imagePaths.size());
         }
         runOnUiThread(new Runnable() {
@@ -545,9 +543,9 @@ private void sendStoredImageToPhone(int _index) {
         Bitmap bitmap = BitmapFactory.decodeFile(imagePaths.get(_index), options);
         Bitmap resizedBitmap = Bitmap.createScaledBitmap(bitmap, bitmap.getWidth() / 2, bitmap.getHeight() / 2, true);
         Asset asset = createAssetFromBitmap(resizedBitmap);
-        PutDataMapRequest dataMap = PutDataMapRequest.create("/galleryimage");
-        dataMap.getDataMap().putAsset("img", asset);
-        dataMap.getDataMap().putLong("timestamp", System.currentTimeMillis());
+        PutDataMapRequest dataMap = PutDataMapRequest.create(MyConstants.PATH_GALLERY_IMAGE);
+        dataMap.getDataMap().putAsset(MyConstants.DATA_ITEM_IMAGE, asset);
+        dataMap.getDataMap().putLong(MyConstants.DATA_ITEM_TIMESTAMP, System.currentTimeMillis());
         PutDataRequest request = dataMap.asPutDataRequest();
 
         PendingResult<DataApi.DataItemResult> pendingResult = Wearable.DataApi
@@ -684,7 +682,9 @@ private void handleZoom(MotionEvent event, Camera.Parameters params) {
         }
         mDist = newDist;
         params.setZoom(zoom);
-        cam.setParameters(params);
+        if (cam != null) {
+            cam.setParameters(params);
+        }
     }
 
     public void handleFocus(MotionEvent event, Camera.Parameters params) {
@@ -810,9 +810,7 @@ public void surfaceDestroyed(SurfaceHolder holder) {
 
     @Override
     public void onPictureTaken(byte[] data, Camera camera) {
-
         if (data != null) {
-
             int angleToRotate = getRoatationAngle(MainActivity.this, currentCameraId);
             Bitmap orignalImage = BitmapFactory.decodeByteArray(data, 0, data.length);
             // TODO: front camera portrait picture is reverted

diff --git a/mobile/src/main/java/mc/fhooe/at/wearcam/MobileListener.java b/mobile/src/main/java/mc/fhooe/at/wearcam/MobileListener.java
@@ -18,12 +18,10 @@ public void onMessageReceived(MessageEvent messageEvent) {
         super.onMessageReceived(messageEvent);
         Log.d(TAG, "onMessageReceived: " + messageEvent.getPath());
 
-        if (messageEvent.getPath().equals("/start")) {
+        if (messageEvent.getPath().equals(MyConstants.PATH_START)) {
             Intent intent = new Intent(this, MainActivity.class);
             intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
             PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-        } else if (messageEvent.getPath().equals("/stop")) {
-
         }
     }
 }
diff --git a/mylibrary/.gitignore b/mylibrary/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/mylibrary/build.gradle b/mylibrary/build.gradle
@@ -0,0 +1,24 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 22
+    buildToolsVersion "23.0.0 rc2"
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 22
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile 'com.android.support:appcompat-v7:22.2.0'
+}