Cleaned up a few things and tried to make it run smoother

(unsuccessfully)
w9jds · Dec 7, 2013 · 1bc701c · 1bc701c
1 parent ab3fe7f
commit 1bc701c
Show file tree

Hide file tree

Showing 13 changed files with 94 additions and 68 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.w9jds.glassshare"
-    android:versionCode="1"
-    android:versionName="1.0" >
+    android:versionCode="2"
+    android:versionName="0.2-alpha" >
 
     <uses-sdk
         android:minSdkVersion="15"

diff --git a/bin/AndroidManifest.xml b/bin/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.w9jds.glassshare"
-    android:versionCode="1"
-    android:versionName="1.0" >
+    android:versionCode="2"
+    android:versionName="0.2-alpha" >
 
     <uses-sdk
         android:minSdkVersion="15"

diff --git a/bin/GlassShare.apk b/bin/GlassShare.apk
diff --git a/bin/classes.dex b/bin/classes.dex
diff --git a/bin/classes/com/w9jds/glassshare/Adapters/csaAdapter.class b/bin/classes/com/w9jds/glassshare/Adapters/csaAdapter.class
diff --git a/bin/classes/com/w9jds/glassshare/MainActivity$1.class b/bin/classes/com/w9jds/glassshare/MainActivity$1.class
diff --git a/bin/classes/com/w9jds/glassshare/MainActivity$csaAdapter.class b/bin/classes/com/w9jds/glassshare/MainActivity$csaAdapter.class
diff --git a/bin/classes/com/w9jds/glassshare/MainActivity.class b/bin/classes/com/w9jds/glassshare/MainActivity.class
diff --git a/bin/classes/com/w9jds/glassshare/R$id.class b/bin/classes/com/w9jds/glassshare/R$id.class
diff --git a/bin/resources.ap_ b/bin/resources.ap_
diff --git a/gen/com/w9jds/glassshare/R.java b/gen/com/w9jds/glassshare/R.java
@@ -100,8 +100,8 @@ public static final class drawable {
     }
     public static final class id {
         public static final int cardImage=0x7f090000;
-        public static final int delete_menu_item=0x7f090001;
-        public static final int share_menu_item=0x7f090002;
+        public static final int delete_menu_item=0x7f090002;
+        public static final int share_menu_item=0x7f090001;
     }
     public static final class layout {
         public static final int card_layout=0x7f030000;

diff --git a/src/com/w9jds/glassshare/Adapters/csaAdapter.java b/src/com/w9jds/glassshare/Adapters/csaAdapter.java
@@ -0,0 +1,80 @@
+package com.w9jds.glassshare.Adapters;
+
+import java.util.ArrayList;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import com.google.android.glass.widget.CardScrollAdapter;
+import com.w9jds.glassshare.R;
+
+public class csaAdapter extends CardScrollAdapter
+{	
+	private Context mcContext;
+	private ArrayList<String> mlsPaths;
+
+	public csaAdapter(Context cContext, ArrayList<String> alsPaths)
+	{
+		mcContext = cContext;
+		mlsPaths = alsPaths;
+	}
+
+    @Override
+    public int findIdPosition(Object id) 
+    {
+        return -1;
+    }
+
+    @Override
+    public int findItemPosition(Object item) 
+    {
+        return mlsPaths.indexOf(item);
+    }
+
+    @Override
+    public int getCount() 
+    {
+        return mlsPaths.size();
+    }
+
+    @Override
+    public Object getItem(int position) 
+    {
+        return mlsPaths.get(position);
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) 
+    {
+        LayoutInflater inflater = (LayoutInflater) mcContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        View vCard = inflater.inflate(R.layout.card_layout, parent, false);
+
+//        BitmapFactory.Options bfoOptions = new BitmapFactory.Options();
+//        bfoOptions.inJustDecodeBounds = true;
+//        BitmapFactory.decodeFile(mlsPaths.get(position), bfoOptions);
+//
+//        bfoOptions.inSampleSize = (bfoOptions.outWidth / 2) - (640 / 2);
+
+        Bitmap bImage = BitmapFactory.decodeFile(mlsPaths.get(position));
+
+        ImageView ivPic = (ImageView) vCard.findViewById(R.id.cardImage);
+
+        if (bImage != null)
+        {
+	        if (bImage.getWidth() > 640)
+	        {
+	            double dRatio = ((double)bImage.getWidth()) / 640;
+	            ivPic.setImageBitmap(Bitmap.createScaledBitmap(bImage, 640, (int) Math.round(bImage.getHeight() / dRatio) , true));
+	        }
+	        else
+	            ivPic.setImageBitmap(bImage);
+        }
+
+        return vCard;
+    }
+}
diff --git a/src/com/w9jds/glassshare/MainActivity.java b/src/com/w9jds/glassshare/MainActivity.java
@@ -1,9 +1,10 @@
 package com.w9jds.glassshare;
 
+import java.io.File;
 import java.util.ArrayList;
 
-import com.google.android.glass.widget.CardScrollAdapter;
 import com.google.android.glass.widget.CardScrollView;
+import com.w9jds.glassshare.Adapters.csaAdapter;
 
 import android.os.Bundle;
 import android.os.Environment;
@@ -13,23 +14,19 @@
 import android.app.Activity;
 import android.content.Context;
 import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ImageView;
 
 @SuppressLint("DefaultLocale")
 public class MainActivity extends Activity 
 {
-	public static final String CAMERA_IMAGE_BUCKET_NAME = Environment.getExternalStorageDirectory().toString() + "/DCIM/Camera";
+	public static final String CAMERA_IMAGE_BUCKET_NAME = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).toString() + "/Camera";
 	public static final String CAMERA_IMAGE_BUCKET_ID = getBucketId(CAMERA_IMAGE_BUCKET_NAME);
 
 	private ArrayList<String> mlsPaths = new ArrayList<String>();
+	private int iPosition;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) 
@@ -40,7 +37,7 @@ protected void onCreate(Bundle savedInstanceState)
 
 		CardScrollView csvCardsView = new CardScrollView(this);
 
-		csaAdapter cvAdapter = new csaAdapter(this);
+		csaAdapter cvAdapter = new csaAdapter(this, mlsPaths);
 		csvCardsView.setAdapter(cvAdapter);
 		csvCardsView.activate();
 
@@ -49,6 +46,7 @@ protected void onCreate(Bundle savedInstanceState)
 			@Override
 			public void onItemClick(AdapterView<?> parent, View view, int position, long id) 
 			{
+				iPosition = position;
 				openOptionsMenu();
 			}
         });
@@ -97,66 +95,14 @@ public boolean onOptionsItemSelected(android.view.MenuItem item)
 		switch (item.getItemId()) 
 		{
 	        case R.id.delete_menu_item:
+//	        	File fPic = new File(mlsPaths.get(iPosition));
+//	        	fPic.delete();
 	            return true;
 	        case R.id.share_menu_item:
 	        	return true;
 	        default:
 	            return super.onOptionsItemSelected(item);
 		}
 	};
-
-    private class csaAdapter extends CardScrollAdapter
-    {	
-    	private Context mcContext;
-
-    	public csaAdapter(Context cContext)
-    	{
-    		mcContext = cContext;
-    	}
-
-	    @Override
-	    public int findIdPosition(Object id) 
-	    {
-	        return -1;
-	    }
-
-	    @Override
-	    public int findItemPosition(Object item) 
-	    {
-	        return mlsPaths.indexOf(item);
-	    }
-
-	    @Override
-	    public int getCount() 
-	    {
-	        return mlsPaths.size();
-	    }
-
-	    @Override
-	    public Object getItem(int position) 
-	    {
-	        return mlsPaths.get(position);
-	    }
-
-	    @Override
-	    public View getView(int position, View convertView, ViewGroup parent) 
-	    {
-	        LayoutInflater inflater = (LayoutInflater) mcContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-	        View vCard = inflater.inflate(R.layout.card_layout, parent, false);
-
-            Bitmap bImage = BitmapFactory.decodeFile(mlsPaths.get(position));
-            ImageView ivPic = (ImageView) vCard.findViewById(R.id.cardImage);
-
-            if (bImage.getWidth() > 640)
-            {
-                double dRatio = ((double)bImage.getWidth()) / 640;
-                ivPic.setImageBitmap(Bitmap.createScaledBitmap(bImage, 640, (int) Math.round(bImage.getHeight() / dRatio) , true));
-            }
-            else
-                ivPic.setImageBitmap(bImage);
-
-	        return vCard;
-	    }
-    }
 }