Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Highlight Install status below app version

See merge request fdroid/fdroidclient!700
This commit is contained in:
Hans-Christoph Steiner 2018-06-27 15:29:21 +00:00
commit d57b00ab7d
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
View File

@ -10,6 +10,7 @@ import android.net.Uri;
import android.support.annotation.DrawableRes; import android.support.annotation.DrawableRes;
import android.support.annotation.LayoutRes; import android.support.annotation.LayoutRes;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.content.ContextCompat;
import android.support.v4.view.ViewCompat; import android.support.v4.view.ViewCompat;
import android.support.v4.widget.TextViewCompat; import android.support.v4.widget.TextViewCompat;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
@ -33,7 +34,9 @@ import android.widget.LinearLayout;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.ImageLoader;
import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.Preferences;
import org.fdroid.fdroid.R; import org.fdroid.fdroid.R;
import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.Utils;
@ -920,7 +923,12 @@ public class AppDetailsRecyclerViewAdapter
+ " " + apk.versionName + " " + apk.versionName
+ (isSuggested ? " ☆" : "")); + (isSuggested ? " ☆" : ""));
status.setText(getInstalledStatus(apk)); String statusText = getInstalledStatus(apk);
status.setText(statusText);
if ("Installed".equals(statusText)) {
version.setTextColor(ContextCompat.getColor(context, R.color.fdroid_blue));
}
repository.setText(context.getString(R.string.repo_provider, repository.setText(context.getString(R.string.repo_provider,
RepoProvider.Helper.findById(context, apk.repoId).getName())); RepoProvider.Helper.findById(context, apk.repoId).getName()));