From 660a95384bec03ad0025a8d97ddf83c2ae3a567d Mon Sep 17 00:00:00 2001
From: Johan Nilsson <github@markupartist.com>
Date: Sat, 19 Jun 2010 13:25:18 +0200
Subject: [PATCH] changed link to systembolaget to link to their inventory
 mobile friendly page instead

---
 res/values/arrays.xml                         | 54 +++++++++++++++++++
 res/xml/preferences.xml                       |  8 +++
 .../iglaset/activity/DrinkDetailActivity.java | 27 +++++++---
 3 files changed, 82 insertions(+), 7 deletions(-)
 create mode 100644 res/values/arrays.xml

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
new file mode 100644
index 0000000..22a5ea7
--- /dev/null
+++ b/res/values/arrays.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+
+    <string-array name="sb_county_names">
+        <item>Hela landet</item>
+        <item>Blekinge län</item>
+        <item>Dalarnas län</item>
+        <item>Gotlands län</item>
+        <item>Gävleborgs län</item>
+        <item>Hallands län</item>
+        <item>Jämtlands län</item>
+        <item>Jönköpings län</item>
+        <item>Kalmar län</item>
+        <item>Kronobergs län</item>
+        <item>Norrbottens län</item>
+        <item>Skåne län</item>
+        <item>Stockholms län</item>
+        <item>Södermanlands län</item>
+        <item>Uppsala län</item>
+        <item>Värmlands län</item>
+        <item>Västerbottens län</item>
+        <item>Västernorrlands län</item>
+        <item>Västmanlands län</item>
+        <item>Västra Götalands län</item>
+        <item>Örebro län</item>
+        <item>Östergötlands län</item>
+    </string-array>
+
+    <string-array name="sb_county_ids">
+        <item>0</item>
+        <item>10</item>
+        <item>20</item>
+        <item>09</item>
+        <item>21</item>
+        <item>13</item>
+        <item>23</item>
+        <item>06</item>
+        <item>08</item>
+        <item>07</item>
+        <item>25</item>
+        <item>12</item>
+        <item>01</item>
+        <item>04</item>
+        <item>03</item>
+        <item>17</item>
+        <item>24</item>
+        <item>22</item>
+        <item>19</item>
+        <item>14</item>
+        <item>18</item>
+        <item>05</item>
+    </string-array>    
+</resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 3f2820f..e3e5f21 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -26,6 +26,14 @@
 	        android:title="@string/clear_search_history_preference"
 	        android:summary="@string/clear_search_history_summary_preference"
 	        />
+        <ListPreference
+            android:title="Län"
+            android:summary="Förvalt län för koll av lagersaldo."
+            android:key="sb_search_county"
+            android:entries="@array/sb_county_names"
+            android:entryValues="@array/sb_county_ids"
+            android:defaultValue="0"
+            />
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/src/com/markupartist/iglaset/activity/DrinkDetailActivity.java b/src/com/markupartist/iglaset/activity/DrinkDetailActivity.java
index 8ca71d0..b44826c 100644
--- a/src/com/markupartist/iglaset/activity/DrinkDetailActivity.java
+++ b/src/com/markupartist/iglaset/activity/DrinkDetailActivity.java
@@ -8,18 +8,21 @@
 import java.util.Map;
 import java.util.Set;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.ListActivity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.DialogInterface.OnClickListener;
 import android.graphics.Paint;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.text.format.Time;
@@ -401,12 +404,7 @@ protected void onListItemClick(ListView l, View v, int position, long id) {
 
         if (item instanceof Volume) {
             Volume volume = (Volume) item;
-            if (!volume.isRetired()) {
-                Intent browserIntent = new Intent(Intent.ACTION_VIEW,
-                        Uri.parse("http://systembolaget.se/SokDrycker/Produkt?VaruNr="
-                                + volume.getArticleId()));
-                startActivity(browserIntent);
-            }
+            startActivity(createInventoryIntent(volume));
         } else if (section.adapter instanceof UserRatingAdapter) {
         	tryShowAuthenticatedDialog(DIALOG_RATE);
         } else if (section.adapter instanceof DrinkDescriptionAdapter) {
@@ -809,7 +807,22 @@ private void cancelGetDrinkTask() {
     		mGetDrinkTask = null;
     	}
     }
-    
+
+    private Intent createInventoryIntent(Volume volume) {
+        SharedPreferences sharedPreferences = PreferenceManager
+                .getDefaultSharedPreferences(getApplicationContext());
+        String county = sharedPreferences
+                .getString("sb_search_county", "0");
+
+        Uri uri = Uri.parse(String.format(
+                "http://mobil.systembolaget.se/SokDryck/SokDryck.aspx?artnr=%s&lan=%s",
+                String.valueOf(volume.getArticleId()), county));
+
+        Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+
+        return intent;
+    }
+
     /**
      * Background task for fetching a drink.
      */