WebSVN - ES - Diff - Rev 7 and 8 - /trunk/src/de/pointedears/converter/app/CurrenciesActivity.java

-package ch.ffhs.converter.app;
+package de.pointedears.converter.app;
 import java.util.HashMap;
 import android.app.Activity;
 import android.os.Bundle;
 import android.text.Editable;
 import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnKeyListener;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.EditText;
 import android.widget.Spinner;
-import ch.ffhs.converter.R;
+import de.pointedears.converter.R;
 /**
  * Activity that implements currency conversion
+ *
  * @author pelinux
  */
 public class CurrenciesActivity extends Activity
+{
   /*
-   * Constants for mapping value strings to internal IDs
+   * Constants for mapping value strings
    */
   private static final String VALUE_CHF = "CHF"; //$NON-NLS-1$
   private static final String VALUE_EUR = "EUR"; //$NON-NLS-1$
   private static final String VALUE_USD = "USD"; //$NON-NLS-1$
-  private static final int ITEM_CHF = 0;
-  private static final int ITEM_EUR = 1;
-  private static final int ITEM_USD = 2;
-  /**
-   * Maps value strings to internal IDs
-   */
-  private final static HashMap<String, Integer> valueToId =
+  private static HashMap<String, HashMap<String, Double>> currencyConversions;
-    new HashMap<String, Integer>();
-  static
-  {
-    CurrenciesActivity.valueToId.put(CurrenciesActivity.VALUE_CHF,
-      CurrenciesActivity.ITEM_CHF);
-    CurrenciesActivity.valueToId.put(CurrenciesActivity.VALUE_EUR,
-      CurrenciesActivity.ITEM_EUR);
-    CurrenciesActivity.valueToId.put(CurrenciesActivity.VALUE_USD,
-      CurrenciesActivity.ITEM_USD);
-  }
   /* Unit spinners (dropdowns) */
   private Spinner spinnerUnit1;
   private Spinner spinnerUnit2;
   public void onCreate(Bundle savedInstanceState)
+  {
     super.onCreate(savedInstanceState);
     this.setContentView(R.layout.activity_currencies);
+    /* TODO: Set up currency database */
+    CurrenciesActivity.currencyConversions =
+      new HashMap<String, HashMap<String, Double>>();
+    HashMap<String, Double> conversionFactors = new HashMap<String, Double>();
+    conversionFactors.put(CurrenciesActivity.VALUE_EUR, 0.767842293);
+    conversionFactors.put(CurrenciesActivity.VALUE_USD, 1.03413);
+    CurrenciesActivity.currencyConversions.put(CurrenciesActivity.VALUE_CHF,
+      conversionFactors);
+    conversionFactors = new HashMap<String, Double>();
+    conversionFactors.put(CurrenciesActivity.VALUE_CHF, 1.30235077);
+    conversionFactors.put(CurrenciesActivity.VALUE_CHF, 1.3468);
+    CurrenciesActivity.currencyConversions.put(CurrenciesActivity.VALUE_EUR,
+      conversionFactors);
+    conversionFactors = new HashMap<String, Double>();
+    conversionFactors.put(CurrenciesActivity.VALUE_CHF, 0.966996412);
+    conversionFactors.put(CurrenciesActivity.VALUE_EUR, 0.742500743);
+    CurrenciesActivity.currencyConversions.put(CurrenciesActivity.VALUE_USD,
+      conversionFactors);
     final EditText editValue1 =
       (EditText) this.findViewById(R.id.currencies_edit_value1);
     final EditText editValue2 =
       (EditText) this.findViewById(R.id.currencies_edit_value2);
    */
   private String getConvertedValue(double value, boolean reverse)
+  {
     int selectedItemPosition1 = this.spinnerUnit1.getSelectedItemPosition();
     int selectedItemPosition2 = this.spinnerUnit2.getSelectedItemPosition();
-    String[] itemArray =
+    String[] items =
       this.getResources().getStringArray(R.array.currency_units_values);
-    String selectedItemValue1 = itemArray[selectedItemPosition1];
+    String selectedItemValue1 = items[selectedItemPosition1];
-    String selectedItemValue2 = itemArray[selectedItemPosition2];
+    String selectedItemValue2 = items[selectedItemPosition2];
     if (reverse)
+    {
       String tmp = selectedItemValue1;
       selectedItemValue1 = selectedItemValue2;
       selectedItemValue2 = tmp;
+    }
-    int itemId1 = CurrenciesActivity.valueToId.get(selectedItemValue1);
-    int itemId2 = CurrenciesActivity.valueToId.get(selectedItemValue2);
     Double newValue = value;
+    HashMap<String, Double> mapForCurrency =
+      CurrenciesActivity.currencyConversions.get(selectedItemValue1);
-    switch (itemId1)
+    if (mapForCurrency != null)
+    {
-      case ITEM_CHF:
-        switch (itemId2)
-        {
-          case ITEM_EUR:
-            newValue = new Double(value * 0.767842293);
+      Double conversionFactor = mapForCurrency.get(selectedItemValue2);
-            break;
-          case ITEM_USD:
-            newValue = new Double(value * 1.03413);
-            break;
-        }
-        break;
-      case ITEM_EUR:
-        switch (itemId2)
+      if (conversionFactor != null)
-        {
+      {
-          case ITEM_CHF:
-            newValue = new Double(value * 1.30235077);
-            break;
-          case ITEM_USD:
-            newValue = new Double(value * 1.3468);
+        newValue *= conversionFactor;
-            break;
-        }
-        break;
-      case ITEM_USD:
-        switch (itemId2)
-        {
-          case ITEM_CHF:
-            newValue = new Double(value * 0.966996412);
-            break;
-          case ITEM_EUR:
-            newValue = new Double(value * 0.742500743);
-            break;
-        }
+      }
-        break;
+    }
     return newValue.toString();
+  }
+  /*
+   * (non-Javadoc)
+   *
+   * @see android.app.Activity#onCreateOptionsMenu(android.view.Menu)
+   */
+  @Override
+  public boolean onCreateOptionsMenu(Menu menu)
+  {
+    MenuInflater inflater = this.getMenuInflater();
+    inflater.inflate(R.menu.options, menu);
+    return true;
+  }
+  /*
+   * (non-Javadoc)
+   *
+   * @see android.app.Activity#onOptionsItemSelected(android.view.MenuItem)
+   */
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item)
+  {
+    /* update here */
+    return super.onOptionsItemSelected(item);
+  }
+}

Subversion Repositories ES

(root)/trunk/src/de/pointedears/converter/app/CurrenciesActivity.java - Rev 7 → 8