diff --git a/app/src/main/java/eu/faircode/email/FragmentAbout.java b/app/src/main/java/eu/faircode/email/FragmentAbout.java index 8f4b2778ad..f01c2d005d 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAbout.java +++ b/app/src/main/java/eu/faircode/email/FragmentAbout.java @@ -58,6 +58,7 @@ public class FragmentAbout extends FragmentBase { TextView tvVersion = view.findViewById(R.id.tvVersion); TextView tvRelease = view.findViewById(R.id.tvRelease); TextView tvUpdated = view.findViewById(R.id.tvUpdated); + ImageButton ibUpdate = view.findViewById(R.id.ibUpdate); TextView tvGplV3 = view.findViewById(R.id.tvGplV3); LinearLayout llContributors = view.findViewById(R.id.llContributors); @@ -77,6 +78,19 @@ public class FragmentAbout extends FragmentBase { DateFormat DF = Helper.getDateTimeInstance(context, DateFormat.SHORT, DateFormat.SHORT); tvUpdated.setText(getString(R.string.app_updated, last == 0 ? "-" : DF.format(last))); + ibUpdate.setVisibility( + Helper.hasValidFingerprint(context) || BuildConfig.DEBUG + ? View.VISIBLE : View.GONE); + ibUpdate.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (BuildConfig.PLAY_STORE_RELEASE) + Helper.view(v.getContext(), Helper.getIntentRate(v.getContext())); + else + onMenuChangelog(); + } + }); + tvGplV3.setPaintFlags(tvGplV3.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG); tvGplV3.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml index caaf4d681d..d164b2bd8c 100644 --- a/app/src/main/res/layout/fragment_about.xml +++ b/app/src/main/res/layout/fragment_about.xml @@ -25,13 +25,12 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="6dp" - android:layout_marginEnd="12dp" android:ellipsize="end" android:singleLine="true" android:text="Dinosaur" android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textStyle="italic" - app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintEnd_toStartOf="@+id/ibUpdate" app:layout_constraintStart_toEndOf="@id/tvVersion" app:layout_constraintTop_toTopOf="@id/tvVersion" /> @@ -39,10 +38,10 @@ android:id="@+id/tvUpdated" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginHorizontal="12dp" + android:layout_marginStart="12dp" android:text="@string/app_updated" android:textAppearance="@style/TextAppearance.AppCompat.Small" - app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintEnd_toStartOf="@+id/ibUpdate" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvRelease" /> @@ -50,14 +49,28 @@ android:id="@+id/tvCopyright" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginHorizontal="12dp" + android:layout_marginStart="12dp" android:layout_marginTop="12dp" android:text="@string/app_copyright" android:textAppearance="@style/TextAppearance.AppCompat.Small" - app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintEnd_toStartOf="@+id/ibUpdate" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvUpdated" /> + +