From 83d8398c70e6cb3c67e80243fb09ec4cb9552556 Mon Sep 17 00:00:00 2001
From: xsaco07 <xsaco07@gmail.com>
Date: Tue, 16 Oct 2018 11:15:47 -0600
Subject: [PATCH] Fix the disappearing-when-scrolling  icons in the track
 manager activity

---
 .../net/osmtracker/db/TracklistAdapter.java   |  6 +++++-
 app/src/main/res/layout/tracklist_item.xml    | 19 +++++++++++--------
 app/src/main/res/layout/trackmanager.xml      |  4 ++--
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/net/osmtracker/db/TracklistAdapter.java b/app/src/main/java/net/osmtracker/db/TracklistAdapter.java
index b3b0f3d13..98ac7b2b5 100644
--- a/app/src/main/java/net/osmtracker/db/TracklistAdapter.java
+++ b/app/src/main/java/net/osmtracker/db/TracklistAdapter.java
@@ -76,7 +76,11 @@ private View bind(Cursor cursor, View v, Context context) {
 		if (cursor.isNull(cursor.getColumnIndex(TrackContentProvider.Schema.COL_OSM_UPLOAD_DATE))) {
 			vUploadStatus.setVisibility(View.GONE);
 		}		
-		
+		else{
+			vUploadStatus.setImageResource(android.R.drawable.stat_sys_upload_done);
+			vUploadStatus.setVisibility(View.VISIBLE);
+		}
+
 		// Bind id
 		long trackId = cursor.getLong(cursor.getColumnIndex(TrackContentProvider.Schema.COL_ID));
 		String strTrackId = Long.toString(trackId);
diff --git a/app/src/main/res/layout/tracklist_item.xml b/app/src/main/res/layout/tracklist_item.xml
index e998fecec..a66718b61 100644
--- a/app/src/main/res/layout/tracklist_item.xml
+++ b/app/src/main/res/layout/tracklist_item.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_height="fill_parent" android:layout_width="fill_parent"
 		android:orientation="horizontal"
-		android:gravity="left|center_vertical"
+		android:gravity="start|center_vertical"
 		android:paddingLeft="3dp" android:paddingRight="3dp" android:paddingTop="5dp" android:paddingBottom="5dp"
 		>
 
@@ -10,37 +10,39 @@
 		android:text="{id}"
 		android:layout_height="fill_parent" android:layout_width="wrap_content"
 		style="@android:style/TextAppearance.Medium"
-		android:gravity="left|center_vertical" android:layout_marginRight="5dp"/>
+		android:gravity="start|center_vertical" android:layout_marginRight="5dp"/>
 
 	<RelativeLayout android:layout_height="fill_parent"
-		android:gravity="left|center_vertical" android:layout_width="0dip" android:layout_weight="1">
+		android:gravity="start|center_vertical" android:layout_width="0dip" android:layout_weight="1">
 
 		<TextView android:layout_height="wrap_content" android:id="@+id/trackmgr_item_nameordate"
 			android:text="{start_date}" android:layout_width="wrap_content" style="@android:style/TextAppearance.Large"/>
 
 		<TextView android:layout_height="wrap_content" android:id="@+id/trackmgr_item_waypoints" android:layout_below="@+id/trackmgr_item_nameordate"
 			android:textStyle="bold" android:layout_marginRight="3dp" style="@android:style/TextAppearance.Small" android:text="@string/trackmgr_waypoints_count"
-			android:layout_width="wrap_content"></TextView>
+			android:layout_width="wrap_content"/>
 
 		<TextView android:layout_height="wrap_content"
 			android:layout_below="@id/trackmgr_item_nameordate" android:id="@+id/trackmgr_item_wps"
 			android:layout_toRightOf="@id/trackmgr_item_waypoints" android:text="{x}"
-			style="@android:style/TextAppearance.Small" android:layout_width="wrap_content"></TextView>
+			style="@android:style/TextAppearance.Small" android:layout_width="wrap_content"/>
+
 		<TextView android:layout_height="wrap_content" android:id="@+id/trackmgr_item_trackpoints" android:layout_toRightOf="@id/trackmgr_item_wps"
 			android:layout_below="@id/trackmgr_item_nameordate" android:layout_marginLeft="8dp"
 			android:textStyle="bold" android:layout_marginRight="3dp" style="@android:style/TextAppearance.Small"
-			android:text="@string/trackmgr_trackpoints_count" android:layout_width="wrap_content"></TextView>
+			android:text="@string/trackmgr_trackpoints_count" android:layout_width="wrap_content"/>
 		<TextView android:layout_height="wrap_content"
 			android:text="{y}" android:id="@+id/trackmgr_item_tps" android:layout_below="@id/trackmgr_item_nameordate"
-			android:layout_toRightOf="@id/trackmgr_item_trackpoints" style="@android:style/TextAppearance.Small" android:layout_width="wrap_content"></TextView>
+			android:layout_toRightOf="@id/trackmgr_item_trackpoints" style="@android:style/TextAppearance.Small" android:layout_width="wrap_content"/>
 				
 	</RelativeLayout>
-	
+
 	<ImageView android:id="@+id/trackmgr_item_statusicon"
 		android:layout_height="fill_parent" android:layout_width="wrap_content"
 		android:src="@android:drawable/presence_online"
 		android:paddingLeft="3dp"
 		android:layout_marginRight="3dp"
+		android:layout_marginLeft="3dp"
 		android:layout_gravity="center_horizontal|center_vertical"
 		android:paddingRight="3dp"
 		android:contentDescription="@string/acc.track_status" />
@@ -50,6 +52,7 @@
 		android:src="@android:drawable/stat_sys_upload_done"
 		android:paddingLeft="3dp"
 		android:layout_marginRight="3dp"
+		android:layout_marginLeft="3dp"
 		android:layout_gravity="center_horizontal|center_vertical"
 		android:paddingRight="3dp"
 		android:contentDescription="@string/acc.upload_status" />
diff --git a/app/src/main/res/layout/trackmanager.xml b/app/src/main/res/layout/trackmanager.xml
index 71137a4d6..fb14da310 100644
--- a/app/src/main/res/layout/trackmanager.xml
+++ b/app/src/main/res/layout/trackmanager.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="vertical" android:layout_height="fill_parent" android:layout_width="fill_parent">
-	<TextView android:layout_height="wrap_content" android:gravity="center_horizontal" android:layout_width="fill_parent" style="@android:style/TextAppearance.Large" android:text="@string/trackmgr_tracklist" android:paddingBottom="5dp"></TextView>
+	<TextView android:layout_height="wrap_content" android:gravity="center_horizontal" android:layout_width="fill_parent" style="@android:style/TextAppearance.Large" android:text="@string/trackmgr_tracklist" android:paddingBottom="5dp"/>
 	<FrameLayout android:layout_weight="1" android:layout_width="fill_parent"
 		android:layout_height="0dip" android:padding="3dp">
 
 		<ListView android:layout_width="fill_parent" android:layout_height="fill_parent"
-			android:id="@id/android:list"></ListView>
+			android:id="@id/android:list"> </ListView>
 
 		<TextView android:text="@string/trackmgr_empty" android:padding="5dp"
 			android:id="@+id/trackmgr_empty" android:layout_width="fill_parent" android:layout_height="fill_parent"