From 07b0b2b1e8ec7a99a3db1dfc72c9e86c4985147b Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Sun, 4 Mar 2012 19:56:33 +0100
Subject: refactoring: cleanups

* remove unused resources
* fix some comments, layout, logging and other stuff
---
 main/res/drawable-hdpi/actionbar_share.png  | Bin 681 -> 0 bytes
 main/res/drawable-hdpi/hw_menu.png          | Bin 947 -> 0 bytes
 main/res/drawable-hdpi/main_about.png       | Bin 4559 -> 0 bytes
 main/res/drawable-hdpi/main_settings.png    | Bin 10393 -> 0 bytes
 main/res/drawable-hdpi/trackable_coin.png   | Bin 864 -> 0 bytes
 main/res/drawable-hdpi/trackable_coins.png  | Bin 1032 -> 0 bytes
 main/res/drawable-hdpi/trackable_tb.png     | Bin 1103 -> 0 bytes
 main/res/drawable-hdpi/trackable_tbs.png    | Bin 1426 -> 0 bytes
 main/res/drawable-ldpi/actionbar_share.png  | Bin 495 -> 0 bytes
 main/res/drawable-ldpi/hw_menu.png          | Bin 737 -> 0 bytes
 main/res/drawable-ldpi/main_about.png       | Bin 2950 -> 0 bytes
 main/res/drawable-ldpi/main_settings.png    | Bin 5982 -> 0 bytes
 main/res/drawable/actionbar_share.png       | Bin 757 -> 0 bytes
 main/res/drawable/hw_menu.png               | Bin 1148 -> 0 bytes
 main/res/drawable/main_about.png            | Bin 3985 -> 0 bytes
 main/res/drawable/main_settings.png         | Bin 7358 -> 0 bytes
 main/res/drawable/my_location.png           | Bin 1138 -> 0 bytes
 main/res/drawable/my_location_arrow.png     | Bin 542 -> 0 bytes
 main/res/layout/address_button.xml          |  11 ----
 main/res/layout/touch.xml                   |  96 +++++++++++++---------------
 main/src/cgeo/geocaching/Settings.java      |   2 -
 main/src/cgeo/geocaching/gcvote/GCVote.java |  16 +++--
 22 files changed, 55 insertions(+), 70 deletions(-)
 delete mode 100644 main/res/drawable-hdpi/actionbar_share.png
 delete mode 100644 main/res/drawable-hdpi/hw_menu.png
 delete mode 100644 main/res/drawable-hdpi/main_about.png
 delete mode 100644 main/res/drawable-hdpi/main_settings.png
 delete mode 100644 main/res/drawable-hdpi/trackable_coin.png
 delete mode 100644 main/res/drawable-hdpi/trackable_coins.png
 delete mode 100644 main/res/drawable-hdpi/trackable_tb.png
 delete mode 100644 main/res/drawable-hdpi/trackable_tbs.png
 delete mode 100644 main/res/drawable-ldpi/actionbar_share.png
 delete mode 100644 main/res/drawable-ldpi/hw_menu.png
 delete mode 100644 main/res/drawable-ldpi/main_about.png
 delete mode 100644 main/res/drawable-ldpi/main_settings.png
 delete mode 100644 main/res/drawable/actionbar_share.png
 delete mode 100644 main/res/drawable/hw_menu.png
 delete mode 100644 main/res/drawable/main_about.png
 delete mode 100644 main/res/drawable/main_settings.png
 delete mode 100644 main/res/drawable/my_location.png
 delete mode 100644 main/res/drawable/my_location_arrow.png
 delete mode 100644 main/res/layout/address_button.xml

(limited to 'main')

diff --git a/main/res/drawable-hdpi/actionbar_share.png b/main/res/drawable-hdpi/actionbar_share.png
deleted file mode 100644
index e748c85..0000000
Binary files a/main/res/drawable-hdpi/actionbar_share.png and /dev/null differ
diff --git a/main/res/drawable-hdpi/hw_menu.png b/main/res/drawable-hdpi/hw_menu.png
deleted file mode 100644
index 182788a..0000000
Binary files a/main/res/drawable-hdpi/hw_menu.png and /dev/null differ
diff --git a/main/res/drawable-hdpi/main_about.png b/main/res/drawable-hdpi/main_about.png
deleted file mode 100644
index a3c75cb..0000000
Binary files a/main/res/drawable-hdpi/main_about.png and /dev/null differ
diff --git a/main/res/drawable-hdpi/main_settings.png b/main/res/drawable-hdpi/main_settings.png
deleted file mode 100644
index 02b564d..0000000
Binary files a/main/res/drawable-hdpi/main_settings.png and /dev/null differ
diff --git a/main/res/drawable-hdpi/trackable_coin.png b/main/res/drawable-hdpi/trackable_coin.png
deleted file mode 100644
index 3f5138e..0000000
Binary files a/main/res/drawable-hdpi/trackable_coin.png and /dev/null differ
diff --git a/main/res/drawable-hdpi/trackable_coins.png b/main/res/drawable-hdpi/trackable_coins.png
deleted file mode 100644
index 7713407..0000000
Binary files a/main/res/drawable-hdpi/trackable_coins.png and /dev/null differ
diff --git a/main/res/drawable-hdpi/trackable_tb.png b/main/res/drawable-hdpi/trackable_tb.png
deleted file mode 100644
index 29f348c..0000000
Binary files a/main/res/drawable-hdpi/trackable_tb.png and /dev/null differ
diff --git a/main/res/drawable-hdpi/trackable_tbs.png b/main/res/drawable-hdpi/trackable_tbs.png
deleted file mode 100644
index 595f7a1..0000000
Binary files a/main/res/drawable-hdpi/trackable_tbs.png and /dev/null differ
diff --git a/main/res/drawable-ldpi/actionbar_share.png b/main/res/drawable-ldpi/actionbar_share.png
deleted file mode 100644
index 53f28fe..0000000
Binary files a/main/res/drawable-ldpi/actionbar_share.png and /dev/null differ
diff --git a/main/res/drawable-ldpi/hw_menu.png b/main/res/drawable-ldpi/hw_menu.png
deleted file mode 100644
index d1b54f4..0000000
Binary files a/main/res/drawable-ldpi/hw_menu.png and /dev/null differ
diff --git a/main/res/drawable-ldpi/main_about.png b/main/res/drawable-ldpi/main_about.png
deleted file mode 100644
index 482e511..0000000
Binary files a/main/res/drawable-ldpi/main_about.png and /dev/null differ
diff --git a/main/res/drawable-ldpi/main_settings.png b/main/res/drawable-ldpi/main_settings.png
deleted file mode 100644
index a6c46b3..0000000
Binary files a/main/res/drawable-ldpi/main_settings.png and /dev/null differ
diff --git a/main/res/drawable/actionbar_share.png b/main/res/drawable/actionbar_share.png
deleted file mode 100644
index f323732..0000000
Binary files a/main/res/drawable/actionbar_share.png and /dev/null differ
diff --git a/main/res/drawable/hw_menu.png b/main/res/drawable/hw_menu.png
deleted file mode 100644
index ba7dee9..0000000
Binary files a/main/res/drawable/hw_menu.png and /dev/null differ
diff --git a/main/res/drawable/main_about.png b/main/res/drawable/main_about.png
deleted file mode 100644
index 61abcac..0000000
Binary files a/main/res/drawable/main_about.png and /dev/null differ
diff --git a/main/res/drawable/main_settings.png b/main/res/drawable/main_settings.png
deleted file mode 100644
index a0a624e..0000000
Binary files a/main/res/drawable/main_settings.png and /dev/null differ
diff --git a/main/res/drawable/my_location.png b/main/res/drawable/my_location.png
deleted file mode 100644
index cdb58c7..0000000
Binary files a/main/res/drawable/my_location.png and /dev/null differ
diff --git a/main/res/drawable/my_location_arrow.png b/main/res/drawable/my_location_arrow.png
deleted file mode 100644
index c8401d2..0000000
Binary files a/main/res/drawable/my_location_arrow.png and /dev/null differ
diff --git a/main/res/layout/address_button.xml b/main/res/layout/address_button.xml
deleted file mode 100644
index 5369282..0000000
--- a/main/res/layout/address_button.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		android:id="@+id/button_map"
-		android:layout_height="wrap_content"
-		android:layout_width="fill_parent"
-		android:padding="5dip" >
-	<Button style="@style/button"
-			android:id="@+id/button"
-			android:singleLine="false"
-			android:gravity="left" />
-</LinearLayout>
\ No newline at end of file
diff --git a/main/res/layout/touch.xml b/main/res/layout/touch.xml
index 52378aa..de17c3d 100644
--- a/main/res/layout/touch.xml
+++ b/main/res/layout/touch.xml
@@ -23,65 +23,59 @@
 			android:orientation="vertical" >
 		<LinearLayout
 				android:layout_width="fill_parent"
-				android:layout_height="fill_parent"
+				android:layout_height="wrap_content"
 				android:layout_marginTop="10dip"
 				android:orientation="vertical" >
 			<LinearLayout
 					android:layout_width="fill_parent"
 					android:layout_height="wrap_content"
-					android:layout_marginTop="10dip"
-					android:orientation="vertical" >
-				<LinearLayout
-						android:layout_width="fill_parent"
+					android:orientation="horizontal" >
+				<Button style="@style/button"
+						android:id="@+id/type"
+						android:layout_width="0dip"
+						android:layout_weight="1"/>
+				<Button style="@style/button"
+						android:id="@+id/date"
+						android:layout_width="0dip"
+						android:layout_weight="1"/>
+			</LinearLayout>
+			<EditText style="@style/edittext"
+					android:id="@+id/tracking"
+					android:inputType="textCapCharacters"
+					android:hint="@string/trackable_code" />
+			<EditText style="@style/edittext"
+					android:id="@+id/log"
+                       android:hint="@string/log_new_log_text"
+					android:singleLine="false"
+					android:lines="5"
+					android:capitalize="sentences" />
+			<LinearLayout android:id="@+id/tweet_box"
+					android:layout_width="fill_parent"
+					android:layout_height="wrap_content"
+					android:orientation="horizontal"
+					android:layout_marginLeft="10dip"
+					android:layout_marginRight="10dip"
+					android:layout_marginBottom="5dip"
+					android:visibility="gone" >
+				<CheckBox android:id="@+id/tweet"
+						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
-						android:orientation="horizontal" >
-					<Button style="@style/button"
-							android:id="@+id/type"
-							android:layout_width="0dip"
-							android:layout_weight="1"/>
-					<Button style="@style/button"
-							android:id="@+id/date"
-							android:layout_width="0dip"
-							android:layout_weight="1"/>
-				</LinearLayout>
-				<EditText style="@style/edittext"
-						android:id="@+id/tracking"
-						android:inputType="textCapCharacters"
-						android:hint="@string/trackable_code" />
-				<EditText style="@style/edittext"
-						android:id="@+id/log"
-                        android:hint="@string/log_new_log_text"
-						android:singleLine="false"
-						android:lines="5"
-						android:capitalize="sentences" />
-				<LinearLayout android:id="@+id/tweet_box"
-						android:layout_width="fill_parent"
+						android:layout_gravity="left"
+						android:padding="1px"
+						android:gravity="center" />
+				<TextView
+						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
-						android:orientation="horizontal"
-						android:layout_marginLeft="10dip"
-						android:layout_marginRight="10dip"
-						android:layout_marginBottom="5dip"
-						android:visibility="gone" >
-					<CheckBox android:id="@+id/tweet"
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:layout_gravity="left"
-							android:padding="1px"
-							android:gravity="center" />
-					<TextView
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:layout_gravity="center_vertical"
-							android:gravity="left"
-							android:paddingRight="3dip"
-							android:textSize="14dip"
-							android:textColor="?text_color"
-							android:text="@string/visit_tweet" />
-				</LinearLayout>
-				<Button style="@style/button"
-						android:id="@+id/post"
-						android:text="@string/log_post" />
+						android:layout_gravity="center_vertical"
+						android:gravity="left"
+						android:paddingRight="3dip"
+						android:textSize="14dip"
+						android:textColor="?text_color"
+						android:text="@string/visit_tweet" />
 			</LinearLayout>
+			<Button style="@style/button"
+					android:id="@+id/post"
+					android:text="@string/log_post" />
 		</LinearLayout>
 	</ScrollView>
 </LinearLayout>
diff --git a/main/src/cgeo/geocaching/Settings.java b/main/src/cgeo/geocaching/Settings.java
index 397c8b1..1a58a85 100644
--- a/main/src/cgeo/geocaching/Settings.java
+++ b/main/src/cgeo/geocaching/Settings.java
@@ -204,10 +204,8 @@ public final class Settings {
             @Override
             public void edit(Editor edit) {
                 if (StringUtils.isBlank(memberStatus)) {
-                    // erase password
                     edit.remove(KEY_MEMBER_STATUS);
                 } else {
-                    // save password
                     edit.putString(KEY_MEMBER_STATUS, memberStatus);
                 }
             }
diff --git a/main/src/cgeo/geocaching/gcvote/GCVote.java b/main/src/cgeo/geocaching/gcvote/GCVote.java
index 663fd20..c98d4d9 100644
--- a/main/src/cgeo/geocaching/gcvote/GCVote.java
+++ b/main/src/cgeo/geocaching/gcvote/GCVote.java
@@ -118,7 +118,7 @@ public final class GCVote {
                         }
                     }
                 } catch (Exception e) {
-                    Log.w(Settings.tag, "cgBase.getRating: Failed to parse guid");
+                    Log.w(Settings.tag, "GCVote.getRating: Failed to parse guid");
                 }
                 if (guid == null) {
                     continue;
@@ -135,7 +135,7 @@ public final class GCVote {
                         }
                     }
                 } catch (Exception e) {
-                    Log.w(Settings.tag, "cgBase.getRating: Failed to parse loggedIn");
+                    Log.w(Settings.tag, "GCVote.getRating: Failed to parse loggedIn");
                 }
 
                 float rating = 0;
@@ -145,7 +145,7 @@ public final class GCVote {
                         rating = Float.parseFloat(matcherRating.group(1));
                     }
                 } catch (Exception e) {
-                    Log.w(Settings.tag, "cgBase.getRating: Failed to parse rating");
+                    Log.w(Settings.tag, "GCVote.getRating: Failed to parse rating");
                 }
                 if (rating <= 0) {
                     continue;
@@ -158,7 +158,7 @@ public final class GCVote {
                         votes = Integer.parseInt(matcherVotes.group(1));
                     }
                 } catch (Exception e) {
-                    Log.w(Settings.tag, "cgBase.getRating: Failed to parse vote count");
+                    Log.w(Settings.tag, "GCVote.getRating: Failed to parse vote count");
                 }
                 if (votes < 0) {
                     continue;
@@ -172,7 +172,7 @@ public final class GCVote {
                             myVote = Float.parseFloat(matcherVote.group(1));
                         }
                     } catch (Exception e) {
-                        Log.w(Settings.tag, "cgBase.getRating: Failed to parse user's vote");
+                        Log.w(Settings.tag, "GCVote.getRating: Failed to parse user's vote");
                     }
                 }
 
@@ -183,7 +183,7 @@ public final class GCVote {
                 }
             }
         } catch (Exception e) {
-            Log.e(Settings.tag, "cgBase.getRating: " + e.toString());
+            Log.e(Settings.tag, "GCVote.getRating: " + e.toString());
         }
 
         return ratings;
@@ -238,6 +238,10 @@ public final class GCVote {
             }
         }
 
+        if (guids.isEmpty()) {
+            return;
+        }
+
         try {
             final Map<String, GCVoteRating> ratings = GCVote.getRating(guids, null);
 
-- 
cgit v1.1