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

OeffiMainActivity, PreferenceActivity: always show donate option

Browse source
This commit is contained in:
Andreas Schildbach 2024-06-12 17:50:22 +02:00
parent 0873bfa3de
commit d92615efd9
4 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
oeffi/src-aosp/de/schildbach/oeffi/Variants.java
View file

@ -18,5 +18,4 @@
package de.schildbach.oeffi;
public class Variants {
public static final boolean ENABLE_DONATE = true;
}

1
oeffi/src-google/de/schildbach/oeffi/Variants.java
View file

@ -18,5 +18,4 @@
package de.schildbach.oeffi;
public class Variants {
public static final boolean ENABLE_DONATE = false;
}

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

@ -130,8 +130,6 @@ public abstract class OeffiMainActivity extends OeffiActivity {
directionsItem.setChecked(OeffiMainActivity.this instanceof DirectionsActivity);
final MenuItem plansItem = menu.findItem(R.id.global_options_plans);
plansItem.setChecked(OeffiMainActivity.this instanceof PlansPickerActivity);
final MenuItem donateItem = menu.findItem(R.id.global_options_donate);
donateItem.setVisible(Variants.ENABLE_DONATE);
}
@Override
@ -174,8 +172,7 @@ public abstract class OeffiMainActivity extends OeffiActivity {
}
case R.id.global_options_donate: {
if (Variants.ENABLE_DONATE)
PreferenceActivity.start(OeffiMainActivity.this, DonateFragment.class.getName());
PreferenceActivity.start(OeffiMainActivity.this, DonateFragment.class.getName());
return true;
}

6
oeffi/src/de/schildbach/oeffi/preference/PreferenceActivity.java
View file

@ -21,7 +21,6 @@ import android.app.Activity;
import android.content.Intent;
import android.view.MenuItem;
import de.schildbach.oeffi.R;
import de.schildbach.oeffi.Variants;
import java.util.List;
@ -39,8 +38,7 @@ public class PreferenceActivity extends android.preference.PreferenceActivity {
@Override
public void onBuildHeaders(final List<Header> target) {
loadHeadersFromResource(R.xml.preference_headers, target);
if (Variants.ENABLE_DONATE)
loadHeadersFromResource(R.xml.preference_headers_donate, target);
loadHeadersFromResource(R.xml.preference_headers_donate, target);
}
@Override
@ -59,6 +57,6 @@ public class PreferenceActivity extends android.preference.PreferenceActivity {
return CommonFragment.class.getName().equals(fragmentName)
|| DirectionsFragment.class.getName().equals(fragmentName)
|| AboutFragment.class.getName().equals(fragmentName)
|| (Variants.ENABLE_DONATE && DonateFragment.class.getName().equals(fragmentName));
|| DonateFragment.class.getName().equals(fragmentName);
}
}