Commit 349d8578 authored by Thomas's avatar Thomas
Browse files

some fixes

parent 29752106

app/build.gradle

+0 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ dependencies { 
    implementation "ch.acra:acra-mail:5.9.6"

    implementation "ch.acra:acra-limiter:5.9.3"

    implementation "ch.acra:acra-dialog:5.9.6"

    implementation 'com.github.Dhaval2404:ColorPicker:2.3'

    implementation "com.madgag.spongycastle:bctls-jdk15on:1.58.0.0"

    implementation 'com.github.UnifiedPush:android-connector:2.0.1'

   // implementation 'com.github.UnifiedPush:android-foss_embedded_fcm_distributor:1.0.0-beta1'

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

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import android.view.ViewGroup; 


import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.core.content.ContextCompat;

import androidx.lifecycle.ViewModelProvider;

import androidx.preference.PreferenceManager;
@@ -45,6 +44,7 @@ import app.fedilab.android.R; 
import app.fedilab.android.client.entities.api.Instance;

import app.fedilab.android.databinding.ActivityInstanceBinding;

import app.fedilab.android.helper.Helper;

import app.fedilab.android.helper.ThemeHelper;

import app.fedilab.android.viewmodel.mastodon.InstancesVM;
@@ -69,13 +69,13 @@ public class InstanceActivity extends BaseActivity { 


        final SpannableString contentAbout = new SpannableString(getString(R.string.action_about_instance));

        contentAbout.setSpan(new UnderlineSpan(), 0, contentAbout.length(), 0);

        contentAbout.setSpan(new ForegroundColorSpan(ContextCompat.getColor(InstanceActivity.this, R.color.colorAccent)), 0, contentAbout.length(),

        contentAbout.setSpan(new ForegroundColorSpan(ThemeHelper.getAttColor(this, R.attr.colorPrimary)), 0, contentAbout.length(),

                Spanned.SPAN_INCLUSIVE_EXCLUSIVE);

        binding.tos.setText(contentAbout);



        final SpannableString contentPrivacy = new SpannableString(getString(R.string.action_privacy_policy));

        contentPrivacy.setSpan(new UnderlineSpan(), 0, contentPrivacy.length(), 0);

        contentPrivacy.setSpan(new ForegroundColorSpan(ContextCompat.getColor(InstanceActivity.this, R.color.colorAccent)), 0, contentPrivacy.length(),

        contentPrivacy.setSpan(new ForegroundColorSpan(ThemeHelper.getAttColor(this, R.attr.colorPrimary)), 0, contentPrivacy.length(),

                Spanned.SPAN_INCLUSIVE_EXCLUSIVE);

        binding.privacy.setText(contentPrivacy);

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

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ public class ProfileActivity extends BaseActivity { 


        final SpannableString content = new SpannableString(getString(R.string.disclaimer_full));

        content.setSpan(new UnderlineSpan(), 0, content.length(), 0);

        content.setSpan(new ForegroundColorSpan(ContextCompat.getColor(ProfileActivity.this, R.color.colorAccent)), 0, content.length(),

        content.setSpan(new ForegroundColorSpan(ThemeHelper.getAttColor(this, R.attr.colorPrimary)), 0, content.length(),

                Spanned.SPAN_INCLUSIVE_EXCLUSIVE);

        binding.warningMessage.setText(content);

        binding.warningMessage.setOnClickListener(view -> {

app/src/main/java/app/fedilab/android/activities/admin/AdminAccountActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ import app.fedilab.android.databinding.ActivityAdminAccountBinding; 
import app.fedilab.android.helper.Helper;

import app.fedilab.android.helper.MastodonHelper;

import app.fedilab.android.helper.SpannableHelper;

import app.fedilab.android.helper.ThemeHelper;

import app.fedilab.android.viewmodel.mastodon.AdminVM;

import app.fedilab.android.viewmodel.mastodon.NodeInfoVM;

import es.dmoral.toasty.Toasty;
@@ -291,7 +292,7 @@ public class AdminAccountActivity extends BaseActivity { 


        final SpannableString content = new SpannableString(getString(R.string.disclaimer_full));

        content.setSpan(new UnderlineSpan(), 0, content.length(), 0);

        content.setSpan(new ForegroundColorSpan(ContextCompat.getColor(AdminAccountActivity.this, R.color.colorAccent)), 0, content.length(),

        content.setSpan(new ForegroundColorSpan(ThemeHelper.getAttColor(this, R.attr.colorPrimary)), 0, content.length(),

                Spanned.SPAN_INCLUSIVE_EXCLUSIVE);



        //This account was moved to another one

app/src/main/java/app/fedilab/android/activities/admin/AdminReportActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ import app.fedilab.android.databinding.ActivityAdminAccountBinding; 
import app.fedilab.android.helper.Helper;

import app.fedilab.android.helper.MastodonHelper;

import app.fedilab.android.helper.SpannableHelper;

import app.fedilab.android.helper.ThemeHelper;

import app.fedilab.android.viewmodel.mastodon.AdminVM;

import app.fedilab.android.viewmodel.mastodon.NodeInfoVM;

import es.dmoral.toasty.Toasty;
@@ -310,7 +311,7 @@ public class AdminReportActivity extends BaseBarActivity { 


        final SpannableString content = new SpannableString(getString(R.string.disclaimer_full));

        content.setSpan(new UnderlineSpan(), 0, content.length(), 0);

        content.setSpan(new ForegroundColorSpan(ContextCompat.getColor(AdminReportActivity.this, R.color.colorAccent)), 0, content.length(),

        content.setSpan(new ForegroundColorSpan(ThemeHelper.getAttColor(this, R.attr.colorPrimary)), 0, content.length(),

                Spanned.SPAN_INCLUSIVE_EXCLUSIVE);



        //This account was moved to another one