refactoring: cleanups

* remove unused resources
* fix some comments, layout, logging and other stuff

20 files changed, 45 insertions, 62 deletions

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
--- a/main/res/drawable-hdpi/actionbar_share.png
+++ /dev/null
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
--- a/main/res/drawable-hdpi/hw_menu.png
+++ /dev/null
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
--- a/main/res/drawable-hdpi/main_about.png
+++ /dev/null
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
--- a/main/res/drawable-hdpi/main_settings.png
+++ /dev/null
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
--- a/main/res/drawable-hdpi/trackable_coin.png
+++ /dev/null
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
--- a/main/res/drawable-hdpi/trackable_coins.png
+++ /dev/null
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
--- a/main/res/drawable-hdpi/trackable_tb.png
+++ /dev/null
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
--- a/main/res/drawable-hdpi/trackable_tbs.png
+++ /dev/null
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
--- a/main/res/drawable-ldpi/actionbar_share.png
+++ /dev/null
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
--- a/main/res/drawable-ldpi/hw_menu.png
+++ /dev/null
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
--- a/main/res/drawable-ldpi/main_about.png
+++ /dev/null
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
--- a/main/res/drawable-ldpi/main_settings.png
+++ /dev/null
diff --git a/main/res/drawable/actionbar_share.png b/main/res/drawable/actionbar_share.png
deleted file mode 100644
index f323732..0000000
--- a/main/res/drawable/actionbar_share.png
+++ /dev/null
diff --git a/main/res/drawable/hw_menu.png b/main/res/drawable/hw_menu.png
deleted file mode 100644
index ba7dee9..0000000
--- a/main/res/drawable/hw_menu.png
+++ /dev/null
diff --git a/main/res/drawable/main_about.png b/main/res/drawable/main_about.png
deleted file mode 100644
index 61abcac..0000000
--- a/main/res/drawable/main_about.png
+++ /dev/null
diff --git a/main/res/drawable/main_settings.png b/main/res/drawable/main_settings.png
deleted file mode 100644
index a0a624e..0000000
--- a/main/res/drawable/main_settings.png
+++ /dev/null
diff --git a/main/res/drawable/my_location.png b/main/res/drawable/my_location.png
deleted file mode 100644
index cdb58c7..0000000
--- a/main/res/drawable/my_location.png
+++ /dev/null
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
--- a/main/res/drawable/my_location_arrow.png
+++ /dev/null
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>