diff options
| author | cyBerta <cyberta@riseup.net> | 2020-07-25 22:19:42 +0200 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2020-07-25 22:19:42 +0200 |
| commit | d184c6e0a63467e1a18d35b0bc5fa0991cfc5e98 (patch) | |
| tree | 7898f77396b103ee32be60826cedeae5bab8fb05 /app/src/main | |
| parent | 023fa0e8d18a95e4fecb256fd4e4a1e6488c3df8 (diff) | |
fix rounded image in donation dialog for Android 4 devices
Diffstat (limited to 'app/src/main')
| -rw-r--r-- | app/src/main/res/layout/donation_reminder_dialog.xml | 16 | ||||
| -rw-r--r-- | app/src/main/res/layout/f_about.xml | 15 | ||||
| -rw-r--r-- | app/src/main/res/values/untranslatable.xml | 3 |
3 files changed, 22 insertions, 12 deletions
diff --git a/app/src/main/res/layout/donation_reminder_dialog.xml b/app/src/main/res/layout/donation_reminder_dialog.xml index dc16906b..3af36086 100644 --- a/app/src/main/res/layout/donation_reminder_dialog.xml +++ b/app/src/main/res/layout/donation_reminder_dialog.xml @@ -32,20 +32,12 @@ android:gravity="center" android:text="@string/donate_message" /> - <androidx.cardview.widget.CardView + <de.hdodenhof.circleimageview.CircleImageView + android:id="@+id/donation_logo" android:layout_width="120dp" android:layout_height="120dp" - android:innerRadius="0dp" - android:shape="ring" - app:cardCornerRadius="60dp"> - <ImageView - android:id="@+id/donation_logo" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:scaleType="centerCrop" - app:srcCompat="@drawable/donation_img" /> - </androidx.cardview.widget.CardView> - + android:src="@drawable/donation_img" + /> <Button android:id="@+id/btnDonate" diff --git a/app/src/main/res/layout/f_about.xml b/app/src/main/res/layout/f_about.xml index 86be3a56..22053054 100644 --- a/app/src/main/res/layout/f_about.xml +++ b/app/src/main/res/layout/f_about.xml @@ -250,6 +250,21 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copyright_shapeshifter_transports" /> + + <Space + android:layout_width="match_parent" + android:layout_height="20sp" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/circleImageView" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/copyright_circleImageView" /> </LinearLayout> </ScrollView> diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml index 50e44fce..0d680b96 100644 --- a/app/src/main/res/values/untranslatable.xml +++ b/app/src/main/res/values/untranslatable.xml @@ -41,4 +41,7 @@ <string name="copyright_shapeshifter_transports" translatable="false">Copyright (c) 2014, Yawning Angel (yawning at torproject dot org) \n All rights reserved.</string> <string name="shapeshifter_dispatcher" translatable="false">Shapeshifter Dispatcher</string> <string name="copyright_shapeshifter_dispatcher" translatable="false">Copyright (c) 2014, Yawning Angel (yawning at torproject dot org) \n All rights reserved.</string> + <string name="circleImageView" translatable="false">CircleImageView</string> + <string name="copyright_circleImageView" translatable="false">Copyright 2014 - 2020 Henning Dodenhof. Licensed under the Apache License, Version 2.0 </string> + </resources> |