Add partnership and prepare beta 21 (5db8bfd0) · Commits · Android-smartphones / Fedilab

app/build.gradle

+6 −7

Original line number	Diff line number	Diff line
		@@ -9,9 +9,8 @@ android {
		defaultConfig {
		minSdk 21
		targetSdk 31
		versionCode 21
		versionName "beta-21"

		versionCode 385
		versionName "3.0.0-beta-22"
		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
		}
		flavorDimensions "default"
		@@ -27,13 +26,13 @@ android {
		}
		productFlavors {
		fdroid {
		applicationId "fr.gouv.etalab.mastodon.test"
		applicationId "fr.gouv.etalab.mastodon"
		buildConfigField "boolean", "DONATIONS", "true"
		buildConfigField "boolean", "push", "false"
		flavor = "fdroid"
		}
		playstore {
		applicationId "app.fedilab.android.test"
		applicationId "app.fedilab.android"
		buildConfigField "boolean", "DONATIONS", "false"
		buildConfigField "boolean", "push", "true"
		flavor = "playstore"
		@@ -98,8 +97,8 @@ dependencies {
		implementation project(path: ':cropper')
		annotationProcessor "com.github.bumptech.glide:compiler:4.12.0"
		implementation 'jp.wasabeef:glide-transformations:4.3.0'
		implementation 'com.github.penfeizhou.android.animation:apng:2.17.0'
		implementation 'com.github.penfeizhou.android.animation:gif:2.17.0'
		implementation 'com.github.penfeizhou.android.animation:apng:2.22.0'
		implementation 'com.github.penfeizhou.android.animation:gif:2.22.0'
		implementation 'com.google.android.exoplayer:exoplayer:2.16.1'
		implementation 'com.github.piasy:rxandroidaudio:1.7.0'
		implementation 'com.github.piasy:AudioProcessor:1.7.0'

app/src/main/AndroidManifest.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -108,6 +108,12 @@
		android:configChanges="keyboardHidden\|orientation\|screenSize"
		android:label="@string/action_about"
		android:theme="@style/AppThemeBar" />

		<activity
		android:name=".activities.PartnerShipActivity"
		android:configChanges="keyboardHidden\|orientation\|screenSize"
		android:label="@string/action_about"
		android:theme="@style/AppThemeBar" />
		<activity
		android:name=".activities.ActionActivity"
		android:configChanges="keyboardHidden\|orientation\|screenSize"

app/src/main/java/app/fedilab/android/BaseMainActivity.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -91,6 +91,7 @@ import app.fedilab.android.activities.InstanceHealthActivity;
		import app.fedilab.android.activities.LoginActivity;
		import app.fedilab.android.activities.MainActivity;
		import app.fedilab.android.activities.MastodonListActivity;
		import app.fedilab.android.activities.PartnerShipActivity;
		import app.fedilab.android.activities.ProfileActivity;
		import app.fedilab.android.activities.ProxyActivity;
		import app.fedilab.android.activities.ReorderTimelinesActivity;
		@@ -347,6 +348,9 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
		} else if (id == R.id.nav_about) {
		Intent intent = new Intent(this, AboutActivity.class);
		startActivity(intent);
		} else if (id == R.id.nav_partnership) {
		Intent intent = new Intent(this, PartnerShipActivity.class);
		startActivity(intent);
		}
		binding.drawerLayout.close();
		return false;

app/src/main/java/app/fedilab/android/activities/AboutActivity.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -78,12 +78,13 @@ public class AboutActivity extends BaseActivity {
		}
		binding.aboutSupportPaypal.setOnClickListener(v -> Helper.openBrowser(AboutActivity.this, "https://www.paypal.me/Mastalab"));


		binding.accountFollow.setBackgroundTintList(ThemeHelper.getButtonActionColorStateList(AboutActivity.this));
		if (BuildConfig.DONATIONS) {
		binding.aboutSupportPaypal.setVisibility(View.VISIBLE);
		} else {
		binding.aboutSupportPaypal.setVisibility(View.GONE);
		}
		binding.accountFollow.setImageResource(R.drawable.ic_baseline_person_add_24);
		binding.aboutWebsite.setOnClickListener(v -> Helper.openBrowser(AboutActivity.this, "https://fedilab.app"));
		CrossActionHelper.fetchRemoteAccount(AboutActivity.this, "@apps@toot.fedilab.app", new CrossActionHelper.Callback() {
		@Override

app/src/main/java/app/fedilab/android/activities/PartnerShipActivity.java

0 → 100644

+139 −0

Original line number	Diff line number	Diff line
		package app.fedilab.android.activities;
		/* Copyright 2022 Thomas Schneider
		*
		* This file is a part of Fedilab
		*
		* This program is free software; you can redistribute it and/or modify it under the terms of the
		* GNU General Public License as published by the Free Software Foundation; either version 3 of the
		* License, or (at your option) any later version.
		*
		* Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
		* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
		* Public License for more details.
		*
		* You should have received a copy of the GNU General Public License along with Fedilab; if not,
		* see <http://www.gnu.org/licenses>. */


		import android.content.Intent;
		import android.graphics.drawable.ColorDrawable;
		import android.net.Uri;
		import android.os.Bundle;
		import android.text.method.LinkMovementMethod;
		import android.view.LayoutInflater;
		import android.view.MenuItem;
		import android.view.View;
		import android.view.ViewGroup;
		import android.widget.ImageView;
		import android.widget.LinearLayout;
		import android.widget.TextView;

		import androidx.appcompat.app.ActionBar;
		import androidx.core.app.ActivityOptionsCompat;
		import androidx.core.content.ContextCompat;
		import androidx.lifecycle.ViewModelProvider;

		import java.util.ArrayList;
		import java.util.List;

		import app.fedilab.android.R;
		import app.fedilab.android.client.entities.api.Account;
		import app.fedilab.android.client.entities.api.Status;
		import app.fedilab.android.databinding.ActivityPartnershipBinding;
		import app.fedilab.android.helper.CrossActionHelper;
		import app.fedilab.android.helper.Helper;
		import app.fedilab.android.helper.MastodonHelper;
		import app.fedilab.android.helper.ThemeHelper;
		import app.fedilab.android.viewmodel.mastodon.AccountsVM;


		public class PartnerShipActivity extends BaseActivity {


		@Override
		protected void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		ThemeHelper.applyThemeBar(this);
		ActivityPartnershipBinding binding = ActivityPartnershipBinding.inflate(getLayoutInflater());
		setContentView(binding.getRoot());

		if (getSupportActionBar() != null) {
		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
		getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
		}


		ActionBar actionBar = getSupportActionBar();
		if (actionBar != null) {
		LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
		assert inflater != null;
		View view = inflater.inflate(R.layout.simple_bar, new LinearLayout(PartnerShipActivity.this), false);
		view.setBackground(new ColorDrawable(ContextCompat.getColor(PartnerShipActivity.this, R.color.cyanea_primary)));
		actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
		actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
		ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
		TextView toolbar_title = actionBar.getCustomView().findViewById(R.id.toolbar_title);
		toolbar_close.setOnClickListener(v -> finish());
		toolbar_title.setText(R.string.action_partnership);
		}

		TextView about_partnership = findViewById(R.id.about_partnership);
		about_partnership.setMovementMethod(LinkMovementMethod.getInstance());

		binding.mastohostLogo.setOnClickListener(v -> {
		Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://masto.host"));
		startActivity(browserIntent);
		});
		binding.accountFollow.setBackgroundTintList(ThemeHelper.getButtonActionColorStateList(PartnerShipActivity.this));
		setTitle(R.string.action_partnership);
		binding.accountFollow.setImageResource(R.drawable.ic_baseline_person_add_24);
		CrossActionHelper.fetchRemoteAccount(PartnerShipActivity.this, "@mastohost@mastodon.social", new CrossActionHelper.Callback() {
		@Override
		public void federatedStatus(Status status) {

		}

		@Override
		public void federatedAccount(Account account) {
		if (account != null && account.username.equalsIgnoreCase("mastohost")) {
		binding.acccountContainer.setVisibility(View.VISIBLE);
		MastodonHelper.loadPPMastodon(binding.accountPp, account);
		binding.accountDn.setText(account.display_name);
		binding.accountUn.setText(account.acct);
		binding.accountPp.setOnClickListener(v -> {
		Intent intent = new Intent(PartnerShipActivity.this, ProfileActivity.class);
		Bundle b = new Bundle();
		b.putSerializable(Helper.ARG_ACCOUNT, account);
		intent.putExtras(b);
		ActivityOptionsCompat options = ActivityOptionsCompat
		.makeSceneTransitionAnimation(PartnerShipActivity.this, binding.accountPp, getString(R.string.activity_porfile_pp));
		startActivity(intent, options.toBundle());
		});
		AccountsVM accountsVM = new ViewModelProvider(PartnerShipActivity.this).get(AccountsVM.class);
		List<String> ids = new ArrayList<>();
		ids.add(account.id);
		accountsVM.getRelationships(MainActivity.currentInstance, MainActivity.currentToken, ids)
		.observe(PartnerShipActivity.this, relationShips -> {
		if (relationShips != null && relationShips.size() > 0) {
		if (!relationShips.get(0).following) {
		binding.accountFollow.setVisibility(View.VISIBLE);
		binding.accountFollow.setOnClickListener(v -> accountsVM.follow(MainActivity.currentInstance, MainActivity.currentToken, account.id, true, false)
		.observe(PartnerShipActivity.this, relationShip -> binding.accountFollow.setVisibility(View.GONE)));
		}
		}
		});
		}
		}
		});
		}

		@Override
		public boolean onOptionsItemSelected(MenuItem item) {
		if (item.getItemId() == android.R.id.home) {
		finish();
		return true;
		}
		return super.onOptionsItemSelected(item);
		}

		}