From 3434d7156920adf92eb26bf8d9c4a4660b2a0da2 Mon Sep 17 00:00:00 2001
From: relan <relan@users.noreply.github.com>
Date: Wed, 23 Sep 2015 18:34:51 +0300
Subject: [PATCH] Split "unsigned" and "unverified"

Since now we don't have problems with list item height, we can use two
different text labels for unsigned and unverified repositories
indication. Code now only switches visibility for them.
---
 F-Droid/res/layout/repo_item.xml                 | 11 +++++++++++
 .../src/org/fdroid/fdroid/views/RepoAdapter.java | 16 ++++++++--------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/F-Droid/res/layout/repo_item.xml b/F-Droid/res/layout/repo_item.xml
index 7591535d7..98ca468c4 100644
--- a/F-Droid/res/layout/repo_item.xml
+++ b/F-Droid/res/layout/repo_item.xml
@@ -30,6 +30,17 @@
             android:singleLine="true"
             android:ellipsize="marquee"/>
 
+        <TextView
+            android:id="@+id/repo_unverified"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical|start"
+            android:text="@string/unverified"
+            android:textSize="14sp"
+            android:textColor="@color/unverified"
+            android:singleLine="true"
+            android:ellipsize="marquee"/>
+
         <TextView
             android:id="@+id/repo_unsigned"
             android:layout_width="wrap_content"
diff --git a/F-Droid/src/org/fdroid/fdroid/views/RepoAdapter.java b/F-Droid/src/org/fdroid/fdroid/views/RepoAdapter.java
index c452e1a6f..ecb771e47 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/RepoAdapter.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/RepoAdapter.java
@@ -84,17 +84,17 @@ public class RepoAdapter extends CursorAdapter {
         TextView nameView = (TextView)view.findViewById(R.id.repo_name);
         nameView.setText(repo.getName());
 
-        TextView signedView = (TextView) view.findViewById(R.id.repo_unsigned);
+        View unsignedView = view.findViewById(R.id.repo_unsigned);
+        View unverifiedView = view.findViewById(R.id.repo_unverified);
         if (repo.isSigned()) {
-            signedView.setVisibility(View.GONE);
+            unsignedView.setVisibility(View.GONE);
+            unverifiedView.setVisibility(View.GONE);
         } else if (repo.isSignedButUnverified()) {
-            signedView.setText(R.string.unverified);
-            signedView.setTextColor(view.getResources().getColor(R.color.unverified));
-            signedView.setVisibility(View.VISIBLE);
+            unsignedView.setVisibility(View.GONE);
+            unverifiedView.setVisibility(View.VISIBLE);
         } else {
-            signedView.setText(R.string.unsigned);
-            signedView.setTextColor(view.getResources().getColor(R.color.unsigned));
-            signedView.setVisibility(View.VISIBLE);
+            unsignedView.setVisibility(View.VISIBLE);
+            unverifiedView.setVisibility(View.GONE);
         }
     }
 }