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 00000000..ba04c871 Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_preference_donate.png differ diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_preference_donate.png b/android_app/app/src/main/res/drawable-ldpi/ic_preference_donate.png new file mode 100644 index 00000000..cb47f6d7 Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_preference_donate.png differ 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 00000000..747a3912 Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_preference_donate.png differ diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_preference_donate.png b/android_app/app/src/main/res/drawable-xhdpi/ic_preference_donate.png new file mode 100644 index 00000000..150134a8 Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_preference_donate.png differ diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_preference_donate.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_preference_donate.png new file mode 100644 index 00000000..c7567684 Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_preference_donate.png differ 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 00000000..444795ec Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_preference_donate.png differ 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