diff options
Diffstat (limited to 'app/src/main/java')
85 files changed, 7712 insertions, 2720 deletions
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/AboutActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/AboutActivity.java index f0ce89fc9..75e4d49a9 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/AboutActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/AboutActivity.java @@ -14,6 +14,8 @@ * see <http://www.gnu.org/licenses>. */ package fr.gouv.etalab.mastodon.activities; +import android.annotation.SuppressLint; +import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.PackageInfo; @@ -22,11 +24,16 @@ import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; import android.support.v4.content.ContextCompat; +import android.support.v7.app.ActionBar; +import android.support.v7.widget.Toolbar; import android.text.SpannableString; import android.text.style.UnderlineSpan; +import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; +import android.view.ViewGroup; import android.widget.Button; +import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; @@ -46,6 +53,8 @@ import fr.gouv.etalab.mastodon.helper.Helper; import fr.gouv.etalab.mastodon.interfaces.OnRetrieveRelationshipInterface; import fr.gouv.etalab.mastodon.interfaces.OnRetrieveRemoteAccountInterface; +import static fr.gouv.etalab.mastodon.helper.Helper.THEME_LIGHT; + /** * Created by Thomas on 05/05/2017. @@ -85,6 +94,27 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou if( getSupportActionBar() != null) getSupportActionBar().setDisplayHomeAsUpEnabled(true); + ActionBar actionBar = getSupportActionBar(); + if( actionBar != null ) { + LayoutInflater inflater = (LayoutInflater) this.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + assert inflater != null; + @SuppressLint("InflateParams") View view = inflater.inflate(R.layout.simple_bar, null); + 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(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + toolbar_title.setText(R.string.action_about); + if (theme == THEME_LIGHT){ + Toolbar toolbar = actionBar.getCustomView().findViewById(R.id.toolbar); + Helper.colorizeToolbar(toolbar, R.color.black, AboutActivity.this); + } + } setContentView(R.layout.activity_about); TextView about_version = findViewById(R.id.about_version); try { @@ -105,7 +135,7 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou about_code.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/stom79/mastalab")); + Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://gitlab.com/tom79/mastalab")); startActivity(browserIntent); } }); @@ -149,7 +179,7 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou about_wiki.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/stom79/mastalab/wiki")); + Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://mastalab.app/how-to-in-short-videos/")); startActivity(browserIntent); } }); @@ -159,7 +189,7 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou about_support.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://liberapay.com/tom79/donate")); + Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://liberapay.com/tom79")); startActivity(browserIntent); } }); @@ -173,15 +203,6 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou } }); - if( theme == Helper.THEME_LIGHT) { - about_code.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white)); - about_thekinrar.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white)); - about_trunk.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white)); - about_translation.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white)); - about_license.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white)); - about_support.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white)); - paypal.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white)); - } TextView about_website = findViewById(R.id.about_website); about_website.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseActivity.java index 2ce82ba1b..897a49dfc 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseActivity.java @@ -3,6 +3,9 @@ package fr.gouv.etalab.mastodon.activities; import android.annotation.SuppressLint; import android.support.v7.app.AppCompatActivity; +import com.vanniktech.emoji.EmojiManager; +import com.vanniktech.emoji.one.EmojiOneProvider; + import fr.gouv.etalab.mastodon.helper.Helper; /** @@ -14,6 +17,6 @@ import fr.gouv.etalab.mastodon.helper.Helper; public class BaseActivity extends AppCompatActivity { static { Helper.installProvider(); + EmojiManager.install(new EmojiOneProvider()); } - } diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java index 0668597c2..f56af500a 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java @@ -16,6 +16,7 @@ package fr.gouv.etalab.mastodon.activities; |