Commit 4ea542c1 authored by Thomas's avatar Thomas
Browse files

Some changes

parent ccf7ac5c

app/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ 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/AboutActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ public class AboutActivity extends BaseActivity { 
        } else {

            binding.aboutSupportPaypal.setVisibility(View.GONE);

        }

        binding.accountFollow.setImageResource(R.drawable.ic_baseline_person_add_24);

        binding.accountFollow.setIconResource(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

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public class PartnerShipActivity extends BaseActivity { 
        });

        binding.accountFollow.setBackgroundTintList(ThemeHelper.getButtonActionColorStateList(PartnerShipActivity.this));

        setTitle(R.string.action_partnership);

        binding.accountFollow.setImageResource(R.drawable.ic_baseline_person_add_24);

        binding.accountFollow.setIconResource(R.drawable.ic_baseline_person_add_24);

        CrossActionHelper.fetchRemoteAccount(PartnerShipActivity.this, "@mastohost@mastodon.social", new CrossActionHelper.Callback() {

            @Override

            public void federatedStatus(Status status) {

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

+7 −7
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ public class ProfileActivity extends BaseActivity { 
        //Visibility depending of the relationship

        if (relationship != null) {

            if (relationship.blocked_by) {

                binding.accountFollow.setImageResource(R.drawable.ic_baseline_person_add_24);

                binding.accountFollow.setIconResource(R.drawable.ic_baseline_person_add_24);

                binding.accountFollow.setVisibility(View.VISIBLE);

                binding.accountFollow.setEnabled(false);

                binding.accountFollow.setContentDescription(getString(R.string.action_disabled));
@@ -535,7 +535,7 @@ public class ProfileActivity extends BaseActivity { 


            if (relationship.requested) {

                binding.accountFollowRequest.setVisibility(View.VISIBLE);

                binding.accountFollow.setImageResource(R.drawable.ic_baseline_hourglass_full_24);

                binding.accountFollow.setIconResource(R.drawable.ic_baseline_hourglass_full_24);

                binding.accountFollow.setVisibility(View.VISIBLE);

                binding.accountFollow.setContentDescription(getString(R.string.follow_request));

                doAction = action.UNFOLLOW;
@@ -546,19 +546,19 @@ public class ProfileActivity extends BaseActivity { 
                binding.accountFollowedBy.setVisibility(View.GONE);

            }

            if (relationship.following) {

                binding.accountFollow.setImageResource(R.drawable.ic_baseline_person_remove_24);

                binding.accountFollow.setIconResource(R.drawable.ic_baseline_person_remove_24);

                binding.accountFollow.setBackgroundTintList(ColorStateList.valueOf(ContextCompat.getColor(ProfileActivity.this, R.color.red_1)));

                doAction = action.UNFOLLOW;

                binding.accountFollow.setContentDescription(getString(R.string.action_unfollow));

                binding.accountFollow.setVisibility(View.VISIBLE);

            } else if (relationship.blocking) {

                binding.accountFollow.setBackgroundTintList(ColorStateList.valueOf(ContextCompat.getColor(ProfileActivity.this, R.color.red_1)));

                binding.accountFollow.setImageResource(R.drawable.ic_baseline_lock_open_24);

                binding.accountFollow.setIconResource(R.drawable.ic_baseline_lock_open_24);

                doAction = action.UNBLOCK;

                binding.accountFollow.setVisibility(View.VISIBLE);

                binding.accountFollow.setContentDescription(getString(R.string.action_unblock));

            } else {

                binding.accountFollow.setImageResource(R.drawable.ic_baseline_person_add_24);

                binding.accountFollow.setIconResource(R.drawable.ic_baseline_person_add_24);

                doAction = action.FOLLOW;

                binding.accountFollow.setVisibility(View.VISIBLE);

                binding.accountFollow.setContentDescription(getString(R.string.action_follow));
@@ -577,9 +577,9 @@ public class ProfileActivity extends BaseActivity { 
                binding.accountNotification.setVisibility(View.VISIBLE);

            }

            if (relationship.notifying) {

                binding.accountNotification.setImageResource(R.drawable.ic_baseline_notifications_active_24);

                binding.accountNotification.setIconResource(R.drawable.ic_baseline_notifications_active_24);

            } else {

                binding.accountNotification.setImageResource(R.drawable.ic_baseline_notifications_off_24);

                binding.accountNotification.setIconResource(R.drawable.ic_baseline_notifications_off_24);

            }

            binding.accountNotification.setOnClickListener(v -> {

                if (relationship != null && relationship.following) {

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

0 → 100644
+53 −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.os.Bundle;

import android.view.MenuItem;



import app.fedilab.android.databinding.ActivityAboutBinding;





public class ThemeSettingsActivity extends BaseActivity {





    private ActivityAboutBinding binding;





    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        binding = ActivityAboutBinding.inflate(getLayoutInflater());

        setContentView(binding.getRoot());



        if (getSupportActionBar() != null) {

            getSupportActionBar().setDisplayHomeAsUpEnabled(true);

        }



    }



    @Override

    public boolean onOptionsItemSelected(MenuItem item) {

        if (item.getItemId() == android.R.id.home) {

            finish();

            return true;

        }

        return super.onOptionsItemSelected(item);

    }





}