Commit 13b9a43b authored by Thomas's avatar Thomas
Browse files

Split activities

parent 7d6f7167

app/src/main/AndroidManifest.xml

+0 −5
Original line number Diff line number Diff line
@@ -244,11 +244,6 @@ 
            android:label="@string/action_about"

            android:theme="@style/AppThemeBar" />



        <activity

            android:name=".activities.ThemeSettingsActivity"

            android:configChanges="keyboardHidden|orientation|screenSize"

            android:label="@string/theming"

            android:theme="@style/AppThemeBar" />

        <activity

            android:name=".activities.admin.AdminDomainBlockActivity"

            android:configChanges="keyboardHidden|orientation|screenSize"

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

+3 −19
Original line number Diff line number Diff line
@@ -45,15 +45,6 @@ public class MainApplication extends MultiDexApplication { 
        return app;

    }



    private static final int[] HARMONIZED_MATERIAL_ATTRIBUTES =

            new int[]{

                    R.attr.colorOnPrimary,

                    R.attr.colorPrimaryContainer,

                    R.attr.colorError,

                    R.attr.colorOnError,

                    R.attr.colorErrorContainer,

                    R.attr.colorOnErrorContainer

            };



    @Override

    public void onCreate() {
@@ -61,19 +52,12 @@ public class MainApplication extends MultiDexApplication { 
        app = this;

        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(MainApplication.this);



        boolean dynamicColor = sharedpreferences.getBoolean(getString(R.string.SET_DYNAMICCOLOR), false);

        if (dynamicColor) {

            DynamicColors.applyToActivitiesIfAvailable(this);





        boolean custom_theme = sharedpreferences.getBoolean("use_custom_theme", false);

        boolean no_theme_set = sharedpreferences.getBoolean("no_theme_set", true);

        if (no_theme_set && !custom_theme) {

            SharedPreferences.Editor editor = sharedpreferences.edit();

            editor.putBoolean("no_theme_set", false);

            editor.apply();

        }

        StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder();

        StrictMode.setVmPolicy(builder.build());



        Toasty.Config.getInstance().apply();

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ import app.fedilab.android.helper.MastodonHelper; 
import app.fedilab.android.viewmodel.mastodon.AccountsVM;





public class AboutActivity extends BaseActivity {

public class AboutActivity extends BaseBarActivity {





    private ActivityAboutBinding binding;

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

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import app.fedilab.android.ui.drawer.StatusReportAdapter; 
import app.fedilab.android.viewmodel.mastodon.AdminVM;

import es.dmoral.toasty.Toasty;



public class AccountReportActivity extends BaseActivity {

public class AccountReportActivity extends BaseBarActivity {





    private String account_id;

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

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import app.fedilab.android.ui.fragment.timeline.FragmentMastodonAccount; 
import app.fedilab.android.ui.fragment.timeline.FragmentMastodonDomainBlock;

import app.fedilab.android.ui.fragment.timeline.FragmentMastodonTimeline;



public class ActionActivity extends BaseActivity {

public class ActionActivity extends BaseBarActivity {



    private ActivityActionsBinding binding;

    private boolean canGoBack;