From 24498a43c92182b30ded6106292b6418dccfff35 Mon Sep 17 00:00:00 2001 From: oliexdev Date: Sun, 2 Jun 2019 17:41:18 +0200 Subject: [PATCH] added donate button --- .../health/openscale/gui/MainActivity.java | 25 +++++++++++------- .../drawable-hdpi/ic_preference_donate.png | Bin 0 -> 349 bytes .../drawable-ldpi/ic_preference_donate.png | Bin 0 -> 222 bytes .../drawable-mdpi/ic_preference_donate.png | Bin 0 -> 253 bytes .../drawable-xhdpi/ic_preference_donate.png | Bin 0 -> 431 bytes .../drawable-xxhdpi/ic_preference_donate.png | Bin 0 -> 595 bytes .../drawable-xxxhdpi/ic_preference_donate.png | Bin 0 -> 837 bytes .../app/src/main/res/menu/drawer_view.xml | 5 ++++ .../app/src/main/res/values-de/strings.xml | 1 + .../app/src/main/res/values/strings.xml | 1 + 10 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 android_app/app/src/main/res/drawable-hdpi/ic_preference_donate.png create mode 100644 android_app/app/src/main/res/drawable-ldpi/ic_preference_donate.png create mode 100644 android_app/app/src/main/res/drawable-mdpi/ic_preference_donate.png create mode 100644 android_app/app/src/main/res/drawable-xhdpi/ic_preference_donate.png create mode 100644 android_app/app/src/main/res/drawable-xxhdpi/ic_preference_donate.png create mode 100644 android_app/app/src/main/res/drawable-xxxhdpi/ic_preference_donate.png diff --git a/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java index f824a5cb..a8a0d60f 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/MainActivity.java @@ -37,6 +37,16 @@ import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; +import androidx.annotation.NonNull; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.widget.Toolbar; +import androidx.core.content.FileProvider; +import androidx.core.view.GravityCompat; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; + import com.google.android.material.bottomnavigation.BottomNavigationView; import com.google.android.material.navigation.NavigationView; import com.health.openscale.BuildConfig; @@ -58,15 +68,6 @@ import com.health.openscale.gui.preferences.BluetoothPreferences; import java.io.File; import java.util.List; -import androidx.annotation.NonNull; -import androidx.appcompat.app.ActionBarDrawerToggle; -import androidx.appcompat.widget.Toolbar; -import androidx.core.content.FileProvider; -import androidx.core.view.GravityCompat; -import androidx.drawerlayout.widget.DrawerLayout; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentTransaction; import cat.ereza.customactivityoncrash.config.CaocConfig; import timber.log.Timber; @@ -141,9 +142,11 @@ public class MainActivity extends BaseAppCompatActivity if (BuildConfig.BUILD_TYPE == "light") { ImageView launcherIcon = navDrawer.getHeaderView(0).findViewById(R.id.profileImageView); launcherIcon.setImageResource(R.drawable.ic_launcher_openscale_light); + navDrawer.getMenu().findItem(R.id.nav_donation).setVisible(false); } else if (BuildConfig.BUILD_TYPE == "pro") { ImageView launcherIcon = navDrawer.getHeaderView(0).findViewById(R.id.profileImageView); launcherIcon.setImageResource(R.drawable.ic_launcher_openscale_pro); + navDrawer.getMenu().findItem(R.id.nav_donation).setVisible(false); } if (prefs.getBoolean("firstStart", true)) { @@ -306,6 +309,10 @@ public class MainActivity extends BaseAppCompatActivity settingsActivityRunning = true; startActivity(settingsIntent); return; + case R.id.nav_donation: + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=H5KSTQA6TKTE4&source=url"))); + drawerLayout.closeDrawers(); + return; case R.id.nav_help: startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/oliexdev/openScale/wiki"))); drawerLayout.closeDrawers(); diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_preference_donate.png b/android_app/app/src/main/res/drawable-hdpi/ic_preference_donate.png new file mode 100644 index 0000000000000000000000000000000000000000..ba04c87108a375d21071cc8ccb3cdfe7223e21b1 GIT binary patch literal 349 zcmV-j0iyniP)K~zYI?bW|Z#6S?o@z05kXCwFr5o~PiwX#zzZEP&;ZN(=LuCVY4 zEba*uZG08&Y!n0$5jhpX#>65UavU+2OVSAUgOFurcfOOEWx`lP)EZ%LT;<%v2!Ki| z1K7spfUS$wCKBi%l9VUHTUf_<$3~stYkk2xXb1ZY&V&7?4&W#RxzF(}$-ZQ{C`eHc zzQcO~D+9hK$xUkEu|%@Dn#Zdo%N|Z8WouOHxRsS7#zTP3HU*i)KCbZ92kK#`DM+d| z_HY*6k&aEKG|r6s@Z~oRW}<pEeZ76%1!zi5gZ~ St;`2HkHOQ`&t;ucLK6U?=vGhw literal 0 HcmV?d00001 diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_preference_donate.png b/android_app/app/src/main/res/drawable-mdpi/ic_preference_donate.png new file mode 100644 index 0000000000000000000000000000000000000000..747a39129fbd95709c4126897c3ab4b17801397f GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_eJY5_^ zEPBsgGVF53Mai?sCOG=cqP^)Z)h>v?dqn1#o-=WhcRlK6JW^1woJ?7Iu!?642d@4K_}Mx{!{ zw2fxa=86V&#v&>k;7z2QSE+_&oM|2YCT{TqgY7Ebhl7m5>2{6Lb^z?9ihRQdyvHJb z1@BMM6|?wI5Ppx53{Mx10^dyD@H~@eICwtANrvYEn?ZjpFF+nmc>c00^u!F$qi$RV z5XYD-8)8l}%;Ahb$9Ie?X&;zHUH0<(hp$TbJ#VpueKaya>XJEAihA)0yD69($fe}L52qHEbA4Sl@7m8Y3k?ic<-I>|V+y&=@Tg-6J%y(vI z&OI|rO-)TrN*YUW%-D#Cxj*6GY``DGxs}NH#2u@^H_GjZ%;HzY zIpK55hc5H(TB2{Jd1wkvTAtP+Hl_{9_n`xLEWh}BoHc|E-F95mS^PQ<3cuXIsQ({G hO`SkZO-;@J%^wxW_~o>PpDh3Y002ovPDHLkV1j>J5V-&V literal 0 HcmV?d00001 diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_preference_donate.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_preference_donate.png new file mode 100644 index 0000000000000000000000000000000000000000..444795ec761538a1ce34f8a0e6248112405c5316 GIT binary patch literal 837 zcmV-L1G@Z)P)lzGMP;MY{uP^@o5{PX14Lr=|m1d+XC7q2cV(n%)rtP z_sqX{Uth5TpWu@66X5>%727e;hS-!0;&a_OT{Lds1I%hzcM>+@n(EF!I8I>F`TOHIX4fS+<)$-?)0kIs&v|@>pKw+9c9&ueR+s46hL4gdt%+me-{KcSfXW!c zXyo$~I-eq~@~pV?dvw3j=Hr`)oe$GWPRmxsqJP1h9&N3S*gBU=?1Q9Aga#w?M{ui0 zTch}+VE#Eg)}yVCqzb?jk@>$W+WWp>ZU&yIXfMhmiR@g8%rCEKZ$nify^?AL{1}YcRgU zlIA7X$D?=^yYPeVf^b23pW&fq7&~-sqit_XU{fr{Uhx3j7Oy%hGo8Aw<3cC-23{_> zK2vC;ec7O<);Owo6`X8SRFk}>H~_J-yH%bNPiCqz6tUTBcc~*O`T3fCj{b|li9oY_Jnvq<#6 z_!!GN*jOO6*T*Av?qFqV;VEB@y(r}Ru_niD;kDRVVJTk~+T4qTmiG(F+un!pRw}V| z@s8>xaM`%1`i9y#uM4|%D(An((~WwNfI*=NIu*yS32%kxHmp4wgqG|nM@{=$+X3P3>BRgQDNa@ P00000NkvXXu0mjf(F>dF literal 0 HcmV?d00001 diff --git a/android_app/app/src/main/res/menu/drawer_view.xml b/android_app/app/src/main/res/menu/drawer_view.xml index b2904938..80224dd1 100644 --- a/android_app/app/src/main/res/menu/drawer_view.xml +++ b/android_app/app/src/main/res/menu/drawer_view.xml @@ -32,6 +32,11 @@ android:icon="@drawable/ic_preferences_settings" android:title="@string/action_settings" /> + + Gewährleisten Sie den Standortzugriff in den Android-Einstellungen, um nach Bluetooth-Geräten zu suchen. Sie können es anschließend wieder widerrufen. Auf der rechten Achse Bitte upgraden Sie auf openScale pro für Bluetooth-Unterstützung + Spende \ No newline at end of file diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml index 51263715..0d5670b9 100644 --- a/android_app/app/src/main/res/values/strings.xml +++ b/android_app/app/src/main/res/values/strings.xml @@ -11,6 +11,7 @@ General Settings Bluetooth Status + Donation open close Cancel