aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--main/res/layout/cacheview_logs_item.xml120
-rw-r--r--main/res/layout/logs_item.xml79
-rw-r--r--main/res/layout/trackable_logs_item.xml122
-rw-r--r--main/res/values/styles.xml40
-rw-r--r--main/src/cgeo/geocaching/CacheDetailActivity.java6
-rw-r--r--main/src/cgeo/geocaching/TrackableActivity.java6
6 files changed, 125 insertions, 248 deletions
diff --git a/main/res/layout/cacheview_logs_item.xml b/main/res/layout/cacheview_logs_item.xml
deleted file mode 100644
index 7bb12d2..0000000
--- a/main/res/layout/cacheview_logs_item.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:paddingBottom="3dip"
- android:paddingTop="3dip" >
-
- <TextView
- android:id="@+id/author"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_alignParentTop="true"
- android:layout_gravity="left|top"
- android:ellipsize="marquee"
- android:lines="1"
- android:scrollHorizontally="true"
- android:singleLine="true"
- android:textColor="?text_color"
- android:textSize="18sp" />
-
- <LinearLayout
- android:id="@+id/detail_box"
- android:layout_width="82dip"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_below="@id/author"
- android:layout_gravity="left|top"
- android:orientation="horizontal" >
-
- <LinearLayout
- android:layout_width="80dip"
- android:layout_height="wrap_content"
- android:layout_gravity="right|top"
- android:orientation="vertical"
- android:padding="3dip" >
-
- <TextView
- android:id="@+id/added"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right"
- android:ellipsize="marquee"
- android:gravity="left"
- android:lines="1"
- android:scrollHorizontally="true"
- android:singleLine="true"
- android:textColor="?text_color_headline"
- android:textSize="14sp" />
-
- <TextView
- android:id="@+id/type"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right"
- android:ellipsize="marquee"
- android:gravity="left"
- android:lines="1"
- android:scrollHorizontally="true"
- android:singleLine="true"
- android:textColor="?text_color_headline"
- android:textSize="14sp" />
-
- <TextView
- android:id="@+id/count"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right"
- android:ellipsize="marquee"
- android:gravity="left"
- android:lines="1"
- android:scrollHorizontally="true"
- android:singleLine="true"
- android:textColor="?text_color_headline"
- android:textSize="14sp" />
- </LinearLayout>
-
- <ImageView
- android:id="@+id/log_mark"
- android:layout_width="2dip"
- android:layout_height="fill_parent"
- android:layout_marginBottom="2dip"
- android:layout_marginTop="2dip"
- android:scaleType="fitXY"
- android:src="@drawable/mark_green" />
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/log_layout"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_toRightOf="@id/detail_box"
- android:orientation="vertical"
- android:paddingLeft="3dip"
- android:textSize="14sp" >
-
- <TextView
- android:id="@+id/log"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="left"
- android:layout_marginTop="22dip"
- android:gravity="left"
- android:linksClickable="true"
- android:textColor="?text_color"
- 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
diff --git a/main/res/layout/logs_item.xml b/main/res/layout/logs_item.xml
new file mode 100644
index 0000000..6bfe30a
--- /dev/null
+++ b/main/res/layout/logs_item.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingBottom="3dip"
+ android:paddingTop="3dip" >
+
+ <TextView
+ android:id="@+id/author"
+ style="@style/logitem_author" />
+
+ <LinearLayout
+ android:id="@+id/detail_box"
+ android:layout_width="102dip"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_below="@id/author"
+ android:layout_gravity="left|top"
+ android:orientation="horizontal" >
+
+ <LinearLayout
+ android:layout_width="100dip"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right|top"
+ android:orientation="vertical"
+ android:padding="3dip" >
+
+ <TextView
+ android:id="@+id/added"
+ style="@style/logitem_property" />
+
+ <TextView
+ android:id="@+id/type"
+ style="@style/logitem_property" />
+
+ <TextView
+ android:id="@+id/count_or_location"
+ style="@style/logitem_property" />
+ </LinearLayout>
+
+ <ImageView
+ android:id="@+id/log_mark"
+ style="@style/logitem_mark" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/log_layout"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_toRightOf="@id/detail_box"
+ android:orientation="vertical"
+ android:paddingLeft="3dip"
+ android:textSize="14sp" >
+
+ <TextView
+ android:id="@+id/log"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="left"
+ android:layout_marginTop="22dip"
+ android:autoLink="web"
+ android:gravity="left"
+ android:linksClickable="true"
+ android:textColor="?text_color"
+ 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
diff --git a/main/res/layout/trackable_logs_item.xml b/main/res/layout/trackable_logs_item.xml
deleted file mode 100644
index d28231c..0000000
--- a/main/res/layout/trackable_logs_item.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:paddingBottom="3dip"
- android:paddingTop="3dip" >
-
- <TextView
- android:id="@+id/author"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_alignParentTop="true"
- android:layout_gravity="left|top"
- android:ellipsize="marquee"
- android:lines="1"
- android:scrollHorizontally="true"
- android:singleLine="true"
- android:textColor="?text_color"
- android:textSize="18sp" />
-
- <LinearLayout
- android:id="@+id/detail_box"
- android:layout_width="102dip"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_alignParentTop="true"
- android:layout_gravity="left|top"
- android:layout_marginTop="22dip"
- android:orientation="horizontal" >
-
- <LinearLayout
- android:layout_width="100dip"
- android:layout_height="wrap_content"
- android:layout_gravity="right|top"
- android:orientation="vertical"
- android:padding="3dip" >
-
- <TextView
- android:id="@+id/added"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right"
- android:ellipsize="marquee"
- android:gravity="left"
- android:lines="1"
- android:scrollHorizontally="true"
- android:singleLine="true"
- android:textColor="?text_color_headline"
- android:textSize="14sp" />
-
- <TextView
- android:id="@+id/type"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right"
- android:ellipsize="marquee"
- android:gravity="left"
- android:lines="1"
- android:scrollHorizontally="true"
- android:singleLine="true"
- android:textColor="?text_color_headline"
- android:textSize="14sp" />
-
- <TextView
- android:id="@+id/location"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right"
- android:ellipsize="marquee"
- android:gravity="left"
- android:lines="1"
- android:scrollHorizontally="true"
- android:singleLine="true"
- android:textColor="?text_color_headline"
- android:textSize="14sp" />
- </LinearLayout>
-
- <ImageView
- android:id="@+id/log_mark"
- android:layout_width="2dip"
- android:layout_height="fill_parent"
- android:layout_marginBottom="2dip"
- android:layout_marginTop="2dip"
- android:scaleType="fitXY"
- android:src="@drawable/mark_green" />
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/log_layout"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="102dip"
- android:orientation="vertical"
- android:padding="3dip"
- android:textSize="14sp" >
-
- <TextView
- android:id="@+id/log"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="left"
- android:layout_marginTop="22dip"
- android:autoLink="web"
- android:gravity="left"
- android:padding="3dip"
- android:textColor="?text_color"
- 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
diff --git a/main/res/values/styles.xml b/main/res/values/styles.xml
index 61554cb..da60d0c 100644
--- a/main/res/values/styles.xml
+++ b/main/res/values/styles.xml
@@ -294,4 +294,44 @@
<item name="android:textColor">@android:color/white</item>
</style>
+ <!-- author of a log item -->
+ <style name="logitem_author">
+ <item name="android:id">@+id/author</item>
+ <item name="android:layout_width">wrap_content</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:layout_alignParentLeft">true</item>
+ <item name="android:layout_alignParentTop">true</item>
+ <item name="android:layout_gravity">left|top</item>
+ <item name="android:ellipsize">marquee</item>
+ <item name="android:lines">1</item>
+ <item name="android:scrollHorizontally">true</item>
+ <item name="android:singleLine">true</item>
+ <item name="android:textColor">?text_color</item>
+ <item name="android:textSize">18sp</item>
+ </style>
+
+ <!-- date, found state on the left of a log entry -->
+ <style name="logitem_property">
+ <item name="android:layout_width">wrap_content</item>
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:layout_gravity">right</item>
+ <item name="android:ellipsize">marquee</item>
+ <item name="android:gravity">left</item>
+ <item name="android:lines">1</item>
+ <item name="android:scrollHorizontally">true</item>
+ <item name="android:singleLine">true</item>
+ <item name="android:textColor">?text_color_headline</item>
+ <item name="android:textSize">14sp</item>
+ </style>
+
+ <!-- separator between log author and log content -->
+ <style name="logitem_mark">
+ <item name="android:layout_width">2dip</item>
+ <item name="android:layout_height">fill_parent</item>
+ <item name="android:layout_marginBottom">2dip</item>
+ <item name="android:layout_marginTop">2dip</item>
+ <item name="android:scaleType">fitXY</item>
+ <item name="android:src">@drawable/mark_green</item>
+ </style>
+
</resources> \ No newline at end of file
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index ac9d4b9..bdc1921 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -2143,7 +2143,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
}
final List<LogEntry> logs = allLogs ? cache.getLogs() : cache.getFriendsLogs();
- view.setAdapter(new ArrayAdapter<LogEntry>(CacheDetailActivity.this, R.layout.cacheview_logs_item, logs) {
+ view.setAdapter(new ArrayAdapter<LogEntry>(CacheDetailActivity.this, R.layout.logs_item, logs) {
final UserActionsClickListener userActionsClickListener = new UserActionsClickListener();
final DecryptTextClickListener decryptTextClickListener = new DecryptTextClickListener();
@@ -2151,7 +2151,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
public View getView(final int position, final View convertView, final ViewGroup parent) {
View rowView = convertView;
if (null == rowView) {
- rowView = getLayoutInflater().inflate(R.layout.cacheview_logs_item, null);
+ rowView = getLayoutInflater().inflate(R.layout.logs_item, null);
}
LogViewHolder holder = (LogViewHolder) rowView.getTag();
if (null == holder) {
@@ -2277,7 +2277,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
date = (TextView) base.findViewById(R.id.added);
type = (TextView) base.findViewById(R.id.type);
author = (TextView) base.findViewById(R.id.author);
- count = (TextView) base.findViewById(R.id.count);
+ count = (TextView) base.findViewById(R.id.count_or_location);
text = (TextView) base.findViewById(R.id.log);
images = (TextView) base.findViewById(R.id.log_images);
statusMarker = (ImageView) base.findViewById(R.id.log_mark);
diff --git a/main/src/cgeo/geocaching/TrackableActivity.java b/main/src/cgeo/geocaching/TrackableActivity.java
index 001ef2f..1295181 100644
--- a/main/src/cgeo/geocaching/TrackableActivity.java
+++ b/main/src/cgeo/geocaching/TrackableActivity.java
@@ -391,7 +391,7 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi
@InjectView(R.id.added) protected TextView added ;
@InjectView(R.id.type) protected TextView type;
@InjectView(R.id.author) protected TextView author;
- @InjectView(R.id.location) protected TextView location;
+ @InjectView(R.id.count_or_location) protected TextView location;
@InjectView(R.id.log) protected TextView text;
@InjectView(R.id.log_images) protected TextView images;
@InjectView(R.id.log_mark) protected ImageView marker;
@@ -407,12 +407,12 @@ public class TrackableActivity extends AbstractViewPagerActivity<TrackableActivi
view = (ListView) getLayoutInflater().inflate(R.layout.trackable_logs_view, null);
if (trackable != null && trackable.getLogs() != null) {
- view.setAdapter(new ArrayAdapter<LogEntry>(TrackableActivity.this, R.layout.trackable_logs_item, trackable.getLogs()) {
+ view.setAdapter(new ArrayAdapter<LogEntry>(TrackableActivity.this, R.layout.logs_item, trackable.getLogs()) {
@Override
public View getView(int position, View convertView, android.view.ViewGroup parent) {
View rowView = convertView;
if (null == rowView) {
- rowView = getLayoutInflater().inflate(R.layout.trackable_logs_item, null);
+ rowView = getLayoutInflater().inflate(R.layout.logs_item, null);
}
LogViewHolder holder = (LogViewHolder) rowView.getTag();
if (null == holder) {
generated by cgit v1.1 at 2025-11-10 18:22:01 +0000