Commit 360d7a69 authored by Thomas's avatar Thomas
Browse files

Fix cards with long title

parent c2c780f5
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
            popup.setOnMenuItemClickListener(item -> {
                int itemId = item.getItemId();
                if (itemId == R.id.action_logout_account) {
                    AlertDialog.Builder alt_bld = new AlertDialog.Builder(BaseMainActivity.this);
                    AlertDialog.Builder alt_bld = new AlertDialog.Builder(BaseMainActivity.this, Helper.dialogStyle());
                    alt_bld.setTitle(R.string.action_logout);
                    if (currentAccount.mastodon_account != null && currentAccount.mastodon_account.username != null && currentAccount.instance != null) {
                        alt_bld.setMessage(getString(R.string.logout_account_confirmation, currentAccount.mastodon_account.username, currentAccount.instance));
@@ -1174,7 +1174,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
                itemShowReplies.setChecked(show_replies);
                editor.apply();
            } else if (itemId == R.id.action_filter) {
                AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(BaseMainActivity.this);
                AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(BaseMainActivity.this, Helper.dialogStyle());
                LayoutInflater inflater = getLayoutInflater();
                View dialogView = inflater.inflate(R.layout.popup_filter_regex, new LinearLayout(BaseMainActivity.this), false);
                dialogBuilder.setView(dialogView);
@@ -1495,7 +1495,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
        if (item.getItemId() == R.id.action_logout) {
            AlertDialog.Builder alt_bld = new AlertDialog.Builder(BaseMainActivity.this);
            AlertDialog.Builder alt_bld = new AlertDialog.Builder(BaseMainActivity.this, Helper.dialogStyle());
            alt_bld.setTitle(R.string.action_logout);
            alt_bld.setMessage(getString(R.string.logout_account_confirmation, account.mastodon_account.username, account.instance));
            alt_bld.setPositiveButton(R.string.action_logout, (dialog, id) -> {
+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ public class CacheActivity extends BaseBarActivity {
            finish();
            return true;
        } else if (item.getItemId() == R.id.action_clear) {
            AlertDialog.Builder deleteConfirm = new AlertDialog.Builder(CacheActivity.this);
            AlertDialog.Builder deleteConfirm = new AlertDialog.Builder(CacheActivity.this, Helper.dialogStyle());
            deleteConfirm.setTitle(getString(R.string.delete_cache));
            deleteConfirm.setMessage(getString(R.string.delete_cache_message));
            deleteConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
@@ -129,7 +129,7 @@ public class CacheActivity extends BaseBarActivity {
                        size = size / 1000000.0f;
                    }
                    binding.fileCacheSize.setText(String.format("%s %s", String.format(Locale.getDefault(), "%.2f", size), getString(R.string.cache_units)));
                    AlertDialog.Builder restartBuilder = new AlertDialog.Builder(CacheActivity.this);
                    AlertDialog.Builder restartBuilder = new AlertDialog.Builder(CacheActivity.this, Helper.dialogStyle());
                    restartBuilder.setMessage(getString(R.string.restart_the_app));
                    restartBuilder.setNegativeButton(R.string.no, (dialogRestart, whichRestart) -> {
                        recreate();
+2 −2
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
        }
        if (canBeSent(statusDraft)) {
            if (promptSaveDraft) {
                AlertDialog.Builder alt_bld = new AlertDialog.Builder(ComposeActivity.this);
                AlertDialog.Builder alt_bld = new AlertDialog.Builder(ComposeActivity.this, Helper.dialogStyle());
                alt_bld.setMessage(R.string.save_draft);
                alt_bld.setPositiveButton(R.string.save, (dialog, id) -> {
                    dialog.dismiss();
@@ -315,7 +315,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
        } else if (item.getItemId() == R.id.action_photo_camera) {
            photoFileUri = MediaHelper.dispatchTakePictureIntent(ComposeActivity.this);
        } else if (item.getItemId() == R.id.action_contacts) {
            AlertDialog.Builder builderSingle = new AlertDialog.Builder(ComposeActivity.this);
            AlertDialog.Builder builderSingle = new AlertDialog.Builder(ComposeActivity.this, Helper.dialogStyle());

            builderSingle.setTitle(getString(R.string.select_accounts));
            PopupContactBinding popupContactBinding = PopupContactBinding.inflate(getLayoutInflater(), new LinearLayout(ComposeActivity.this), false);
+2 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import app.fedilab.android.client.entities.api.Status;
import app.fedilab.android.client.entities.app.StatusDraft;
import app.fedilab.android.databinding.ActivityDraftsBinding;
import app.fedilab.android.exception.DBException;
import app.fedilab.android.helper.Helper;
import app.fedilab.android.ui.drawer.StatusDraftAdapter;
import app.fedilab.android.viewmodel.mastodon.TimelinesVM;

@@ -97,7 +98,7 @@ public class DraftActivity extends BaseActivity implements StatusDraftAdapter.Dr
            finish();
            return true;
        } else if (item.getItemId() == R.id.action_delete) {
            AlertDialog.Builder unfollowConfirm = new AlertDialog.Builder(DraftActivity.this);
            AlertDialog.Builder unfollowConfirm = new AlertDialog.Builder(DraftActivity.this, Helper.dialogStyle());
            unfollowConfirm.setTitle(getString(R.string.delete_all));
            unfollowConfirm.setMessage(getString(R.string.remove_draft));
            unfollowConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
+2 −2
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ public class EditProfileActivity extends BaseBarActivity {
                    value = Html.fromHtml(field.value).toString();
                fieldItemBinding.value.setText(value);
                fieldItemBinding.remove.setOnClickListener(v -> {
                    AlertDialog.Builder deleteConfirm = new AlertDialog.Builder(EditProfileActivity.this);
                    AlertDialog.Builder deleteConfirm = new AlertDialog.Builder(EditProfileActivity.this, Helper.dialogStyle());
                    deleteConfirm.setTitle(getString(R.string.delete_field));
                    deleteConfirm.setMessage(getString(R.string.delete_field_confirm));
                    deleteConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
@@ -157,7 +157,7 @@ public class EditProfileActivity extends BaseBarActivity {
        binding.addField.setOnClickListener(view -> {
            AccountFieldItemBinding fieldItemBinding = AccountFieldItemBinding.inflate(getLayoutInflater());
            fieldItemBinding.remove.setOnClickListener(v -> {
                AlertDialog.Builder deleteConfirm = new AlertDialog.Builder(EditProfileActivity.this);
                AlertDialog.Builder deleteConfirm = new AlertDialog.Builder(EditProfileActivity.this, Helper.dialogStyle());
                deleteConfirm.setTitle(getString(R.string.delete_field));
                deleteConfirm.setMessage(getString(R.string.delete_field_confirm));
                deleteConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
Loading