fixed shared preferences

phillipthelen · Jul 5, 2012 · 7d10ba9 · 7d10ba9
1 parent 57e58df
commit 7d10ba9
Show file tree

Hide file tree

Showing 13 changed files with 126 additions and 90 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -12,7 +12,7 @@
     <application
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name" 
-        android:theme="@style/MensaTheme">
+        android:theme="@style/MensaTheme" android:debuggable="false">
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"

diff --git a/res/layout/checkboxpref.xml b/res/layout/checkboxpref.xml
@@ -8,7 +8,7 @@
         android:layout_weight="1"
         android:background="@drawable/box_stretch">
     <CheckBox
-        android:id="@+android:id/checkbox"
+        android:id="@+id/checkbox"
         android:layout_width="17dp"
         android:layout_height="17dp"
         android:layout_alignParentRight="true"
@@ -19,7 +19,7 @@
 		android:button="@drawable/prefcheckbox"/>
 
     <TextView
-        android:id="@+android:id/title"
+        android:id="@+id/title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"

diff --git a/res/layout/list_item.xml b/res/layout/list_item.xml
@@ -34,10 +34,10 @@
         android:layout_height="fill_parent"
         android:baselineAligned="true"
         android:orientation="horizontal"
-        android:paddingBottom="4dp"
+        android:paddingBottom="6dp"
         android:paddingLeft="26dp"
         android:paddingRight="26dp"
-        android:paddingTop="4dp" >
+        android:paddingTop="6dp" >
 
         <TextView
             android:id="@+id/itemViewBig"

diff --git a/res/layout/listviewpref.xml b/res/layout/listviewpref.xml
@@ -11,21 +11,20 @@
 				android:background="@drawable/box_stretch">
 
 	<TextView
-			android:id="@+android:id/title"
+			android:id="@+id/titleText"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_alignParentLeft="true"
 			android:layout_alignParentTop="true"
 			android:layout_marginLeft="10dip"
 			android:textAppearance="?android:attr/textAppearanceMedium" />
 	<TextView
-			android:id="@+android:id/summary"
+			android:id="@+id/summaryText"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_below="@+android:id/title"
 			android:layout_marginLeft="10dip"
 			android:textAppearance="?android:attr/textAppearanceSmall"
-			android:textColor="@color/listSummary"/>
+			android:textColor="@color/listSummary" android:layout_toRightOf="@id/titleText"/>
 	<ImageView
 			android:id="@+id/listviewprefImage"
 			android:layout_width="wrap_content"

diff --git a/res/layout/main.xml b/res/layout/main.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res/net.pherth.mensa"
     android:id="@+id/RelativeLayout1"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
@@ -13,17 +12,24 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:background="@drawable/tab_bar" />
-
-    <android.support.v4.view.ViewPager
-        android:id="@+id/mainpager"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginTop="20dp"
-        android:background="@drawable/background"
-        android:paddingTop="10dp" >
-
-    </android.support.v4.view.ViewPager>
-
+	    <RelativeLayout
+			android:id="@+id/loadScreen"
+			android:layout_width="fill_parent"
+			android:layout_height="fill_parent"
+			android:background="@drawable/background">
+			<TextView
+				android:id="@+id/loadText"
+				android:layout_width="fill_parent"
+				android:layout_height="fill_parent"
+				android:text="@string/loadText" 
+				android:layout_centerHorizontal="true"
+				android:layout_centerVertical="true"/>
+		</RelativeLayout>
+		<android.support.v4.view.ViewPager
+			android:id="@+id/mainpager"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="20dp"
+			android:background="@drawable/background"
+			android:paddingTop="20dp" />
 </RelativeLayout>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
@@ -104,15 +104,17 @@
 	<string name="retrvData">Speiseplan wird abgerufen…</string>
 	<string name="bio">Bio</string>
 	<string name="fish">MSC zertifizierter Fisch</string>
-	<string name="connError">Es gab einen Verbinungsfehler. Bitte versuche es später wieder.</string>
+	<string name="connError">Es gab einen Verbindungsfehler. Bitte versuche es später wieder.</string>
 	<string name="about">Über</string>
 	<string name="general">Generell</string>
 	<string name="misc">Misc.</string>
 	<string name="help">Hilfe</string>
-	<string name="graphics">Grrafiken:</string>
+	<string name="graphics">Grafiken:</string>
 	<string name="code">Code:</string>
 	<string name="version">Version:</string>
 	<string name="github">Github:</string>
 	<string name="contact">Kontakt:</string>
 	<string name="website">Webseite:</string>
+		<string name="loadText">ucanhaz Update?</string>
+	<string name="noData">Keine Daten verfügbar.</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -126,4 +126,6 @@
 	<string name="github">Github:</string>
 	<string name="contact">Contact:</string>
 	<string name="website">Website:</string>
+	<string name="loadText">ucanhaz Update?</string>
+	<string name="noData">No data available.</string>
 </resources>
diff --git a/src/net/pherth/omnomagon/Data.java b/src/net/pherth/omnomagon/Data.java
@@ -58,10 +58,10 @@ public Data(Context cxt) {
 	public void getAllData(boolean fromDatabase) {
 		res = new ArrayList<Day>();
 		if(fromDatabase) {
-			Log.i("Data", "Load from database");
+			if(false) Log.i("Data", "Load from database");
 			loadDataFromDatabase();
 		} else {
-			Log.i("Data", "Load new data");
+			if(false) Log.i("Data", "Load new data");
 			sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this.context);
 			String city = sharedPrefs.getString("cityPreference", "beList");
 			String mensa = sharedPrefs.getString("mensaPreference", "fu1");
@@ -111,7 +111,7 @@ private void parseHTML(String html, String id) {
 	}
 
 	private void parseHTMLBerlin(String htmlString) {
-		Log.i("HTML", "beginning to parse");		
+		if(false) Log.i("HTML", "beginning to parse");		
 		Document doc = Jsoup.parse(htmlString);
 		Elements headers = doc.getElementsByClass("mensa_week_head_col");
 		for (int x=0; x < headers.size(); x++){
@@ -198,7 +198,7 @@ public List<Pair<Pair<Integer, String>, List<Meal>>> getCurrentDay(int position)
 		List<Pair<Pair<Integer, String>, List<Meal>>> currentMeals = new ArrayList<Pair<Pair<Integer, String>, List<Meal>>>();
 		Day currentDay = res.get(position);
 		currentMeals = currentDay.getMeals();
-		Log.i("Current Meals", currentMeals.toString());
+		if(false) Log.i("Current Meals", currentMeals.toString());
 		return currentMeals;
 	}
 
@@ -207,7 +207,7 @@ private String getURL(String city, String mensa) {
 		if (city.equals("beList")) {
 			url = "http://www.studentenwerk-berlin.de/speiseplan/rss/" + mensa + "/woche/lang/1";
 		}
-		Log.i("url", city + ", " + mensa + ", " + url);
+		if(false) Log.i("url", city + ", " + mensa + ", " + url);
 		return url;
 	}
 }

diff --git a/src/net/pherth/omnomagon/Dataprovider.java b/src/net/pherth/omnomagon/Dataprovider.java
@@ -17,7 +17,7 @@ public class Dataprovider {
 	private Database dbHelper;
 
 	public Dataprovider(Context context) {
-		Log.i("Dataprovider", "initializing Dataprovider");
+		if(false) Log.i("Dataprovider", "initializing Dataprovider");
 		dbHelper = new Database(context);
 	}
 

diff --git a/src/net/pherth/omnomagon/MainActivity.java b/src/net/pherth/omnomagon/MainActivity.java
@@ -48,11 +48,8 @@
 import android.view.ViewGroup;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
-import android.widget.AdapterView;
+import android.widget.*;
 import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.TextView;
 
 import com.actionbarsherlock.app.SherlockActivity;
 import com.actionbarsherlock.internal.nineoldandroids.animation.ObjectAnimator;
@@ -70,7 +67,10 @@ public class MainActivity extends SherlockActivity {
     private Runnable loadNew;
     private String[] items;
 	private ArrayList<MealAdapter> mAdapterList = new ArrayList<MealAdapter>();
+	//private ViewSwitcher mSwitcher;
     com.actionbarsherlock.app.ActionBar actionBar;
+	OnSharedPreferenceChangeListener prefListener;
+	SharedPreferences sharedPrefs;
 
 	/** Called when the activity is first created. */
     @Override
@@ -79,41 +79,44 @@ public void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.main);
         cxt = this;
 
-        SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(cxt);
+        sharedPrefs = PreferenceManager.getDefaultSharedPreferences(cxt);
 
         actionBar = getSupportActionBar();
         actionBar.setDisplayShowTitleEnabled(true);
         actionBar.setBackgroundDrawable(getResources().getDrawable(R.drawable.action_bar));
         actionBar.setDisplayShowHomeEnabled(false);
 	    actionBar.setTitle(getCurrentMensa(sharedPrefs.getString("mensaPreference", "Mensa")));
-	    actionBar.setSubtitle("07.05.2012");
+	    //actionBar.setSubtitle("07.05.2012");
 
         items = getResources().getStringArray(R.array.weekDays);
 
         Calendar calendar = Calendar.getInstance();
-        Log.i("Calendar", calendar.toString());
+        if(false) Log.i("Calendar", calendar.toString());
         calendar.setFirstDayOfWeek(0);
         int day = calendar.get(Calendar.DAY_OF_WEEK) - 2;
 
-        OnSharedPreferenceChangeListener prefsListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
-            public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
-            			actionBar.setTitle(getCurrentMensa(prefs.getString("mensaPreference", "Mensa")));
-            			for(int i=0; i<5; i++){
-            	    		mAdapterList.get(i).notifyDataSetChanged();
-            	    	}
-                }
-            };
-        sharedPrefs.registerOnSharedPreferenceChangeListener(prefsListener);
+        prefListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
+	        @Override
+	        public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
+
+		        actionBar.setTitle(getCurrentMensa(prefs.getString("mensaPreference", "Mensa")));
+		        for(int i=0; i<5; i++){
+			        mAdapterList.get(i).notifyDataSetChanged();
+		        }
+	        }
+        };
+        sharedPrefs.registerOnSharedPreferenceChangeListener(prefListener);
         for(int x=0; x<5; x++) {
         	mAdapterList.add(new MealAdapter(cxt));
         }
 	    MainPagerAdapter adapter = new MainPagerAdapter(this);
+	    //mSwitcher = (ViewSwitcher)findViewById(R.id.mainSwitcher);
         ViewPager pager = (ViewPager)findViewById( R.id.mainpager );
         TitlePageIndicator indicator = (TitlePageIndicator)findViewById( R.id.indicator );
         indicator.bringToFront();
         pager.setAdapter(adapter);
         indicator.setViewPager( pager );
-        Log.i("Day", String.valueOf(day));
+        if(false) Log.i("Day", String.valueOf(day));
         if (day < 5) {
         	pager.setCurrentItem(day);
         }
@@ -161,10 +164,12 @@ public int getCount() {
         @Override
         public Object instantiateItem(View collection, int position) {
         	AmazingListView v = new AmazingListView( context );
-	        ImageView iv = new ImageView( context );
 	        ((ViewPager) collection).addView(v, 0);
-	        v.addFooterView(iv);
-	        iv.setImageResource(R.drawable.footer);
+	        /*if (!mAdapterList.get(position).isEmpty()) {
+		        ImageView iv = new ImageView( context );
+		        v.addFooterView(iv);
+		        iv.setImageResource(R.drawable.footer);
+	        }*/
             v.setAdapter(mAdapterList.get(position));
             v.setBackgroundDrawable(getResources().getDrawable(R.drawable.background));
             v.setDivider(getResources().getDrawable(android.R.color.transparent));
@@ -201,11 +206,7 @@ public void destroyItem(View collection, int position, Object view) {
 
         @Override
         public boolean isViewFromObject(View view, Object object) {
-                return view==((ListView)object);
-        }
-
-        @Override
-        public void finishUpdate(View arg0) {
+                return view==(object);
         }
 
 
@@ -217,9 +218,6 @@ public Parcelable saveState() {
                 return null;
         }
 
-        @Override
-        public void startUpdate(View arg0) {}
-
         @Override
         public int getItemPosition(Object object) {
             return POSITION_NONE;
@@ -253,6 +251,7 @@ public void run() {
             for(int i=0; i<5; i++){
 	    		mAdapterList.get(i).notifyDataSetChanged();
 	    	}
+	        //mSwitcher.showNext();
         }
     };
 
@@ -266,7 +265,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-    	Log.i("Item", item.toString());
+    	if(false) Log.i("Item", item.toString());
         switch (item.getItemId()) {
             case R.id.menu_settings:
             	Intent settingsActivity = new Intent(getBaseContext(),
@@ -300,9 +299,10 @@ public void onPause() {
     	if(m_ProgressDialog != null) {
     		m_ProgressDialog.dismiss();
     	}
-    	super.onPause();
+	    //sharedPrefs.unregisterOnSharedPreferenceChangeListener(prefListener);
+	    super.onPause();
     }
-
+    
     private boolean isNetworkAvailable() {
         ConnectivityManager connectivityManager
               = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
@@ -342,9 +342,15 @@ public void onConfigurationChanged(Configuration newConfig) {
 	public Boolean updateToday(Long timestamp) {
 		Long currTimestamp = System.currentTimeMillis();
 		Float diff = (currTimestamp.floatValue() - timestamp) / 86400000;
-		Log.i("MainActivity", diff.toString());
+		if(false) Log.i("MainActivity", diff.toString());
 		return (diff < 1);
 
 	}
+
+	@Override
+	protected void onResume() {
+		super.onResume();
+		sharedPrefs.registerOnSharedPreferenceChangeListener(prefListener);
+	}
 }