Remove donation links for Google Release
This commit is contained in:
parent
23a184e6c7
commit
aadcb5a63b
|
@ -36,9 +36,11 @@ android {
|
||||||
productFlavors {
|
productFlavors {
|
||||||
fdroid {
|
fdroid {
|
||||||
applicationId "fr.gouv.etalab.mastodon"
|
applicationId "fr.gouv.etalab.mastodon"
|
||||||
|
buildConfigField "boolean", "DONATIONS", "true"
|
||||||
}
|
}
|
||||||
playstore {
|
playstore {
|
||||||
applicationId "app.fedilab.android"
|
applicationId "app.fedilab.android"
|
||||||
|
buildConfigField "boolean", "DONATIONS", "false"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
packagingOptions {
|
packagingOptions {
|
||||||
|
|
|
@ -38,6 +38,7 @@ import android.widget.Toast;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import app.fedilab.android.BuildConfig;
|
||||||
import app.fedilab.android.client.Entities.Account;
|
import app.fedilab.android.client.Entities.Account;
|
||||||
import app.fedilab.android.client.Entities.Error;
|
import app.fedilab.android.client.Entities.Error;
|
||||||
import app.fedilab.android.client.Entities.Relationship;
|
import app.fedilab.android.client.Entities.Relationship;
|
||||||
|
@ -209,6 +210,11 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
|
||||||
startActivity(browserIntent);
|
startActivity(browserIntent);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
if(BuildConfig.DONATIONS){
|
||||||
|
about_support.setVisibility(View.VISIBLE);
|
||||||
|
}else{
|
||||||
|
about_support.setVisibility(View.GONE);
|
||||||
|
}
|
||||||
|
|
||||||
Button paypal = findViewById(R.id.about_support_paypal);
|
Button paypal = findViewById(R.id.about_support_paypal);
|
||||||
paypal.setOnClickListener(new View.OnClickListener() {
|
paypal.setOnClickListener(new View.OnClickListener() {
|
||||||
|
@ -219,6 +225,13 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if(BuildConfig.DONATIONS){
|
||||||
|
paypal.setVisibility(View.VISIBLE);
|
||||||
|
}else{
|
||||||
|
paypal.setVisibility(View.GONE);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
TextView about_website = findViewById(R.id.about_website);
|
TextView about_website = findViewById(R.id.about_website);
|
||||||
about_website.setOnClickListener(new View.OnClickListener() {
|
about_website.setOnClickListener(new View.OnClickListener() {
|
||||||
|
|
|
@ -72,6 +72,7 @@ import java.util.List;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
|
|
||||||
|
import app.fedilab.android.BuildConfig;
|
||||||
import app.fedilab.android.client.APIResponse;
|
import app.fedilab.android.client.APIResponse;
|
||||||
import app.fedilab.android.client.Entities.Account;
|
import app.fedilab.android.client.Entities.Account;
|
||||||
import app.fedilab.android.client.Entities.Filters;
|
import app.fedilab.android.client.Entities.Filters;
|
||||||
|
@ -1055,6 +1056,13 @@ public abstract class BaseMainActivity extends BaseActivity
|
||||||
navigationView.getMenu().findItem(R.id.nav_list).setVisible(false);
|
navigationView.getMenu().findItem(R.id.nav_list).setVisible(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (!BuildConfig.DONATIONS) {
|
||||||
|
MenuItem openCollectiveItem = navigationView.getMenu().findItem(R.id.nav_opencollective);
|
||||||
|
if( openCollectiveItem != null){
|
||||||
|
openCollectiveItem.setVisible(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
LinearLayout owner_container = headerLayout.findViewById(R.id.main_header_container);
|
LinearLayout owner_container = headerLayout.findViewById(R.id.main_header_container);
|
||||||
owner_container.setOnClickListener(new View.OnClickListener() {
|
owner_container.setOnClickListener(new View.OnClickListener() {
|
||||||
|
@ -1135,6 +1143,8 @@ public abstract class BaseMainActivity extends BaseActivity
|
||||||
// Retrieves filters
|
// Retrieves filters
|
||||||
new ManageFiltersAsyncTask(getApplicationContext(), GET_ALL_FILTER, null, BaseMainActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
new ManageFiltersAsyncTask(getApplicationContext(), GET_ALL_FILTER, null, BaseMainActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void manageTimelineList(boolean displayed){
|
private void manageTimelineList(boolean displayed){
|
||||||
|
@ -1705,6 +1715,7 @@ public abstract class BaseMainActivity extends BaseActivity
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onRetrieveMetaData(boolean error, String sharedSubject, String sharedText, String image, String title, String description) {
|
public void onRetrieveMetaData(boolean error, String sharedSubject, String sharedText, String image, String title, String description) {
|
||||||
Bundle b = new Bundle();
|
Bundle b = new Bundle();
|
||||||
|
|
|
@ -6,7 +6,7 @@ buildscript {
|
||||||
google()
|
google()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:3.4.0'
|
classpath 'com.android.tools.build:gradle:3.4.1'
|
||||||
|
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
// in the individual module build.gradle files
|
// in the individual module build.gradle files
|
||||||
|
|
Loading…
Reference in New Issue