From e7865effac369b57eb04cd5bf5cee27bc4e0bb36 Mon Sep 17 00:00:00 2001
From: Bars107 <barsik107@gmail.com>
Date: Tue, 17 Feb 2015 15:07:17 +0200
Subject: [PATCH] DownloadInex updated ui

---
 .../res/layout/download_index_list_item.xml   | 11 ++++++++
 .../layout/expandable_list_item_category.xml  |  4 +--
 OsmAnd/res/values/styles.xml                  |  4 +--
 .../plus/download/DownloadIndexAdapter.java   | 27 ++++++++++++++++---
 4 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/OsmAnd/res/layout/download_index_list_item.xml b/OsmAnd/res/layout/download_index_list_item.xml
index 8c1d06da96..bff2270339 100644
--- a/OsmAnd/res/layout/download_index_list_item.xml
+++ b/OsmAnd/res/layout/download_index_list_item.xml
@@ -54,6 +54,17 @@
 				android:textSize="@dimen/download_descr_text_size"
 				tools:text="@string/lorem_ipsum"
 				android:maxLines="1"/>
+
+			<TextView
+				android:id="@+id/uptodate_descr"
+				style="@style/ListText.Small"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:textSize="@dimen/download_descr_text_size"
+				tools:text="@string/lorem_ipsum"
+				android:visibility="gone"
+				android:maxLines="1"/>
+
 		</LinearLayout>
 
 	</LinearLayout>
diff --git a/OsmAnd/res/layout/expandable_list_item_category.xml b/OsmAnd/res/layout/expandable_list_item_category.xml
index 4da379f717..1dfe7cf19e 100644
--- a/OsmAnd/res/layout/expandable_list_item_category.xml
+++ b/OsmAnd/res/layout/expandable_list_item_category.xml
@@ -3,7 +3,8 @@
 			  xmlns:tools="http://schemas.android.com/tools"
 			  android:orientation="horizontal"
 			  android:layout_width="fill_parent"
-			  android:layout_height="@dimen/list_header_height"
+			  android:layout_height="wrap_content"
+			  android:minHeight="@dimen/list_header_height"
 			  android:paddingLeft="@dimen/list_header_padding">
 
 	<ImageView
@@ -19,7 +20,6 @@
 		android:layout_height="wrap_content"
 		android:layout_marginLeft="@dimen/list_header_text_left_margin"
 		android:layout_marginTop="@dimen/list_header_top_margin"
-		android:maxLines="1"
 		android:textSize="@dimen/list_header_text_size"
 		tools:text="@string/lorem_ipsum"/>
 
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 2c7a89f958..85ef97eb02 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -164,7 +164,7 @@
 		<item name="expandable_list_item_background">@color/expandable_list_item_light</item>
 		<item name="expandable_list_background">@color/color_white</item>
 		<item name="list_settings_icon">@drawable/ic_overflow_menu_light</item>
-		<item name="size_progress_bar">@drawable/size_progressbar_dark</item>
+		<item name="size_progress_bar">@drawable/size_progressbar_light</item>
 	</style>
 
     <style name="OsmandDarkTheme" parent="Theme.AppCompat">
@@ -206,7 +206,7 @@
 		<item name="expandable_list_item_background">@color/list_item_background_dark</item>
 		<item name="expandable_list_background">@color/list_background_dark</item>
 		<item name="list_settings_icon">@drawable/ic_overflow_menu_dark</item>
-		<item name="size_progress_bar">@drawable/size_progressbar_light</item>
+		<item name="size_progress_bar">@drawable/size_progressbar_dark</item>
 	</style>
 
     <style name="Widget.Styled.ActionBarDark" parent="Widget.AppCompat.Light.ActionBar.Solid.Inverse">
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadIndexAdapter.java b/OsmAnd/src/net/osmand/plus/download/DownloadIndexAdapter.java
index a46bff46a0..b451a74eaa 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadIndexAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadIndexAdapter.java
@@ -228,8 +228,10 @@ public class DownloadIndexAdapter extends OsmandBaseExpandableListAdapter implem
 		}
 		final View row = v;
 		TextView name = (TextView) row.findViewById(R.id.name);
-		TextView edition = (TextView) row.findViewById(R.id.update_descr);
-		edition.setText("");
+		TextView update = (TextView) row.findViewById(R.id.update_descr);
+		update.setText("");
+		TextView uptodate = (TextView) row.findViewById(R.id.uptodate_descr);
+		uptodate.setText("");
 		TextView description = (TextView) row.findViewById(R.id.download_descr);
 		IndexItem e = (IndexItem) getChild(groupPosition, childPosition);
 		OsmandApplication clctx = downloadFragment.getMyApplication();
@@ -264,21 +266,38 @@ public class DownloadIndexAdapter extends OsmandBaseExpandableListAdapter implem
 					}
 				} else if (e.getDate(format) != null) {
 					String sfName = e.getTargetFileName();
+
 					final boolean updatableResource = indexActivatedFileNames.containsKey(sfName);
 					if (updatableResource && !DownloadActivity.downloadListIndexThread.checkIfItemOutdated(e)) {
 						description.setText(indexActivatedFileNames.get(sfName) + " " + e.getSizeDescription(clctx));
+						//up to date
+						uptodate.setText(downloadFragment.getResources().getString(R.string.local_index_installed) + " : "
+								+ indexActivatedFileNames.get(sfName));
+						uptodate.setVisibility(View.VISIBLE);
+						update.setVisibility(View.GONE);
 					} else if (indexFileNames.containsKey(sfName) && !DownloadActivity.downloadListIndexThread.checkIfItemOutdated(e)) {
 						description.setText(indexFileNames.get(sfName) + " " + e.getSizeDescription(clctx));
+						//up to date
+						uptodate.setText(downloadFragment.getResources().getString(R.string.local_index_installed) + " : "
+								+ indexFileNames.get(sfName));
+						uptodate.setVisibility(View.VISIBLE);
+						update.setVisibility(View.GONE);
 					} else if (updatableResource) {
 						String updatedDescr =  indexActivatedFileNames.get(sfName) + " " + e.getSizeDescription(clctx);
 						description.setText(updatedDescr);
-						edition.setText(downloadFragment.getResources().getString(R.string.local_index_installed) + " : "
+						//needed to be updated
+						update.setText(downloadFragment.getResources().getString(R.string.local_index_installed) + " : "
 								+ e.getDate(format));
+						uptodate.setVisibility(View.GONE);
+						update.setVisibility(View.VISIBLE);
 					} else {
 						description.setText(name.getText() + "\n" + downloadFragment.getResources().getString(R.string.local_index_installed) + " : "
 								+ indexFileNames.get(sfName));
-						edition.setText(downloadFragment.getResources().getString(R.string.local_index_installed) + " : "
+						//needed to be updated
+						update.setText(downloadFragment.getResources().getString(R.string.local_index_installed) + " : "
 								+ e.getDate(format));
+						uptodate.setVisibility(View.GONE);
+						update.setVisibility(View.VISIBLE);
 					}
 				}
 			}