aboutsummaryrefslogtreecommitdiffstats
path: root/main/res
diff options
context:
space:
mode:
authorcampbeb <bpcampbell@gmail.com>2013-05-08 23:59:41 -1000
committercampbeb <bpcampbell@gmail.com>2013-05-09 00:14:20 -1000
commitac558f3d7e5cc96a1c97d35430a676debbe1ff90 (patch)
tree6162c2d58c6737c00576205cd56d02bea79ac80e /main/res
parent4b95081918b795575808a5be62655b82e7ca9750 (diff)
downloadcgeo-ac558f3d7e5cc96a1c97d35430a676debbe1ff90.zip
cgeo-ac558f3d7e5cc96a1c97d35430a676debbe1ff90.tar.gz
cgeo-ac558f3d7e5cc96a1c97d35430a676debbe1ff90.tar.bz2
Fix #2685 - Don't add images each time log entry is drawn on screen
TextView with images was being added to the view each time the log entry was drawn. Instead of inflating and adding the TextView, we now use on that is arleady there and hide it if there are no images.
Diffstat (limited to 'main/res')
-rw-r--r--main/res/layout/trackable_logs_img.xml16
-rw-r--r--main/res/layout/trackable_logs_item.xml16
2 files changed, 14 insertions, 18 deletions
diff --git a/main/res/layout/trackable_logs_img.xml b/main/res/layout/trackable_logs_img.xml
deleted file mode 100644
index aaed32b..0000000
--- a/main/res/layout/trackable_logs_img.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent" >
-
- <TextView
- android:id="@+id/title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="left|top"
- android:drawableLeft="?log_img_icon"
- android:drawablePadding="3dip"
- android:textColor="?text_color"
- android:textSize="14dip" />
-
-</LinearLayout> \ No newline at end of file
diff --git a/main/res/layout/trackable_logs_item.xml b/main/res/layout/trackable_logs_item.xml
index 52a38a9..65f3e16 100644
--- a/main/res/layout/trackable_logs_item.xml
+++ b/main/res/layout/trackable_logs_item.xml
@@ -20,6 +20,7 @@
android:textSize="18dip" />
<LinearLayout
+ android:id="@+id/detail_box"
android:layout_width="102dip"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
@@ -92,7 +93,7 @@
android:layout_marginLeft="102dip"
android:orientation="vertical"
android:padding="3dip"
- android:textSize="14dip" >
+ android:textSize="14sp" >
<TextView
android:id="@+id/log"
@@ -104,7 +105,18 @@
android:gravity="left"
android:padding="3dip"
android:textColor="?text_color"
- android:textSize="14dip" />
+ android:textSize="14sp" />
+
+ <TextView
+ android:id="@+id/log_images"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="left|top"
+ android:layout_marginTop="3dip"
+ android:drawableLeft="?log_img_icon"
+ android:drawablePadding="3dip"
+ android:textColor="?text_color"
+ android:textSize="14sp" />
</LinearLayout>
</RelativeLayout> \ No newline at end of file