From c05e5f15ab00d82f6f4f83ec297123850f697fd1 Mon Sep 17 00:00:00 2001 From: Daniele Gobbetti Date: Fri, 18 Aug 2017 21:51:12 +0200 Subject: [PATCH] Add link to liberapay.com in the main drawer. /cc #14 --- LICENSE.artwork | 3 ++ .../activities/ControlCenterv2.java | 8 +++- app/src/main/res/drawable/ic_donate.xml | 43 +++++++++++++++++++ .../activity_controlcenterv2_main_drawer.xml | 4 ++ app/src/main/res/values/strings.xml | 1 + 5 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 app/src/main/res/drawable/ic_donate.xml diff --git a/LICENSE.artwork b/LICENSE.artwork index d33a2fcd8..799f744dd 100644 --- a/LICENSE.artwork +++ b/LICENSE.artwork @@ -22,3 +22,6 @@ Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0): Creative Commons Attribution 3.0 Unported license (CC BY-3.0): ic_notification_battery_low.png by Picol.org. Source: https://commons.wikimedia.org/wiki/File:Battery_1_Picol_icon.svg + +Creative Commons Attribution 3.0 United States (CC BY-3.0 US): + ic_donate by Peter van Driel https://thenounproject.com/term/donate/239009/ diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java index 164dfc4c4..7e889efa1 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java @@ -25,6 +25,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; import android.graphics.Canvas; +import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.support.annotation.NonNull; @@ -61,8 +62,6 @@ import nodomain.freeyourgadget.gadgetbridge.util.AndroidUtils; import nodomain.freeyourgadget.gadgetbridge.util.GB; import nodomain.freeyourgadget.gadgetbridge.util.Prefs; -import static de.cketti.library.changelog.ChangeLog.DEFAULT_CSS; - //TODO: extend GBActivity, but it requires actionbar that is not available public class ControlCenterv2 extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener { @@ -250,6 +249,11 @@ public class ControlCenterv2 extends AppCompatActivity case R.id.action_quit: GBApplication.quit(); return true; + case R.id.donation_link: + Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse("https://liberapay.com/Gadgetbridge")); //TODO: centralize if ever used somewhere else + i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK); + startActivity(i); + return true; case R.id.external_changelog: ChangeLog cl = createChangeLog(); cl.getFullLogDialog().show(); diff --git a/app/src/main/res/drawable/ic_donate.xml b/app/src/main/res/drawable/ic_donate.xml new file mode 100644 index 000000000..9dd09ab10 --- /dev/null +++ b/app/src/main/res/drawable/ic_donate.xml @@ -0,0 +1,43 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/activity_controlcenterv2_main_drawer.xml b/app/src/main/res/menu/activity_controlcenterv2_main_drawer.xml index 588b3a839..65a98b2cf 100644 --- a/app/src/main/res/menu/activity_controlcenterv2_main_drawer.xml +++ b/app/src/main/res/menu/activity_controlcenterv2_main_drawer.xml @@ -21,6 +21,10 @@ + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 07561eef7..06832d579 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,6 +6,7 @@ Settings Debug Quit + Donate Synchronize Sleep Monitor (ALPHA) Find lost Deviceā€¦