From f7049a3295f917745ce4a8f22b14cdb3a53f9dda Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 20 Dec 2018 13:14:18 +0100
Subject: [PATCH] display versionCode in expanded Versions list entries

closes #1326
---
 .../views/AppDetailsRecyclerViewAdapter.java       |  5 +++++
 .../main/res/layout/app_details2_version_item.xml  | 14 +++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
index 7aabfd459..56f90a588 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
@@ -1010,6 +1010,7 @@ public class AppDetailsRecyclerViewAdapter
         final TextView statusInstalled;
         final TextView statusSuggested;
         final TextView statusIncompatible;
+        final TextView versionCode;
         final TextView added;
         final ImageView expandArrow;
         final View expandedLayout;
@@ -1031,6 +1032,7 @@ public class AppDetailsRecyclerViewAdapter
             statusInstalled = (TextView) view.findViewById(R.id.status_installed);
             statusSuggested = (TextView) view.findViewById(R.id.status_suggested);
             statusIncompatible = (TextView) view.findViewById(R.id.status_incompatible);
+            versionCode = view.findViewById(R.id.versionCode);
             added = (TextView) view.findViewById(R.id.added);
             expandArrow = (ImageView) view.findViewById(R.id.expand_arrow);
             expandedLayout = (View) view.findViewById(R.id.expanded_layout);
@@ -1121,6 +1123,7 @@ public class AppDetailsRecyclerViewAdapter
 
             // Display when the expert mode is enabled
             if (Preferences.get().expertMode()) {
+                versionCode.setText(String.format(Locale.ENGLISH, " (%d) ", apk.versionCode));
                 // Display incompatible reasons when the app isn't compatible
                 if (!apk.compatible) {
                     String incompatibleReasonsText = getIncompatibleReasonsText(apk);
@@ -1143,6 +1146,7 @@ public class AppDetailsRecyclerViewAdapter
                     incompatibleReasons.setVisibility(View.GONE);
                 }
             } else {
+                versionCode.setText("");
                 incompatibleReasons.setVisibility(View.GONE);
                 targetArch.setVisibility(View.GONE);
             }
@@ -1244,6 +1248,7 @@ public class AppDetailsRecyclerViewAdapter
         private void expand(boolean expand) {
             versionsExpandTracker.put(apk.apkName, expand);
             expandedLayout.setVisibility(expand ? View.VISIBLE : View.GONE);
+            versionCode.setVisibility(expand ? View.VISIBLE : View.GONE);
             expandArrow.setImageDrawable(ContextCompat.getDrawable(context, expand ?
                     R.drawable.ic_expand_less_grey600 : R.drawable.ic_expand_more_grey600));
 
diff --git a/app/src/main/res/layout/app_details2_version_item.xml b/app/src/main/res/layout/app_details2_version_item.xml
index 8bd5fc2a7..2e97fff14 100644
--- a/app/src/main/res/layout/app_details2_version_item.xml
+++ b/app/src/main/res/layout/app_details2_version_item.xml
@@ -27,6 +27,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
+                <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent">
+
                 <TextView android:id="@+id/version"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -36,6 +40,15 @@
                     android:textSize="18sp"
                     tools:text="1.2.3"/>
 
+                    <TextView android:id="@+id/versionCode"
+                              android:layout_height="wrap_content"
+                              android:layout_width="wrap_content"
+                              android:layout_gravity="center"
+                              android:singleLine="true"
+                              android:textSize="14sp"
+                              android:visibility="gone" />
+                </LinearLayout>
+
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
@@ -58,7 +71,6 @@
                         android:text="@string/app_incompatible" />
                 </LinearLayout>
             </LinearLayout>
-
             <TextView android:id="@+id/added"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"