Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

theme fixes

This commit is contained in:
Mariotaku Lee 2016-03-26 13:16:41 +08:00
parent bd52cbf054
commit 005cd50b3a
26 changed files with 58 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
twidere/src/main/java/org/mariotaku/twidere/activity/APIEditorActivity.java
View File

@ -26,7 +26,6 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.app.AlertDialog;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
@ -38,6 +37,8 @@ import android.widget.RadioGroup;
import android.widget.RadioGroup.OnCheckedChangeListener;
import android.widget.Toast;
import com.afollestad.materialdialogs.AlertDialogWrapper;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.fragment.BaseSupportDialogFragment;
import org.mariotaku.twidere.model.CustomAPIConfig;
@ -270,7 +271,7 @@ public class APIEditorActivity extends BaseActivity implements OnCheckedChangeLi
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
mAPIConfigs = CustomAPIConfig.listDefault(getContext());
final AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
final AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(getContext());
String[] entries = new String[mAPIConfigs.length];
for (int i = 0, mAPIConfigsLength = mAPIConfigs.length; i < mAPIConfigsLength; i++) {
entries[i] = mAPIConfigs[i].getName();

4
twidere/src/main/java/org/mariotaku/twidere/activity/ComposeActivity.java
View File

@ -2087,8 +2087,8 @@ public class ComposeActivity extends BaseActivity implements OnMenuItemClickList
@NonNull
@Override
public Dialog onCreateDialog(final Bundle savedInstanceState) {
final Context wrapped = ThemeUtils.getDialogThemedContext(getActivity());
final AlertDialog.Builder builder = new AlertDialog.Builder(wrapped);
final Context context = getActivity();
final AlertDialog.Builder builder = new AlertDialog.Builder(context);
builder.setMessage(R.string.quote_protected_status_warning_message);
builder.setPositiveButton(R.string.send_anyway, this);
builder.setNegativeButton(android.R.string.cancel, null);

4
twidere/src/main/java/org/mariotaku/twidere/activity/CustomTabEditorActivity.java
View File

@ -449,8 +449,8 @@ public class CustomTabEditorActivity extends BaseActivity implements OnClickList
@Override
public Dialog onCreateDialog(final Bundle savedInstanceState) {
final Bundle args = getArguments();
final Context wrapped = ThemeUtils.getDialogThemedContext(getActivity());
final AlertDialog.Builder builder = new AlertDialog.Builder(wrapped);
final Context context = getActivity();
final AlertDialog.Builder builder = new AlertDialog.Builder(context);
builder.setTitle(args.getString(EXTRA_TITLE));
builder.setPositiveButton(android.R.string.ok, this);
builder.setNegativeButton(android.R.string.cancel, null);

6
twidere/src/main/java/org/mariotaku/twidere/activity/SignInActivity.java
View File

@ -57,6 +57,7 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.afollestad.materialdialogs.AlertDialogWrapper;
import com.rengwuxian.materialedittext.MaterialEditText;
import org.mariotaku.restfu.http.Authorization;
@ -96,7 +97,6 @@ import org.mariotaku.twidere.util.OAuthPasswordAuthenticator.LoginVerificationEx
import org.mariotaku.twidere.util.OAuthPasswordAuthenticator.WrongUserPassException;
import org.mariotaku.twidere.util.ParseUtils;
import org.mariotaku.twidere.util.SharedPreferencesWrapper;
import org.mariotaku.twidere.util.ThemeUtils;
import org.mariotaku.twidere.util.TwitterAPIFactory;
import org.mariotaku.twidere.util.TwitterContentUtils;
import org.mariotaku.twidere.util.UserAgentUtils;
@ -618,8 +618,8 @@ public class SignInActivity extends BaseActivity implements OnClickListener, Tex
@NonNull
@Override
public Dialog onCreateDialog(final Bundle savedInstanceState) {
final Context wrapped = ThemeUtils.getDialogThemedContext(getActivity());
final AlertDialog.Builder builder = new AlertDialog.Builder(wrapped);
final Context context = getActivity();
final AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(context);
builder.setTitle(R.string.sign_in_method_introduction_title);
builder.setMessage(R.string.sign_in_method_introduction);
builder.setPositiveButton(android.R.string.ok, null);

5
twidere/src/main/java/org/mariotaku/twidere/fragment/AccountsManagerFragment.java
View File

@ -53,7 +53,6 @@ import org.mariotaku.twidere.provider.TwidereDataStore.DirectMessages.Outbox;
import org.mariotaku.twidere.provider.TwidereDataStore.Mentions;
import org.mariotaku.twidere.provider.TwidereDataStore.Statuses;
import org.mariotaku.twidere.util.IntentUtils;
import org.mariotaku.twidere.util.ThemeUtils;
import org.mariotaku.twidere.util.TwidereCollectionUtils;
import org.mariotaku.twidere.util.Utils;
import org.mariotaku.twidere.util.collection.CompactHashSet;
@ -335,8 +334,8 @@ public class AccountsManagerFragment extends BaseSupportFragment implements Load
@NonNull
@Override
public Dialog onCreateDialog(final Bundle savedInstanceState) {
final Context wrapped = ThemeUtils.getDialogThemedContext(getActivity());
final AlertDialog.Builder builder = new AlertDialog.Builder(wrapped);
final Context context = getContext();
final AlertDialog.Builder builder = new AlertDialog.Builder(context);
builder.setNegativeButton(android.R.string.cancel, null);
builder.setPositiveButton(android.R.string.ok, this);
builder.setTitle(R.string.account_delete_confirm_title);

5
twidere/src/main/java/org/mariotaku/twidere/fragment/BaseFiltersFragment.java
View File

@ -64,7 +64,6 @@ import org.mariotaku.twidere.provider.TwidereDataStore.Filters;
import org.mariotaku.twidere.util.ContentValuesCreator;
import org.mariotaku.twidere.util.ParseUtils;
import org.mariotaku.twidere.util.SharedPreferencesWrapper;
import org.mariotaku.twidere.util.ThemeUtils;
import org.mariotaku.twidere.util.UserColorNameManager;
import org.mariotaku.twidere.util.Utils;
import org.mariotaku.twidere.util.dagger.GeneralComponentHelper;
@ -282,8 +281,8 @@ public abstract class BaseFiltersFragment extends AbsContentListViewFragment<Sim
@Override
public Dialog onCreateDialog(final Bundle savedInstanceState) {
final FragmentActivity activity = getActivity();
final Context wrapped = ThemeUtils.getDialogThemedContext(activity);
final AlertDialog.Builder builder = new AlertDialog.Builder(wrapped);
final Context context = activity;
final AlertDialog.Builder builder = new AlertDialog.Builder(context);
builder.setView(R.layout.dialog_auto_complete_textview);
builder.setTitle(R.string.add_rule);

5
twidere/src/main/java/org/mariotaku/twidere/fragment/CreateUserBlockDialogFragment.java
View File

@ -31,7 +31,6 @@ import android.support.v7.app.AlertDialog;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.model.ParcelableUser;
import org.mariotaku.twidere.util.AsyncTwitterWrapper;
import org.mariotaku.twidere.util.ThemeUtils;
public class CreateUserBlockDialogFragment extends BaseSupportDialogFragment implements DialogInterface.OnClickListener {
@ -55,8 +54,8 @@ public class CreateUserBlockDialogFragment extends BaseSupportDialogFragment imp
@Override
public Dialog onCreateDialog(final Bundle savedInstanceState) {
final FragmentActivity activity = getActivity();
final Context wrapped = ThemeUtils.getDialogThemedContext(activity);
final AlertDialog.Builder builder = new AlertDialog.Builder(wrapped);
final Context context = activity;
final AlertDialog.Builder builder = new AlertDialog.Builder(context);
final ParcelableUser user = getUser();
if (user != null) {
final boolean nameFirst = mPreferences.getBoolean(KEY_NAME_FIRST);

5
twidere/src/main/java/org/mariotaku/twidere/fragment/CreateUserMuteDialogFragment.java
View File

@ -31,7 +31,6 @@ import android.support.v7.app.AlertDialog;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.model.ParcelableUser;
import org.mariotaku.twidere.util.AsyncTwitterWrapper;
import org.mariotaku.twidere.util.ThemeUtils;
public class CreateUserMuteDialogFragment extends BaseSupportDialogFragment implements DialogInterface.OnClickListener {
@ -55,8 +54,8 @@ public class CreateUserMuteDialogFragment extends BaseSupportDialogFragment impl
@Override
public Dialog onCreateDialog(final Bundle savedInstanceState) {
final FragmentActivity activity = getActivity();
final Context wrapped = ThemeUtils.getDialogThemedContext(activity);
final AlertDialog.Builder builder = new AlertDialog.Builder(wrapped);
final Context context = activity;
final AlertDialog.Builder builder = new AlertDialog.Builder(context);
final ParcelableUser user = getUser();
if (user != null) {
final boolean nameFirst = mPreferences.getBoolean(KEY_NAME_FIRST);

5
twidere/src/main/java/org/mariotaku/twidere/fragment/DeleteUserListMembersDialogFragment.java
View File

@ -34,7 +34,6 @@ import org.mariotaku.twidere.R;
import org.mariotaku.twidere.model.ParcelableUser;
import org.mariotaku.twidere.model.ParcelableUserList;
import org.mariotaku.twidere.util.AsyncTwitterWrapper;
import org.mariotaku.twidere.util.ThemeUtils;
public class DeleteUserListMembersDialogFragment extends BaseSupportDialogFragment implements
DialogInterface.OnClickListener {
@ -60,8 +59,8 @@ public class DeleteUserListMembersDialogFragment extends BaseSupportDialogFragme
@Override
public Dialog onCreateDialog(final Bundle savedInstanceState) {
final FragmentActivity activity = getActivity();
final Context wrapped = ThemeUtils.getDialogThemedContext(activity);
final AlertDialog.Builder builder = new AlertDialog.Builder(wrapped);
final Context context = activity;
final AlertDialog.Builder builder = new AlertDialog.Builder(context);
final ParcelableUser[] users = getUsers();
final ParcelableUserList userList = getUserList();
if (users == null || userList == null) throw new NullPointerException();

5
twidere/src/main/java/org/mariotaku/twidere/fragment/DestroyFriendshipDialogFragment.java
View File

@ -31,7 +31,6 @@ import android.support.v7.app.AlertDialog;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.model.ParcelableUser;
import org.mariotaku.twidere.util.AsyncTwitterWrapper;
import org.mariotaku.twidere.util.ThemeUtils;
public class DestroyFriendshipDialogFragment extends BaseSupportDialogFragment implements
DialogInterface.OnClickListener {
@ -56,8 +55,8 @@ public class DestroyFriendshipDialogFragment extends BaseSupportDialogFragment i
@Override
public Dialog onCreateDialog(final Bundle savedInstanceState) {
final FragmentActivity activity = getActivity();
final Context wrapped = ThemeUtils.getDialogThemedContext(activity);
final AlertDialog.Builder builder = new AlertDialog.Builder(wrapped);
final Context context = activity;
final AlertDialog.Builder builder = new AlertDialog.Builder(context);
final ParcelableUser user = getUser();
if (user != null) {
final boolean nameFirst = mPreferences.getBoolean(KEY_NAME_FIRST);

5
twidere/src/main/java/org/mariotaku/twidere/fragment/DestroySavedSearchDialogFragment.java
View File

@ -30,7 +30,6 @@ import android.support.v7.app.AlertDialog;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.model.UserKey;
import org.mariotaku.twidere.util.AsyncTwitterWrapper;
import org.mariotaku.twidere.util.ThemeUtils;
public class DestroySavedSearchDialogFragment extends BaseSupportDialogFragment implements
DialogInterface.OnClickListener {
@ -55,8 +54,8 @@ public class DestroySavedSearchDialogFragment extends BaseSupportDialogFragment
@NonNull
@Override
public Dialog onCreateDialog(final Bundle savedInstanceState) {
final Context wrapped = ThemeUtils.getDialogThemedContext(getActivity());
final AlertDialog.Builder builder = new AlertDialog.Builder(wrapped);
final Context context = getActivity();
final AlertDialog.Builder builder = new AlertDialog.Builder(context);
final String name = getSearchName();
if (name != null) {
builder.setTitle(getString(R.string.destroy_saved_search, name));

5
twidere/src/main/java/org/mariotaku/twidere/fragment/DestroyStatusDialogFragment.java
View File

@ -30,7 +30,6 @@ import android.support.v7.app.AlertDialog;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.model.ParcelableStatus;
import org.mariotaku.twidere.util.AsyncTwitterWrapper;
import org.mariotaku.twidere.util.ThemeUtils;
public class DestroyStatusDialogFragment extends BaseSupportDialogFragment implements DialogInterface.OnClickListener {
@ -53,8 +52,8 @@ public class DestroyStatusDialogFragment extends BaseSupportDialogFragment imple
@NonNull
@Override
public Dialog onCreateDialog(final Bundle savedInstanceState) {
final Context wrapped = ThemeUtils.getDialogThemedContext(getActivity());
final AlertDialog.Builder builder = new AlertDialog.Builder(wrapped);
final Context context = getActivity();
final AlertDialog.Builder builder = new AlertDialog.Builder(context);
builder.setTitle(R.string.destroy_status);
builder.setMessage(R.string.destroy_status_confirm_message);
builder.setPositiveButton(android.R.string.ok, this);

5
twidere/src/main/java/org/mariotaku/twidere/fragment/DestroyUserListDialogFragment.java
View File

@ -30,7 +30,6 @@ import android.support.v7.app.AlertDialog;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.model.ParcelableUserList;
import org.mariotaku.twidere.util.AsyncTwitterWrapper;
import org.mariotaku.twidere.util.ThemeUtils;
public class DestroyUserListDialogFragment extends BaseSupportDialogFragment implements DialogInterface.OnClickListener {
@ -53,8 +52,8 @@ public class DestroyUserListDialogFragment extends BaseSupportDialogFragment imp
@NonNull
@Override
public Dialog onCreateDialog(final Bundle savedInstanceState) {
final Context wrapped = ThemeUtils.getDialogThemedContext(getActivity());
final AlertDialog.Builder builder = new AlertDialog.Builder(wrapped);
final Context context = getActivity();
final AlertDialog.Builder builder = new AlertDialog.Builder(context);
final ParcelableUserList userList = getUserList();
if (userList != null) {
builder.setTitle(getString(R.string.delete_user_list, userList.name));

5
twidere/src/main/java/org/mariotaku/twidere/fragment/DestroyUserListSubscriptionDialogFragment.java
View File

@ -30,7 +30,6 @@ import android.support.v7.app.AlertDialog;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.model.ParcelableUserList;
import org.mariotaku.twidere.util.AsyncTwitterWrapper;
import org.mariotaku.twidere.util.ThemeUtils;
public class DestroyUserListSubscriptionDialogFragment extends BaseSupportDialogFragment implements
DialogInterface.OnClickListener {
@ -54,8 +53,8 @@ public class DestroyUserListSubscriptionDialogFragment extends BaseSupportDialog
@NonNull
@Override
public Dialog onCreateDialog(final Bundle savedInstanceState) {
final Context wrapped = ThemeUtils.getDialogThemedContext(getActivity());
final AlertDialog.Builder builder = new AlertDialog.Builder(wrapped);
final Context context = getActivity();
final AlertDialog.Builder builder = new AlertDialog.Builder(context);
final ParcelableUserList userList = getUserList();
if (userList != null) {
builder.setTitle(getString(R.string.unsubscribe_from_user_list, userList.name));

3
twidere/src/main/java/org/mariotaku/twidere/fragment/DraftsFragment.java
View File

@ -74,7 +74,6 @@ import org.mariotaku.twidere.service.BackgroundOperationService;
import org.mariotaku.twidere.util.AsyncTaskUtils;
import org.mariotaku.twidere.util.AsyncTwitterWrapper;
import org.mariotaku.twidere.util.JsonSerializer;
import org.mariotaku.twidere.util.ThemeUtils;
import java.io.File;
import java.util.ArrayList;
@ -328,7 +327,7 @@ public class DraftsFragment extends BaseSupportFragment implements Constants, Lo
@NonNull
@Override
public Dialog onCreateDialog(final Bundle savedInstanceState) {
final Context context = ThemeUtils.getDialogThemedContext(getActivity());
final Context context = getActivity();
final AlertDialog.Builder builder = new AlertDialog.Builder(context);
builder.setMessage(R.string.delete_drafts_confirm);
builder.setPositiveButton(android.R.string.ok, this);

5
twidere/src/main/java/org/mariotaku/twidere/fragment/HostMappingsListFragment.java
View File

@ -53,7 +53,6 @@ import org.mariotaku.twidere.R;
import org.mariotaku.twidere.adapter.ArrayAdapter;
import org.mariotaku.twidere.util.ParseUtils;
import org.mariotaku.twidere.util.SharedPreferencesWrapper;
import org.mariotaku.twidere.util.ThemeUtils;
import java.util.Map;
@ -229,8 +228,8 @@ public class HostMappingsListFragment extends BaseListFragment implements MultiC
@NonNull
@Override
public Dialog onCreateDialog(final Bundle savedInstanceState) {
final Context wrapped = ThemeUtils.getDialogThemedContext(getActivity());
final AlertDialog.Builder builder = new AlertDialog.Builder(wrapped);
final Context context = getActivity();
final AlertDialog.Builder builder = new AlertDialog.Builder(context);
builder.setView(R.layout.dialog_host_mapping);
builder.setTitle(R.string.add_host_mapping);
builder.setPositiveButton(android.R.string.ok, this);

5
twidere/src/main/java/org/mariotaku/twidere/fragment/ReportSpamDialogFragment.java
View File

@ -31,7 +31,6 @@ import android.support.v7.app.AlertDialog;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.model.ParcelableUser;
import org.mariotaku.twidere.util.AsyncTwitterWrapper;
import org.mariotaku.twidere.util.ThemeUtils;
public class ReportSpamDialogFragment extends BaseSupportDialogFragment implements DialogInterface.OnClickListener {
@ -55,8 +54,8 @@ public class ReportSpamDialogFragment extends BaseSupportDialogFragment implemen
@Override
public Dialog onCreateDialog(final Bundle savedInstanceState) {
final FragmentActivity activity = getActivity();
final Context wrapped = ThemeUtils.getDialogThemedContext(activity);
final AlertDialog.Builder builder = new AlertDialog.Builder(wrapped);
final Context context = activity;
final AlertDialog.Builder builder = new AlertDialog.Builder(context);
final ParcelableUser user = getUser();
if (user != null) {
final boolean nameFirst = mPreferences.getBoolean(KEY_NAME_FIRST);

6
twidere/src/main/java/org/mariotaku/twidere/fragment/RetweetQuoteDialogFragment.java
View File

@ -74,8 +74,7 @@ public class RetweetQuoteDialogFragment extends BaseSupportDialogFragment implem
@NonNull
@Override
public Dialog onCreateDialog(final Bundle savedInstanceState) {
final Context wrapped = ThemeUtils.getDialogThemedContext(getActivity());
final AlertDialog.Builder builder = new AlertDialog.Builder(wrapped);
final AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
final Context context = builder.getContext();
final LayoutInflater inflater = LayoutInflater.from(context);
@SuppressLint("InflateParams") final View view = inflater.inflate(R.layout.dialog_status_quote_retweet, null);
@ -84,7 +83,8 @@ public class RetweetQuoteDialogFragment extends BaseSupportDialogFragment implem
final IStatusViewHolder holder = new StatusViewHolder(adapter, view.findViewById(R.id.item_content));
final ParcelableStatus status = getStatus();
assert status != null;
final ParcelableCredentials credentials = ParcelableCredentialsUtils.getCredentials(wrapped, status.account_key);
final ParcelableCredentials credentials = ParcelableCredentialsUtils.getCredentials(getContext(),
status.account_key);
assert credentials != null;
builder.setView(view);

5
twidere/src/main/java/org/mariotaku/twidere/fragment/SensitiveContentWarningDialogFragment.java
View File

@ -31,7 +31,6 @@ import org.mariotaku.twidere.model.ParcelableMedia;
import org.mariotaku.twidere.model.ParcelableStatus;
import org.mariotaku.twidere.model.UserKey;
import org.mariotaku.twidere.util.IntentUtils;
import org.mariotaku.twidere.util.ThemeUtils;
import org.mariotaku.twidere.util.Utils;
public class SensitiveContentWarningDialogFragment extends BaseSupportDialogFragment implements
@ -62,8 +61,8 @@ public class SensitiveContentWarningDialogFragment extends BaseSupportDialogFrag
@NonNull
@Override
public Dialog onCreateDialog(final Bundle savedInstanceState) {
final Context wrapped = ThemeUtils.getDialogThemedContext(getActivity());
final AlertDialog.Builder builder = new AlertDialog.Builder(wrapped);
final Context context = getActivity();
final AlertDialog.Builder builder = new AlertDialog.Builder(context);
builder.setTitle(android.R.string.dialog_alert_title);
builder.setMessage(R.string.sensitive_content_warning);
builder.setPositiveButton(android.R.string.ok, this);

9
twidere/src/main/java/org/mariotaku/twidere/fragment/SetUserNicknameDialogFragment.java
View File

@ -35,7 +35,6 @@ import android.widget.FrameLayout;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.model.UserKey;
import org.mariotaku.twidere.util.ParseUtils;
import org.mariotaku.twidere.util.ThemeUtils;
public class SetUserNicknameDialogFragment extends BaseSupportDialogFragment implements OnClickListener {
@ -71,16 +70,16 @@ public class SetUserNicknameDialogFragment extends BaseSupportDialogFragment imp
public Dialog onCreateDialog(final Bundle savedInstanceState) {
final Bundle args = getArguments();
final String nick = args.getString(EXTRA_NAME);
final Context wrapped = ThemeUtils.getDialogThemedContext(getActivity());
final AlertDialog.Builder builder = new AlertDialog.Builder(wrapped);
final Context context = getActivity();
final AlertDialog.Builder builder = new AlertDialog.Builder(context);
builder.setTitle(R.string.set_nickname);
builder.setPositiveButton(android.R.string.ok, this);
if (!TextUtils.isEmpty(nick)) {
builder.setNeutralButton(R.string.clear, this);
}
builder.setNegativeButton(android.R.string.cancel, null);
final FrameLayout view = new FrameLayout(wrapped);
mEditText = new AppCompatEditText(wrapped);
final FrameLayout view = new FrameLayout(context);
mEditText = new AppCompatEditText(context);
final FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT,
FrameLayout.LayoutParams.WRAP_CONTENT);
lp.leftMargin = lp.topMargin = lp.bottomMargin = lp.rightMargin = getResources().getDimensionPixelSize(

6
twidere/src/main/java/org/mariotaku/twidere/fragment/StatusFragment.java
View File

@ -20,7 +20,6 @@
package org.mariotaku.twidere.fragment;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.ContentResolver;
import android.content.ContentValues;
@ -82,6 +81,7 @@ import android.widget.ImageView;
import android.widget.Space;
import android.widget.TextView;
import com.afollestad.materialdialogs.AlertDialogWrapper;
import com.squareup.otto.Subscribe;
import org.apache.commons.lang3.ArrayUtils;
@ -870,8 +870,8 @@ public class StatusFragment extends BaseSupportFragment implements LoaderCallbac
@NonNull
@Override
public Dialog onCreateDialog(final Bundle savedInstanceState) {
final Context wrapped = ThemeUtils.getDialogThemedContext(getActivity());
final AlertDialog.Builder builder = new AlertDialog.Builder(wrapped);
final Context context = getActivity();
final AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(context);
builder.setTitle(android.R.string.dialog_alert_title);
builder.setMessage(R.string.sensitive_content_warning);
builder.setPositiveButton(android.R.string.ok, this);

5
twidere/src/main/java/org/mariotaku/twidere/fragment/UserListFragment.java
View File

@ -72,7 +72,6 @@ import org.mariotaku.twidere.util.IntentUtils;
import org.mariotaku.twidere.util.LinkCreator;
import org.mariotaku.twidere.util.MenuUtils;
import org.mariotaku.twidere.util.ParseUtils;
import org.mariotaku.twidere.util.ThemeUtils;
import org.mariotaku.twidere.util.TwitterAPIFactory;
import org.mariotaku.twidere.util.Utils;
@ -413,8 +412,8 @@ public class UserListFragment extends AbsToolbarTabPagesFragment implements OnCl
mName = bundle != null ? bundle.getString(EXTRA_LIST_NAME) : null;
mDescription = bundle != null ? bundle.getString(EXTRA_DESCRIPTION) : null;
mIsPublic = bundle == null || bundle.getBoolean(EXTRA_IS_PUBLIC, true);
final Context wrapped = ThemeUtils.getDialogThemedContext(getActivity());
final AlertDialog.Builder builder = new AlertDialog.Builder(wrapped);
final Context context = getActivity();
final AlertDialog.Builder builder = new AlertDialog.Builder(context);
builder.setView(R.layout.dialog_user_list_detail_editor);
builder.setTitle(R.string.user_list);
builder.setPositiveButton(android.R.string.ok, this);

4
twidere/src/main/java/org/mariotaku/twidere/util/ThemeUtils.java
View File

@ -182,10 +182,6 @@ public class ThemeUtils implements Constants {
return getColorFromAttribute(context, android.R.attr.colorForeground, 0);
}
public static Context getDialogThemedContext(final Context context) {
return new ContextThemeWrapper(context, R.style.Theme_Twidere_Dialog);
}
public static Drawable getImageHighlightDrawable(final Context context) {
final Drawable d = getSelectableItemBackgroundDrawable(context);
if (d != null) {

5
twidere/src/main/res/layout/list_item_suggestion_search.xml
View File

@ -26,7 +26,10 @@
android:gravity="center_vertical"
android:minHeight="?android:listPreferredItemHeightSmall"
android:orientation="horizontal"
android:padding="@dimen/element_spacing_small">
android:paddingBottom="@dimen/element_spacing_xsmall"
android:paddingLeft="@dimen/element_spacing_small"
android:paddingRight="@dimen/element_spacing_small"
android:paddingTop="@dimen/element_spacing_xsmall">
<org.mariotaku.twidere.view.IconActionButton
android:id="@android:id/icon"

5
twidere/src/main/res/layout/list_item_suggestion_user.xml
View File

@ -26,7 +26,10 @@
android:gravity="center_vertical"
android:minHeight="?android:listPreferredItemHeightSmall"
android:orientation="horizontal"
android:padding="@dimen/element_spacing_small">
android:paddingBottom="@dimen/element_spacing_xsmall"
android:paddingLeft="@dimen/element_spacing_small"
android:paddingRight="@dimen/element_spacing_small"
android:paddingTop="@dimen/element_spacing_xsmall">
<org.mariotaku.twidere.view.ProfileImageView
android:id="@android:id/icon"

2
twidere/src/main/res/values/dimens.xml
View File

@ -98,6 +98,6 @@
<dimen name="height_player_control_panel">40dp</dimen>
<dimen name="toolbar_elevation">8dp</dimen>
<dimen name="element_size_quick_search_bar_item_icon">42dp</dimen>
<dimen name="element_size_quick_search_bar_item_icon">40dp</dimen>
</resources>