Improved layout, fixed updating of location on sync.

matburt · Dec 10, 2012 · 8a1148f · 8a1148f
1 parent 664a747
commit 8a1148f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 15 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -194,7 +194,8 @@
         <activity android:name=".Gui.Agenda.AgendaActivity" >
         </activity>
 
-        <receiver android:name=".Gui.Widget.CaptureWidgetProvider" >
+        <receiver android:name=".Gui.Widget.CaptureWidgetProvider"
+            android:label="MobileOrg Capture" >
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>

diff --git a/res/layout/capture_widget.xml b/res/layout/capture_widget.xml
@@ -3,14 +3,14 @@
     android:id="@+id/capture_widget_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_margin="15dp"
     android:orientation="vertical" >
 
     <ImageView
         android:id="@+id/capture_widget_icon"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
         android:layout_gravity="center"
+        android:layout_margin="5dp"
         android:layout_weight="1"
         android:src="@drawable/widget_capture" />
 
@@ -20,7 +20,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:background="@drawable/capture_widget_text_bg"
-        android:text="Widget"
         android:textColor="@android:color/primary_text_dark" />
 
 </LinearLayout>
diff --git a/res/xml/capture_widget_provider.xml b/res/xml/capture_widget_provider.xml
@@ -1,9 +1,9 @@
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
     android:configure="com.matburt.mobileorg.Gui.Widget.CaptureWidgetConfig"
     android:initialLayout="@layout/capture_widget"
-    android:minHeight="72dp"
-    android:minWidth="72dp"
-    android:previewImage="@drawable/icon"
+    android:minHeight="40dp"
+    android:minWidth="40dp"
+    android:previewImage="@drawable/widget_capture"
     android:resizeMode="horizontal|vertical"
     android:updatePeriodMillis="86400000" >
 

diff --git a/src/com/matburt/mobileorg/Gui/Capture/EditActivity.java b/src/com/matburt/mobileorg/Gui/Capture/EditActivity.java
@@ -6,6 +6,7 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
@@ -24,6 +25,7 @@ public class EditActivity extends SherlockFragmentActivity implements EditHost,
 		PayloadFragment.OnPayloadModifiedListener,
 		DatesFragment.OnDatesModifiedListener {
 	public final static String NODE_ID = "node_id";
+	public final static String OLP_LOCATION = "olp_location";
 	public final static String ACTIONMODE = "actionMode";
 	public final static String ACTIONMODE_CREATE = "create";
 	public final static String ACTIONMODE_EDIT = "edit";
@@ -64,7 +66,16 @@ protected void onDestroy() {
 	private void initState() {
 		Intent intent = getIntent();
 		this.actionMode = intent.getStringExtra(ACTIONMODE);
-		long node_id = intent.getLongExtra(NODE_ID, -1);	
+		long node_id = intent.getLongExtra(NODE_ID, -1);
+		String olpLocation = intent.getStringExtra(OLP_LOCATION);
+
+		if (TextUtils.isEmpty(olpLocation) == false) {
+			try {
+				OrgNode parentNode = OrgProviderUtils.getOrgNodeFromOlpPath(
+						olpLocation, getContentResolver());
+				node_id = parentNode.id;
+			} catch (Exception e) {}
+		}
 
 		if (this.actionMode == null) {
 			this.node = OrgUtils.getCaptureIntentContents(intent);

diff --git a/src/com/matburt/mobileorg/Gui/Widget/CaptureWidgetProvider.java b/src/com/matburt/mobileorg/Gui/Widget/CaptureWidgetProvider.java
@@ -11,8 +11,6 @@
 
 import com.matburt.mobileorg.R;
 import com.matburt.mobileorg.Gui.Capture.EditActivity;
-import com.matburt.mobileorg.OrgData.OrgNode;
-import com.matburt.mobileorg.OrgData.OrgProviderUtils;
 
 public class CaptureWidgetProvider extends AppWidgetProvider {
 	public static final String LOCATION = "location";
@@ -61,11 +59,7 @@ private static Intent getWidgetIntent(int appWidgetId, Context context) {
 
 		SharedPreferences prefs = getPreferences(appWidgetId, context);
 		String olpLocation = prefs.getString(LOCATION, "");
-		try {
-			OrgNode parentNode = OrgProviderUtils.getOrgNodeFromOlpPath(
-					olpLocation, context.getContentResolver());
-			intent.putExtra(EditActivity.NODE_ID, parentNode.id);
-		} catch (Exception e) {}
+		intent.putExtra(EditActivity.OLP_LOCATION, olpLocation);
 
 		return intent;
 	}