mirrors/oeffi
1
0
Fork 0
mirror of https://gitlab.com/oeffi/oeffi.git synced 2025-07-08 09:48:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

google: Remove donations.

Browse source
This commit is contained in:
Andreas Schildbach 2018-07-14 15:31:58 +02:00
parent 18b453e02c
commit 2753b0e85b
10 changed files with 0 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

1
oeffi/build.gradle
View file

@ -10,7 +10,6 @@ configurations {
dependencies {
compile project(':enabler')
compile 'de.schildbach.wallet:integration-android:2.0'
compile 'com.android.support:support-annotations:27.1.1'
compile 'com.android.support:support-compat:27.1.1'
compile 'com.android.support:support-core-ui:27.1.1'

7
oeffi/res/drawable-anydpi/ic_cash_multiple_grey600_24dp.xml
View file

@ -1,7 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path android:fillColor="#FF757575" android:pathData="M5,6H23V18H5V6M14,9A3,3 0 0,1 17,12A3,3 0 0,1 14,15A3,3 0 0,1 11,12A3,3 0 0,1 14,9M9,8A2,2 0 0,1 7,10V14A2,2 0 0,1 9,16H19A2,2 0 0,1 21,14V10A2,2 0 0,1 19,8H9M1,10H3V20H19V22H1V10Z" />
</vector>

17
oeffi/res/menu/donate_menu.xml
View file

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:id="@+id/donate_menu_bitcoin"
android:title="@string/about_donate_bitcoin_title"
android:titleCondensed="@string/about_donate_bitcoin_summary"/>
<item
android:id="@+id/donate_menu_flattr"
android:title="@string/about_donate_flattr_title"
android:titleCondensed="@string/about_donate_flattr_summary"/>
<item
android:id="@+id/donate_menu_euro"
android:title="@string/about_donate_euro_title"
android:titleCondensed="@string/about_donate_euro_summary"/>
</menu>

5
oeffi/res/menu/global_options.xml
View file

@ -26,10 +26,5 @@
android:icon="@drawable/ic_info_outline_grey600_24dp"
android:orderInCategory="999"
android:title="@string/global_options_about_title"/>
<item
android:id="@+id/global_options_donate"
android:icon="@drawable/ic_cash_multiple_grey600_24dp"
android:orderInCategory="999"
android:title="@string/global_options_donate_title"/>
</menu>

8
oeffi/res/values-de/strings.xml
View file

@ -29,7 +29,6 @@
<string name="global_options_plans_comment">Für den groben Überblick</string>
<string name="global_options_preferences_title">Einstellungen</string>
<string name="global_options_about_title">Über Öffi</string>
<string name="global_options_donate_title">Spenden</string>
<!-- preferences -->
<string name="global_preferences_title">Allgemein</string>
@ -60,13 +59,6 @@
<string name="about_report_bug_summary">Feedback geben.</string>
<string name="about_community_googleplus_title">Google+ Community</string>
<string name="about_community_googleplus_summary">Diskussionen über die App.</string>
<string name="about_donate_title">Spenden</string>
<string name="about_donate_bitcoin_title">Bitcoins spenden</string>
<string name="about_donate_bitcoin_summary">Bitcoin ist eine Internet-Währung.</string>
<string name="about_donate_flattr_title">Über Flattr spenden</string>
<string name="about_donate_flattr_summary">Flattr ist ein Mikro-Spenden-System.</string>
<string name="about_donate_euro_title">Euros spenden</string>
<string name="about_donate_euro_summary">https://oeffi.schildbach.de/donate_de.html</string>
<!-- network picker -->
<string name="network_picker_firsttime_message">Da du Öffi das erste Mal nutzt, musst Du die Region wählen die am besten passt. Du kannst das später ändern.</string>

8
oeffi/res/values/strings.xml
View file

@ -29,7 +29,6 @@
<string name="global_options_plans_comment">For a rough overview</string>
<string name="global_options_preferences_title">Preferences</string>
<string name="global_options_about_title">About Offi</string>
<string name="global_options_donate_title">Donate</string>
<!-- global preferences -->
<string name="global_preferences_title">Common</string>
@ -60,13 +59,6 @@
<string name="about_report_bug_summary">Give feedback.</string>
<string name="about_community_googleplus_title">Google+ Community</string>
<string name="about_community_googleplus_summary">Discussions about the app.</string>
<string name="about_donate_title">Donations</string>
<string name="about_donate_bitcoin_title">Donate Bitcoins</string>
<string name="about_donate_bitcoin_summary">Bitcoin is an Internet currency.</string>
<string name="about_donate_flattr_title">Donate via Flattr</string>
<string name="about_donate_flattr_summary">Flattr is a microdonation system.</string>
<string name="about_donate_euro_title">Donate Euros</string>
<string name="about_donate_euro_summary">https://oeffi.schildbach.de/donate.html</string>
<!-- network picker -->
<string name="network_picker_firsttime_message">Because you are using Offi for the first time, you need to pick a region that suits you well. You

16
oeffi/res/xml/about.xml
View file

@ -51,21 +51,5 @@
android:summary="\@oeffi"
android:title="Twitter" />
</PreferenceCategory>
<PreferenceCategory
android:key="about_donate"
android:title="@string/about_donate_title" >
<Preference
android:key="about_donate_bitcoin"
android:summary="@string/about_donate_bitcoin_summary"
android:title="@string/about_donate_bitcoin_title" />
<Preference
android:key="about_donate_flattr"
android:summary="@string/about_donate_flattr_summary"
android:title="@string/about_donate_flattr_title" />
<Preference
android:key="about_donate_euro"
android:summary="@string/about_donate_euro_summary"
android:title="@string/about_donate_euro_title" />
</PreferenceCategory>
</PreferenceScreen>

13
oeffi/src/de/schildbach/oeffi/AboutActivity.java
View file

@ -19,7 +19,6 @@ package de.schildbach.oeffi;
import de.schildbach.oeffi.util.ChangelogDialogBuilder;
import de.schildbach.oeffi.util.ErrorReporter;
import de.schildbach.wallet.integration.android.BitcoinIntegration;
import android.content.Intent;
import android.net.Uri;
@ -35,9 +34,6 @@ public class AboutActivity extends PreferenceActivity {
private static final String KEY_ABOUT_FAQ = "about_faq";
private static final String KEY_ABOUT_REPORT_BUG = "about_report_bug";
private static final String KEY_ABOUT_COMMUNITY_GOOGLEPLUS = "about_community_googleplus";
private static final String KEY_ABOUT_DONATE_BITCOIN = "about_donate_bitcoin";
private static final String KEY_ABOUT_DONATE_FLATTR = "about_donate_flattr";
private static final String KEY_ABOUT_DONATE_EURO = "about_donate_euro";
private static final String KEY_ABOUT_MARKET_APP = "about_market_rate";
@Override
@ -73,15 +69,6 @@ public class AboutActivity extends PreferenceActivity {
} else if (KEY_ABOUT_COMMUNITY_GOOGLEPLUS.equals(key)) {
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.COMMUNITY_GOOGLEPLUS_URL)));
finish();
} else if (KEY_ABOUT_DONATE_BITCOIN.equals(key)) {
BitcoinIntegration.request(this, Constants.BITCOIN_ADDRESS);
finish();
} else if (KEY_ABOUT_DONATE_FLATTR.equals(key)) {
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.FLATTR_THING_URL)));
finish();
} else if (KEY_ABOUT_DONATE_EURO.equals(key)) {
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.about_donate_euro_summary))));
finish();
} else if (KEY_ABOUT_MARKET_APP.equals(key)) {
startActivity(new Intent(Intent.ACTION_VIEW,
Uri.parse(String.format(Constants.MARKET_APP_URL, getPackageName()))));

2
oeffi/src/de/schildbach/oeffi/Constants.java
View file

@ -34,11 +34,9 @@ public class Constants {
public static final String PLAN_STATIONS_FILENAME = "plans-stations.txt";
public static final String TWITTER_URL = "http://twitter.com/oeffi";
public static final String FLATTR_THING_URL = "http://flattr.com/thing/36806";
public static final String MARKET_APP_URL = "market://details?id=%s";
public static final String GOOGLE_PLAY_APP_URL = "https://play.google.com/store/apps/details?id=%s";
public static final String COMMUNITY_GOOGLEPLUS_URL = "https://plus.google.com/communities/107613937661687598579";
public static final String BITCOIN_ADDRESS = "1PW21MuBgPnjfUQriwK7TnRADFotEhdysr";
public static final long LOCATION_UPDATE_FREQ_MS = 10 * DateUtils.SECOND_IN_MILLIS;
public static final int LOCATION_UPDATE_DISTANCE = 3;

26
oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java
View file

@ -57,7 +57,6 @@ import de.schildbach.oeffi.util.ErrorReporter;
import de.schildbach.oeffi.util.NavigationMenuAdapter;
import de.schildbach.oeffi.util.UiThreadExecutor;
import de.schildbach.pte.NetworkId;
import de.schildbach.wallet.integration.android.BitcoinIntegration;
import android.animation.AnimatorInflater;
import android.animation.AnimatorSet;
@ -82,7 +81,6 @@ import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.PopupMenu;
import okhttp3.Call;
import okhttp3.Callback;
import okhttp3.HttpUrl;
@ -333,30 +331,6 @@ public abstract class OeffiMainActivity extends OeffiActivity {
startActivity(new Intent(this, AboutActivity.class));
return true;
}
case R.id.global_options_donate: {
final PopupMenu popup = new PopupMenu(this, getMyActionBar());
popup.inflate(R.menu.donate_menu);
popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
public boolean onMenuItemClick(final MenuItem item) {
if (item.getItemId() == R.id.donate_menu_bitcoin) {
BitcoinIntegration.request(OeffiMainActivity.this, Constants.BITCOIN_ADDRESS);
return true;
} else if (item.getItemId() == R.id.donate_menu_flattr) {
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.FLATTR_THING_URL)));
return true;
} else if (item.getItemId() == R.id.donate_menu_euro) {
startActivity(new Intent(Intent.ACTION_VIEW,
Uri.parse(getString(R.string.about_donate_euro_summary))));
return true;
} else {
return false;
}
}
});
popup.show();
return true;
}
}
return false;