Commit 1ff15b0f authored by Thomas's avatar Thomas
Browse files

Some cleaning

parent 2edfd8c9

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

+4 −11
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import android.content.Context; 
import android.content.Intent;

import android.content.IntentFilter;

import android.content.SharedPreferences;

import android.content.res.Configuration;

import android.database.MatrixCursor;

import android.graphics.PorterDuff;

import android.graphics.drawable.BitmapDrawable;
@@ -73,7 +72,6 @@ import androidx.appcompat.app.AlertDialog; 
import androidx.appcompat.widget.PopupMenu;

import androidx.appcompat.widget.SearchView;

import androidx.core.app.ActivityCompat;

import androidx.core.app.ActivityOptionsCompat;

import androidx.core.content.ContextCompat;

import androidx.core.view.GravityCompat;

import androidx.cursoradapter.widget.CursorAdapter;
@@ -81,7 +79,6 @@ import androidx.fragment.app.Fragment; 
import androidx.fragment.app.FragmentManager;

import androidx.fragment.app.FragmentTransaction;

import androidx.lifecycle.ViewModelProvider;



import androidx.navigation.NavController;

import androidx.navigation.Navigation;

import androidx.navigation.ui.AppBarConfiguration;
@@ -1625,8 +1622,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
            if (binding.viewPager.getAdapter() != null) {

                int tabPosition = binding.tabLayout.getSelectedTabPosition();

                Fragment fragment = (Fragment) binding.viewPager.getAdapter().instantiateItem(binding.viewPager, Math.max(tabPosition, 0));

                if (fragment instanceof FragmentMastodonTimeline && fragment.isVisible()) {

                    FragmentMastodonTimeline fragmentMastodonTimeline = ((FragmentMastodonTimeline) fragment);

                if (fragment instanceof FragmentMastodonTimeline fragmentMastodonTimeline && fragment.isVisible()) {

                    fragmentMastodonTimeline.refreshAllAdapters();

                }

            }
@@ -1921,14 +1917,11 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
        int position = binding.tabLayout.getSelectedTabPosition();

        if (binding.viewPager.getAdapter() != null) {

            Fragment fragment = (Fragment) binding.viewPager.getAdapter().instantiateItem(binding.viewPager, Math.max(position, 0));

            if (fragment instanceof FragmentMastodonTimeline) {

                FragmentMastodonTimeline fragmentMastodonTimeline = ((FragmentMastodonTimeline) fragment);

            if (fragment instanceof FragmentMastodonTimeline fragmentMastodonTimeline) {

                fragmentMastodonTimeline.scrollToTop();

            } else if (fragment instanceof FragmentMastodonConversation) {

                FragmentMastodonConversation fragmentMastodonConversation = ((FragmentMastodonConversation) fragment);

            } else if (fragment instanceof FragmentMastodonConversation fragmentMastodonConversation) {

                fragmentMastodonConversation.scrollToTop();

            } else if (fragment instanceof FragmentNotificationContainer) {

                FragmentNotificationContainer fragmentNotificationContainer = ((FragmentNotificationContainer) fragment);

            } else if (fragment instanceof FragmentNotificationContainer fragmentNotificationContainer) {

                fragmentNotificationContainer.scrollToTop();

            }

        }

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

+2 −3
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.view.MenuItem; 
import android.view.View;

import android.widget.Toast;



import androidx.core.app.ActivityOptionsCompat;

import androidx.lifecycle.ViewModelProvider;



import java.util.ArrayList;

app/src/main/java/app/fedilab/android/mastodon/activities/AccountReportActivity.java

+3 −1
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ public class AccountReportActivity extends BaseBarActivity { 
    private ActivityAdminReportBinding binding;

    private AdminVM adminVM;

    private AdminAccount targeted_account;



    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);
@@ -73,6 +74,7 @@ public class AccountReportActivity extends BaseBarActivity { 
            initializeAfterBundle(null);

        }

    }



    private void initializeAfterBundle(Bundle bundle) {



        if (bundle != null) {

app/src/main/java/app/fedilab/android/mastodon/activities/BaseActivity.java

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import org.conscrypt.Conscrypt; 


import java.security.Security;



import app.fedilab.android.BaseMainActivity;

import app.fedilab.android.R;

import app.fedilab.android.mastodon.helper.Helper;

import app.fedilab.android.mastodon.helper.ThemeHelper;

app/src/main/java/app/fedilab/android/mastodon/activities/ComposeActivity.java

+4 −5
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ import androidx.appcompat.app.ActionBar; 
import androidx.appcompat.app.AlertDialog;

import androidx.core.content.ContextCompat;

import androidx.lifecycle.ViewModelProvider;



import androidx.preference.PreferenceManager;

import androidx.recyclerview.widget.LinearLayoutManager;

import androidx.work.Data;