Commit 59a8b5da authored by Thomas's avatar Thomas
Browse files

Fix issue #409 - Title sizes

parent d4aee3ff

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

+4 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.text.Spanned; 
import android.text.method.LinkMovementMethod;

import android.text.style.ForegroundColorSpan;

import android.text.style.UnderlineSpan;

import android.util.TypedValue;

import android.view.MenuItem;

import android.view.View;

import android.widget.TextView;
@@ -97,7 +98,9 @@ public class AdminAccountActivity extends BaseActivity { 
            actionBar.setDisplayShowTitleEnabled(false);

            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));

        }



        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this);

        float scale = sharedpreferences.getFloat(getString(R.string.SET_FONT_SCALE), 1.1f);

        binding.title.setTextSize(TypedValue.COMPLEX_UNIT_SP, 18 * 1.1f / scale);

        if (getSupportActionBar() != null) {

            getSupportActionBar().setDisplayHomeAsUpEnabled(true);

            getSupportActionBar().setDisplayShowHomeEnabled(true);

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

+4 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.text.Spanned; 
import android.text.method.LinkMovementMethod;

import android.text.style.ForegroundColorSpan;

import android.text.style.UnderlineSpan;

import android.util.TypedValue;

import android.view.MenuItem;

import android.view.View;

import android.widget.TextView;
@@ -97,7 +98,9 @@ public class AdminReportActivity extends BaseActivity { 
            actionBar.setDisplayShowTitleEnabled(false);

            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));

        }



        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this);

        float scale = sharedpreferences.getFloat(getString(R.string.SET_FONT_SCALE), 1.1f);

        binding.title.setTextSize(TypedValue.COMPLEX_UNIT_SP, 18 * 1.1f / scale);

        if (getSupportActionBar() != null) {

            getSupportActionBar().setDisplayHomeAsUpEnabled(true);

            getSupportActionBar().setDisplayShowHomeEnabled(true);

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

+6 −1
Original line number Diff line number Diff line
@@ -18,12 +18,15 @@ package app.fedilab.android.activities; 
import static app.fedilab.android.BaseMainActivity.currentInstance;

import static app.fedilab.android.BaseMainActivity.emojis;



import android.content.SharedPreferences;

import android.graphics.drawable.ColorDrawable;

import android.os.Bundle;

import android.util.TypedValue;

import android.view.MenuItem;



import androidx.appcompat.app.ActionBar;

import androidx.core.content.ContextCompat;

import androidx.preference.PreferenceManager;



import app.fedilab.android.R;

import app.fedilab.android.client.entities.api.EmojiInstance;
@@ -57,7 +60,9 @@ public class AnnouncementActivity extends BaseActivity { 
            getSupportActionBar().setDisplayHomeAsUpEnabled(true);

            getSupportActionBar().setDisplayShowHomeEnabled(true);

        }



        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this);

        float scale = sharedpreferences.getFloat(getString(R.string.SET_FONT_SCALE), 1.1f);

        binding.title.setTextSize(TypedValue.COMPLEX_UNIT_SP, 18 * 1.1f / scale);

        Helper.addFragment(getSupportFragmentManager(), R.id.nav_host_fragment_tags, new FragmentMastodonAnnouncement(), null, null, null);

        if (emojis == null || !emojis.containsKey(currentInstance)) {

            new Thread(() -> {

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

+4 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.os.Handler; 
import android.os.Looper;

import android.text.Editable;

import android.text.TextWatcher;

import android.util.TypedValue;

import android.view.Menu;

import android.view.MenuItem;

import android.view.MotionEvent;
@@ -479,6 +480,9 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana 
            getSupportActionBar().setDisplayHomeAsUpEnabled(true);

            getSupportActionBar().setDisplayShowHomeEnabled(true);

        }

        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this);

        float scale = sharedpreferences.getFloat(getString(R.string.SET_FONT_SCALE), 1.1f);

        binding.title.setTextSize(TypedValue.COMPLEX_UNIT_SP, 18 * 1.1f / scale);

        statusList = new ArrayList<>();

        Bundle b = getIntent().getExtras();

        if (b != null) {
@@ -565,7 +569,6 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana 
                }

            }).start();

        }

        final SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(ComposeActivity.this);

        if (MainActivity.instanceInfo == null) {

            String instanceInfo = sharedpreferences.getString(getString(R.string.INSTANCE_INFO) + instance, null);

            if (instanceInfo != null) {

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

+5 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.graphics.drawable.ColorDrawable; 
import android.os.Bundle;

import android.os.Handler;

import android.os.Looper;

import android.util.TypedValue;

import android.view.Menu;

import android.view.MenuItem;
@@ -67,13 +68,16 @@ public class ContextActivity extends BaseActivity { 
            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));

        }

        binding.title.setText(R.string.context_conversation);

        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this);

        float scale = sharedpreferences.getFloat(getString(R.string.SET_FONT_SCALE), 1.1f);

        binding.title.setTextSize(TypedValue.COMPLEX_UNIT_SP, 18 * 1.1f / scale);



        if (getSupportActionBar() != null) {

            getSupportActionBar().setDisplayHomeAsUpEnabled(true);

            getSupportActionBar().setDisplayShowHomeEnabled(true);

        }

        binding.toolbar.setPopupTheme(Helper.popupStyle());

        Bundle b = getIntent().getExtras();

        final SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(ContextActivity.this);

        displayCW = sharedpreferences.getBoolean(getString(R.string.SET_EXPAND_CW), false);

        Status focusedStatus = null; // or other values

        if (b != null)