Added dynamic text titles

zh3 · Nov 13, 2011 · a668664 · a668664
1 parent bf666bb
commit a668664
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/OpenFridge_ZH/res/layout/item_edit.xml b/OpenFridge_ZH/res/layout/item_edit.xml
@@ -58,7 +58,7 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:onClick="doneBtnCallback"
-                android:text="@string/Done_button" />
+                android:text="@string/addButtonTitle" />
         </LinearLayout>
 
         <TextView

diff --git a/OpenFridge_ZH/res/values/strings.xml b/OpenFridge_ZH/res/values/strings.xml
@@ -27,6 +27,9 @@
         <item>months</item>
     </string-array>
     <string name="deleteChecked">Delete Checked</string>
-    <string name="commonItemsTitle">Add Common Item</string>
+    <string name="commonItemsTitle">Favorites</string>
-    <string name="customItemsTitle">Add Custom Item</string>
+    <string name="customItemsTitle">Add Item</string>
+    <string name="updateItemTitle">Update Item</string>
+    <string name="updateButtonTitle">Update</string>
+    <string name="addButtonTitle">Add</string>
 </resources>
diff --git a/OpenFridge_ZH/src/com/openfridge/ExpireActivity.java b/OpenFridge_ZH/src/com/openfridge/ExpireActivity.java
@@ -31,6 +31,7 @@ public void EditPostponeClick(View view) {
 		Intent itemEdit = new Intent(this, ItemEditActivity.class);
 		itemEdit.putExtras(food.bundle());
 		startActivity(itemEdit);
+		finish();
 	}
 
 	public void DoneClick(View view) {

diff --git a/OpenFridge_ZH/src/com/openfridge/ItemEditActivity.java b/OpenFridge_ZH/src/com/openfridge/ItemEditActivity.java
@@ -15,6 +15,7 @@
 import android.widget.DatePicker;
 import android.widget.EditText;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 import android.widget.Toast;
 
 //TODO Need to post updates correctly from item edit menu rather than always
@@ -27,13 +28,17 @@ public class ItemEditActivity extends Activity {
 	private DatePicker datePicker;
 	private FridgeFood food;
 	private static final int MAX_WIDTH_OFFSET = 10;
+	private boolean isUpdate;
 
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
 		food = FridgeFood.getFoodFromBundle(getIntent().getExtras());
+		isUpdate = (food.getId() != -1);
 
 		setContentView(R.layout.item_edit);
+
+		if (isUpdate) setUpdateText();
 
 		descField = (EditText) findViewById(R.id.descriptionEditText);
 
@@ -60,6 +65,15 @@ public void onCreate(Bundle savedInstanceState) {
 		// add a common item
 		addCommonItemButtons(adapter);
 	}
+
+	private void setUpdateText() {
+	    TextView customItemsTitle 
+	        = (TextView) findViewById(R.id.custom_items_title);
+	    customItemsTitle.setText(R.string.updateItemTitle);
+
+	    Button apply = (Button) findViewById(R.id.button1);
+	    apply.setText(R.string.updateButtonTitle);
+	}
 
 	private void addCommonItemButtons(ArrayAdapter<CharSequence> descriptions) {
 		LinearLayout layout = (LinearLayout) findViewById(R.id.common_items_buttons);
@@ -135,7 +149,7 @@ public void doneBtnCallback(View view) {
 				food.setExpirationDate(getSimpleDateString());
 
 				DataClient.getInstance().doNetOp(this,
-						(food.getId() == -1) ? NetOp.PUSH : NetOp.UPDATE, food);
+						(!isUpdate) ? NetOp.PUSH : NetOp.UPDATE, food);
 
 				finish();
 			} else {