diff --git a/app/src/main/java/org/fdroid/fdroid/data/App.java b/app/src/main/java/org/fdroid/fdroid/data/App.java index a10d03512..555cf815e 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/App.java +++ b/app/src/main/java/org/fdroid/fdroid/data/App.java @@ -396,16 +396,6 @@ public class App extends ValueObject implements Comparable, Parcelable { return app; } - /** - * In order to format all in coming descriptions before they are written - * out to the database and used elsewhere, this is needed to intercept - * the setting of {@link App#description} to insert the format method. - */ - @JsonProperty("description") - private void setDescription(String description) { // NOPMD - this.description = formatDescription(description); - } - /** * Parses the {@code localized} block in the incoming index metadata, * choosing the best match in terms of locale/language while filling as @@ -508,8 +498,11 @@ public class App extends ValueObject implements Comparable, Parcelable { } } - whatsNew = getLocalizedEntry(localized, localesToUse, "whatsNew"); - String value = getLocalizedEntry(localized, localesToUse, "video"); + String value = getLocalizedEntry(localized, localesToUse, "whatsNew"); + if (!TextUtils.isEmpty(value)) { + whatsNew = value; + } + value = getLocalizedEntry(localized, localesToUse, "video"); if (!TextUtils.isEmpty(value)) { video = value.split("\n", 1)[0]; } 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 a92bb8875..1ff8a6b7f 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java @@ -505,7 +505,7 @@ public class AppDetailsRecyclerViewAdapter suggestedApk.versionName).toUpperCase(locale)); sbWhatsNew.append("\n\n"); sbWhatsNew.append(app.whatsNew); - whatsNewView.setText(sbWhatsNew); + whatsNewView.setText(trimTrailingNewlines(sbWhatsNew)); whatsNewView.setVisibility(View.VISIBLE); // Set focus on the header section to prevent auto scrolling to @@ -540,17 +540,15 @@ public class AppDetailsRecyclerViewAdapter }); if (app.antiFeatures != null && app.antiFeatures.length > 0) { StringBuilder sb = new StringBuilder(); - sb.append(""); - antiFeaturesView.setText(Html.fromHtml(sb.toString())); + antiFeaturesView.setText(trimTrailingNewlines(Html.fromHtml(sb.toString()))); antiFeaturesView.setMovementMethod(LinkMovementMethod.getInstance()); } else { antiFeaturesView.setVisibility(View.GONE); @@ -1093,7 +1091,7 @@ public class AppDetailsRecyclerViewAdapter Repo repo = RepoProvider.Helper.findById(context, apk.repoId); if (repo != null) { repository.setVisibility(View.VISIBLE); - repository.setText("Repository: " + repo.getName()); + repository.setText(String.format(repo.getName(), context.getString(R.string.app_repository))); } else { repository.setVisibility(View.INVISIBLE); } @@ -1170,7 +1168,7 @@ public class AppDetailsRecyclerViewAdapter } private String getApiText(final Apk apk) { - String apiText = "Version: "; + String apiText = "Android: "; if (apk.minSdkVersion > 0 && apk.maxSdkVersion < Apk.SDK_VERSION_MAX_VALUE) { apiText += context.getString(R.string.minsdk_up_to_maxsdk, Utils.getAndroidVersionName(apk.minSdkVersion), diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java index 15cf1b6d6..5a93e3e93 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java @@ -138,6 +138,7 @@ public class UpdatesAdapter extends RecyclerView.Adapter - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/details_panel_donate_background_dark.xml b/app/src/main/res/drawable/details_panel_donate_background_dark.xml index 722e251c6..34aefb95a 100644 --- a/app/src/main/res/drawable/details_panel_donate_background_dark.xml +++ b/app/src/main/res/drawable/details_panel_donate_background_dark.xml @@ -1,6 +1,5 @@ - \ No newline at end of file diff --git a/app/src/main/res/drawable/details_panel_donate_background_light.xml b/app/src/main/res/drawable/details_panel_donate_background_light.xml index aed890e90..229c42b8b 100644 --- a/app/src/main/res/drawable/details_panel_donate_background_light.xml +++ b/app/src/main/res/drawable/details_panel_donate_background_light.xml @@ -1,6 +1,5 @@ - \ No newline at end of file diff --git a/app/src/main/res/drawable/details_panel_donate_background_night.xml b/app/src/main/res/drawable/details_panel_donate_background_night.xml index 544639559..261466f71 100644 --- a/app/src/main/res/drawable/details_panel_donate_background_night.xml +++ b/app/src/main/res/drawable/details_panel_donate_background_night.xml @@ -1,6 +1,5 @@ - \ No newline at end of file diff --git a/app/src/main/res/layout/app_details2_header.xml b/app/src/main/res/layout/app_details2_header.xml index b525cd58e..fb0805bc2 100755 --- a/app/src/main/res/layout/app_details2_header.xml +++ b/app/src/main/res/layout/app_details2_header.xml @@ -12,13 +12,13 @@ + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:orientation="vertical"> - @@ -86,10 +85,6 @@ android:id="@+id/progress_layout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:layout_alignParentLeft="true" - android:layout_alignParentRight="true" - android:layout_alignParentStart="true" android:layout_below="@id/icon_and_name" tools:visibility="gone"> @@ -120,7 +115,7 @@ android:layout_height="wrap_content" android:layout_toLeftOf="@id/progress_cancel" android:layout_toStartOf="@id/progress_cancel" - android:text="" + tools:text="500%" android:textAppearance="@style/TextAppearance.AppCompat.Small" /> + + + android:textAppearance="@style/TextAppearance.AppCompat.Body1" /> + tools:text="\t• This app tracks and reports your activity." + android:textAppearance="@style/TextAppearance.AppCompat.Body1" /> - - - + style="@style/DetailsMoreButtonStyle" /> 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 794110c1e..8bd5fc2a7 100644 --- a/app/src/main/res/layout/app_details2_version_item.xml +++ b/app/src/main/res/layout/app_details2_version_item.xml @@ -41,9 +41,6 @@ android:layout_height="match_parent" android:paddingTop="3dp"> - - + + + android:layout_height="wrap_content" + android:background="?appDetailsCardBackground"> + android:layout_marginBottom="8dp" + android:scaleType="fitCenter" + tools:src="@drawable/ic_launcher" + tools:ignore="ContentDescription" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" /> - + app:layout_constraintBottom_toTopOf="@id/progress_bar" + android:orientation="vertical"> - + + + + +