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

improved theme 

finding a library for colored widgets
This commit is contained in:
Mariotaku Lee 2015-04-22 22:19:26 +08:00
parent c09259f30e
commit 16baa2c966
68 changed files with 537 additions and 1517 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
twidere/src/fdroid/java/org/mariotaku/twidere/activity/support/OpenStreetMapViewerActivity.java
View File

@ -87,8 +87,8 @@ public class OpenStreetMapViewerActivity extends ThemedAppCompatActivity impleme
}
@Override
public void onSupportContentChanged() {
super.onSupportContentChanged();
public void onContentChanged() {
super.onContentChanged();
mMapView = (MapView) findViewById(R.id.map_view);
}

1
twidere/src/main/AndroidManifest.xml
View File

@ -196,6 +196,7 @@
<activity
android:name=".activity.support.SignInActivity"
android:label="@string/sign_in"
android:theme="@style/Theme.Twidere.Dark"
android:windowSoftInputMode="adjustResize">
<intent-filter>
<action android:name="org.mariotaku.twidere.TWITTER_LOGIN"/>

94
twidere/src/main/java/android/support/v7/app/ThemedAppCompatDelegate.java Normal file
View File

@ -0,0 +1,94 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package android.support.v7.app;
import android.app.Activity;
import android.content.Context;
import android.os.Build;
import android.support.v4.view.LayoutInflaterCompat;
import android.support.v4.view.LayoutInflaterFactory;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;
import android.view.Window;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.activity.iface.IThemedActivity;
import org.mariotaku.twidere.util.ThemeUtils;
/**
* Created by mariotaku on 15/4/22.
*/
public class ThemedAppCompatDelegate implements Constants {
/**
* Create a {@link android.support.v7.app.AppCompatDelegate} to use with {@code activity}.
*
* @param callback An optional callback for AppCompat specific events
*/
public static AppCompatDelegate create(IThemedActivity themed, AppCompatCallback callback) {
final Activity activity = (Activity) themed;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
return new ThemedAppCompatDelegateImplV11(themed, activity, activity.getWindow(), callback);
} else {
throw new UnsupportedOperationException();
}
}
private static class ThemedAppCompatDelegateImplV11 extends AppCompatDelegateImplV11 {
private final IThemedActivity themed;
private ThemedAppCompatDelegateImplV11(IThemedActivity themed, Context context, Window window, AppCompatCallback callback) {
super(context, window, callback);
this.themed = themed;
}
@Override
public void installViewFactory() {
final LayoutInflater inflater = LayoutInflater.from(mContext);
if (inflater.getFactory() == null) {
LayoutInflaterCompat.setFactory(inflater, new ThemedLayoutInflaterFactory(themed, this));
}
}
}
/**
* Created by mariotaku on 15/4/22.
*/
private static class ThemedLayoutInflaterFactory implements LayoutInflaterFactory {
private final IThemedActivity activity;
private final ThemedAppCompatDelegateImplV11 delegate;
public ThemedLayoutInflaterFactory(IThemedActivity activity, ThemedAppCompatDelegateImplV11 delegate) {
this.activity = activity;
this.delegate = delegate;
}
@Override
public View onCreateView(View view, String s, Context context, AttributeSet attributeSet) {
final View createdView = delegate.onCreateView(view, s, context, attributeSet);
ThemeUtils.initView(createdView, activity.getCurrentThemeColor(), activity.getCurrentProfileImageStyle());
return createdView;
}
}
}

30
twidere/src/main/java/org/mariotaku/twidere/activity/AppCompatPreferenceActivity.java
View File

@ -22,7 +22,9 @@ import android.support.annotation.LayoutRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatCallback;
import android.support.v7.app.AppCompatDelegate;
import android.support.v7.view.ActionMode;
import android.support.v7.widget.Toolbar;
import android.view.MenuInflater;
import android.view.View;
@ -35,13 +37,37 @@ import android.view.ViewGroup;
* This technique can be used with an {@link android.app.Activity} class, not just
* {@link android.preference.PreferenceActivity}.
*/
public abstract class AppCompatPreferenceActivity extends PreferenceActivity {
public abstract class AppCompatPreferenceActivity extends PreferenceActivity implements AppCompatCallback {
private AppCompatDelegate mDelegate;
public ActionBar getSupportActionBar() {
return getDelegate().getSupportActionBar();
}
/**
* Notifies the Activity that a support action mode has been started.
* Activity subclasses overriding this method should call the superclass implementation.
*
* @param mode The new action mode.
*/
@Override
public void onSupportActionModeStarted(ActionMode mode) {
}
/**
* Notifies the activity that a support action mode has finished.
* Activity subclasses overriding this method should call the superclass implementation.
*
* @param mode The action mode that just finished.
*/
@Override
public void onSupportActionModeFinished(ActionMode mode) {
}
public ActionMode startSupportActionMode(ActionMode.Callback callback) {
return getDelegate().startSupportActionMode(callback);
}
public void setSupportActionBar(@Nullable Toolbar toolbar) {
getDelegate().setSupportActionBar(toolbar);
}
@ -126,7 +152,7 @@ public abstract class AppCompatPreferenceActivity extends PreferenceActivity {
private AppCompatDelegate getDelegate() {
if (mDelegate == null) {
mDelegate = AppCompatDelegate.create(this, null);
mDelegate = AppCompatDelegate.create(this, this);
}
return mDelegate;
}

203
twidere/src/main/java/org/mariotaku/twidere/activity/BasePreferenceActivity.java
View File

@ -19,41 +19,46 @@
package org.mariotaku.twidere.activity;
import android.annotation.SuppressLint;
import android.content.Context;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.LayoutRes;
import android.support.annotation.NonNull;
import android.support.v4.view.WindowCompat;
import android.support.v7.app.ActionBar;
import android.support.v7.widget.ActionMenuView;
import android.support.v7.widget.Toolbar;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.style.ForegroundColorSpan;
import android.util.AttributeSet;
import android.view.Menu;
import android.view.View;
import android.view.ViewGroup;
import android.view.WindowManager.LayoutParams;
import android.widget.FrameLayout;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.activity.iface.IThemedActivity;
import org.mariotaku.twidere.util.StrictModeUtils;
import org.mariotaku.twidere.util.ThemeUtils;
import org.mariotaku.twidere.util.Utils;
import org.mariotaku.twidere.view.ShapedImageView;
import org.mariotaku.twidere.util.ViewUtils;
import org.mariotaku.twidere.view.ShapedImageView.ShapeStyle;
import org.mariotaku.twidere.view.TintedStatusFrameLayout;
public abstract class BasePreferenceActivity extends AppCompatPreferenceActivity implements Constants,
IThemedActivity {
private TintedStatusFrameLayout mMainContent;
private int mCurrentThemeResource, mCurrentThemeColor, mCurrentThemeBackgroundAlpha;
@ShapeStyle
private int mProfileImageStyle;
private String mCurrentThemeBackgroundOption;
@Override
public final int getCurrentThemeResourceId() {
return mCurrentThemeResource;
}
@Override
public int getThemeBackgroundAlpha() {
return ThemeUtils.getUserThemeBackgroundAlpha(this);
}
@Override
public int getCurrentThemeBackgroundAlpha() {
return mCurrentThemeBackgroundAlpha;
@ -65,13 +70,23 @@ public abstract class BasePreferenceActivity extends AppCompatPreferenceActivity
}
@Override
public String getThemeBackgroundOption() {
return ThemeUtils.getThemeBackgroundOption(this);
public int getCurrentThemeColor() {
return mCurrentThemeColor;
}
@Override
public int getCurrentThemeColor() {
return mCurrentThemeColor;
public final int getCurrentThemeResourceId() {
return mCurrentThemeResource;
}
@Override
public int getThemeBackgroundAlpha() {
return ThemeUtils.getUserThemeBackgroundAlpha(this);
}
@Override
public String getThemeBackgroundOption() {
return ThemeUtils.getThemeBackgroundOption(this);
}
@Override
@ -79,11 +94,30 @@ public abstract class BasePreferenceActivity extends AppCompatPreferenceActivity
return ThemeUtils.getThemeFontFamily(this);
}
@Override
public int getCurrentProfileImageStyle() {
return mProfileImageStyle;
}
@Override
public final void restart() {
Utils.restartActivity(this);
}
@Override
public void onContentChanged() {
super.onContentChanged();
mMainContent = (TintedStatusFrameLayout) findViewById(R.id.main_content);
setupTintStatusBar();
}
@Override
public void onSupportActionModeStarted(android.support.v7.view.ActionMode mode) {
super.onSupportActionModeStarted(mode);
ThemeUtils.applySupportActionModeColor(mode, this, getCurrentThemeResourceId(),
getCurrentThemeColor(), getThemeBackgroundOption(), true);
}
@Override
protected void onCreate(final Bundle savedInstanceState) {
if (Utils.isDebugBuild()) {
@ -91,28 +125,44 @@ public abstract class BasePreferenceActivity extends AppCompatPreferenceActivity
StrictModeUtils.detectAllThreadPolicy();
}
setTheme();
setupWindow();
super.onCreate(savedInstanceState);
setupActionBar();
}
@Override
public View onCreateView(String name, @NonNull Context context, @NonNull AttributeSet attrs) {
final View view = ThemeUtils.createView(name, context, attrs, mCurrentThemeColor);
if (view instanceof ShapedImageView) {
final ShapedImageView shapedImageView = (ShapedImageView) view;
shapedImageView.setStyle(mProfileImageStyle);
public void setContentView(@LayoutRes int layoutResID) {
final FrameLayout mainContent = initMainContent();
getLayoutInflater().inflate(layoutResID, mainContent, true);
super.setContentView(mainContent);
}
@Override
public void setContentView(View view) {
final FrameLayout mainContent = initMainContent();
mainContent.removeAllViews();
mainContent.addView(view);
super.setContentView(mainContent);
}
@Override
public void setContentView(View view, ViewGroup.LayoutParams params) {
final FrameLayout mainContent = initMainContent();
mainContent.removeAllViews();
mainContent.addView(view, params);
super.setContentView(mainContent);
}
@Override
public void addContentView(View view, ViewGroup.LayoutParams params) {
FrameLayout mainContent = (FrameLayout) findViewById(R.id.main_content);
if (mainContent == null) {
@SuppressLint("InflateParams")
final View mainLayout = getLayoutInflater().inflate(R.layout.activity_settings, null);
mainContent = (FrameLayout) mainLayout.findViewById(R.id.main_content);
}
if (view != null) return view;
return super.onCreateView(name, context, attrs);
}
@Override
protected void onResume() {
super.onResume();
}
@Override
protected void onStart() {
super.onStart();
mainContent.addView(view, params);
onContentChanged();
}
@Override
@ -127,6 +177,58 @@ public abstract class BasePreferenceActivity extends AppCompatPreferenceActivity
super.onTitleChanged(title, color);
}
protected boolean isActionBarOutlineEnabled() {
return true;
}
@Override
protected void onStart() {
super.onStart();
}
@Override
protected void onResume() {
super.onResume();
}
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
final boolean result = super.onPrepareOptionsMenu(menu);
if (!shouldSetActionItemColor()) return result;
final View actionBarView = getWindow().findViewById(android.support.v7.appcompat.R.id.action_bar);
if (actionBarView instanceof Toolbar) {
final int themeColor = getCurrentThemeColor();
final int themeId = getCurrentThemeResourceId();
final int itemColor = ThemeUtils.getContrastActionBarItemColor(this, themeId, themeColor);
final Toolbar toolbar = (Toolbar) actionBarView;
ThemeUtils.setActionBarOverflowColor(toolbar, itemColor);
final int popupColor = ThemeUtils.getThemeForegroundColor(toolbar.getContext(), toolbar.getPopupTheme());
ThemeUtils.wrapToolbarMenuIcon(ViewUtils.findViewByType(actionBarView, ActionMenuView.class), itemColor, popupColor);
}
return result;
}
@Override
public View onCreateView(String name, @NonNull Context context, @NonNull AttributeSet attrs) {
final View view = super.onCreateView(name, context, attrs);
ThemeUtils.initView(view, getCurrentThemeColor(), mProfileImageStyle);
return view;
}
protected boolean shouldSetActionItemColor() {
return true;
}
private FrameLayout initMainContent() {
final FrameLayout mainContent = (FrameLayout) findViewById(R.id.main_content);
if (mainContent != null) {
return mainContent;
}
@SuppressLint("InflateParams")
final View view = getLayoutInflater().inflate(R.layout.activity_settings, null);
return (FrameLayout) view.findViewById(R.id.main_content);
}
private void setTheme() {
mCurrentThemeResource = getThemeResourceId();
mCurrentThemeColor = getThemeColor();
@ -137,4 +239,41 @@ public abstract class BasePreferenceActivity extends AppCompatPreferenceActivity
ThemeUtils.applyWindowBackground(this, getWindow(), mCurrentThemeResource, mCurrentThemeBackgroundOption, mCurrentThemeBackgroundAlpha);
}
private void setupActionBar() {
final ActionBar actionBar = getSupportActionBar();
if (actionBar == null) return;
final int themeColor = getCurrentThemeColor();
final int themeId = getCurrentThemeResourceId();
final String option = getThemeBackgroundOption();
final int actionBarItemsColor = ThemeUtils.getContrastActionBarItemColor(this, themeId, themeColor);
ThemeUtils.applyActionBarBackground(actionBar, this, themeId, themeColor, option, isActionBarOutlineEnabled());
ThemeUtils.setActionBarItemsColor(getWindow(), actionBar, actionBarItemsColor);
}
private void setupTintStatusBar() {
if (mMainContent == null) return;
final int color = getCurrentThemeColor();
final int alpha = ThemeUtils.isTransparentBackground(getThemeBackgroundOption()) ? getCurrentThemeBackgroundAlpha() : 0xFF;
if (ThemeUtils.isDarkTheme(getCurrentThemeResourceId())) {
mMainContent.setColor(getResources().getColor(R.color.background_color_action_bar_dark), alpha);
} else {
mMainContent.setColor(color, alpha);
}
mMainContent.setDrawShadow(false);
mMainContent.setDrawColor(true);
mMainContent.setFactor(1);
}
private void setupWindow() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
getWindow().addFlags(LayoutParams.FLAG_TRANSLUCENT_STATUS);
}
supportRequestWindowFeature(WindowCompat.FEATURE_ACTION_BAR);
supportRequestWindowFeature(WindowCompat.FEATURE_ACTION_BAR_OVERLAY);
supportRequestWindowFeature(WindowCompat.FEATURE_ACTION_MODE_OVERLAY);
}
}

17
twidere/src/main/java/org/mariotaku/twidere/activity/BaseThemedActivity.java
View File

@ -35,17 +35,18 @@ public abstract class BaseThemedActivity extends Activity implements IThemedActi
private int mCurrentThemeBackgroundAlpha;
private String mCurrentThemeFontFamily;
private String mCurrentThemeBackgroundOption;
@Override
public String getCurrentThemeBackgroundOption() {
return mCurrentThemeBackgroundOption;
}
private int mProfileImageStyle;
@Override
public int getCurrentThemeBackgroundAlpha() {
return mCurrentThemeBackgroundAlpha;
}
@Override
public String getCurrentThemeBackgroundOption() {
return mCurrentThemeBackgroundOption;
}
@Override
public int getCurrentThemeColor() {
return mCurrentThemeColor;
@ -72,6 +73,11 @@ public abstract class BaseThemedActivity extends Activity implements IThemedActi
@Override
public abstract int getThemeResourceId();
@Override
public int getCurrentProfileImageStyle() {
return mProfileImageStyle;
}
@Override
public final void restart() {
Utils.restartActivity(this);
@ -112,6 +118,7 @@ public abstract class BaseThemedActivity extends Activity implements IThemedActi
mCurrentThemeFontFamily = getThemeFontFamily();
mCurrentThemeBackgroundAlpha = getThemeBackgroundAlpha();
mCurrentThemeBackgroundOption = getThemeBackgroundOption();
mProfileImageStyle = Utils.getProfileImageStyle(this);
setTheme(mCurrentThemeResource);
ThemeUtils.applyWindowBackground(this, getWindow(), mCurrentThemeResource, mCurrentThemeBackgroundOption, mCurrentThemeBackgroundAlpha);
}

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

@ -87,8 +87,8 @@ public class FiltersActivity extends BaseDialogWhenLargeActivity {
}
@Override
public void onSupportContentChanged() {
super.onSupportContentChanged();
public void onContentChanged() {
super.onContentChanged();
mViewPager = (ViewPager) findViewById(R.id.view_pager);
mPagerIndicator = (TabPagerIndicator) findViewById(R.id.view_pager_tabs);
}

2
twidere/src/main/java/org/mariotaku/twidere/activity/iface/IThemedActivity.java
View File

@ -39,6 +39,8 @@ public interface IThemedActivity {
int getThemeResourceId();
int getCurrentProfileImageStyle();
void restart();
}

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

@ -70,8 +70,8 @@ public class BaseDialogWhenLargeActivity extends BaseAppCompatActivity {
}
@Override
public void onSupportContentChanged() {
super.onSupportContentChanged();
public void onContentChanged() {
super.onContentChanged();
mMainContent = (TintedStatusFrameLayout) findViewById(R.id.main_content);
setupTintStatusBar();
}

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

@ -242,8 +242,8 @@ public class DraftsActivity extends BaseDialogWhenLargeActivity implements Loade
}
@Override
public void onSupportContentChanged() {
super.onSupportContentChanged();
public void onContentChanged() {
super.onContentChanged();
mListView = (ListView) findViewById(android.R.id.list);
mEmptyView = findViewById(android.R.id.empty);
mEmptyText = (TextView) findViewById(R.id.empty_text);

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

@ -660,8 +660,8 @@ public class HomeActivity extends BaseAppCompatActivity implements OnClickListen
}
@Override
public void onSupportContentChanged() {
super.onSupportContentChanged();
public void onContentChanged() {
super.onContentChanged();
mActionBar = (Toolbar) findViewById(R.id.actionbar);
mTabIndicator = (TabPagerIndicator) findViewById(R.id.main_tabs);
mSlidingMenu = (HomeSlidingMenu) findViewById(R.id.home_menu);

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

@ -200,8 +200,8 @@ public class LinkHandlerActivity extends BaseAppCompatActivity implements System
}
@Override
public void onSupportContentChanged() {
super.onSupportContentChanged();
public void onContentChanged() {
super.onContentChanged();
mMainContent = (TintedStatusFrameLayout) findViewById(R.id.main_content);
}

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

@ -140,8 +140,8 @@ public final class MediaViewerActivity extends ThemedAppCompatActivity implement
}
@Override
public void onSupportContentChanged() {
super.onSupportContentChanged();
public void onContentChanged() {
super.onContentChanged();
mViewPager = (ViewPager) findViewById(R.id.view_pager);
mIndicator = (LinePageIndicator) findViewById(R.id.pager_indicator);
mMediaStatusContainer = findViewById(R.id.media_status_container);

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

@ -48,7 +48,6 @@ import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.Window;
import android.widget.Button;
import android.widget.EditText;
import android.widget.LinearLayout;
@ -104,12 +103,11 @@ public class SignInActivity extends BaseAppCompatActivity implements TwitterCons
private int mAuthType;
private String mConsumerKey, mConsumerSecret;
private String mUsername, mPassword;
private boolean mBackPressed;
private long mAPIChangeTimestamp;
private EditText mEditUsername, mEditPassword;
private Button mSignInButton, mSignUpButton;
private LinearLayout mSigninSignupContainer, mUsernamePasswordContainer;
private LinearLayout mSignInSignUpContainer, mUsernamePasswordContainer;
private TwidereApplication mApplication;
private SharedPreferences mPreferences;
@ -140,8 +138,7 @@ public class SignInActivity extends BaseAppCompatActivity implements TwitterCons
mConsumerSecret = data.getStringExtra(Accounts.CONSUMER_SECRET);
final boolean isTwipOMode = mAuthType == Accounts.AUTH_TYPE_TWIP_O_MODE;
mUsernamePasswordContainer.setVisibility(isTwipOMode ? View.GONE : View.VISIBLE);
mSigninSignupContainer
.setOrientation(isTwipOMode ? LinearLayout.VERTICAL : LinearLayout.HORIZONTAL);
mSignInSignUpContainer.setOrientation(isTwipOMode ? LinearLayout.VERTICAL : LinearLayout.HORIZONTAL);
}
setSignInButton();
invalidateOptionsMenu();
@ -157,19 +154,6 @@ public class SignInActivity extends BaseAppCompatActivity implements TwitterCons
super.onActivityResult(requestCode, resultCode, data);
}
@Override
public void onBackPressed() {
if (mTask != null && mTask.getStatus() == AsyncTask.Status.RUNNING && !mBackPressed) {
final Toast toast = Toast.makeText(this, R.string.signing_in_please_wait, Toast.LENGTH_SHORT);
toast.show();
return;
}
if (mTask != null && mTask.getStatus() == AsyncTask.Status.RUNNING) {
mTask.cancel(false);
}
super.onBackPressed();
}
@Override
public void onClick(final View v) {
switch (v.getId()) {
@ -192,13 +176,13 @@ public class SignInActivity extends BaseAppCompatActivity implements TwitterCons
}
@Override
public void onSupportContentChanged() {
super.onSupportContentChanged();
public void onContentChanged() {
super.onContentChanged();
mEditUsername = (EditText) findViewById(R.id.username);
mEditPassword = (EditText) findViewById(R.id.password);
mSignInButton = (Button) findViewById(R.id.sign_in);
mSignUpButton = (Button) findViewById(R.id.sign_up);
mSigninSignupContainer = (LinearLayout) findViewById(R.id.sign_in_sign_up);
mSignInSignUpContainer = (LinearLayout) findViewById(R.id.sign_in_sign_up);
mUsernamePasswordContainer = (LinearLayout) findViewById(R.id.username_password);
}
@ -293,14 +277,12 @@ public class SignInActivity extends BaseAppCompatActivity implements TwitterCons
@Override
protected void onCreate(final Bundle savedInstanceState) {
supportRequestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
supportRequestWindowFeature(WindowCompat.FEATURE_ACTION_BAR);
super.onCreate(savedInstanceState);
mPreferences = getSharedPreferences(SHARED_PREFERENCES_NAME, MODE_PRIVATE);
mResolver = getContentResolver();
mApplication = TwidereApplication.getInstance(this);
setContentView(R.layout.activity_sign_in);
setSupportProgressBarIndeterminateVisibility(false);
final long[] account_ids = getActivatedAccountIds(this);
final ActionBar actionBar = getSupportActionBar();
if (actionBar != null) {
@ -320,7 +302,7 @@ public class SignInActivity extends BaseAppCompatActivity implements TwitterCons
mUsernamePasswordContainer
.setVisibility(mAuthType == Accounts.AUTH_TYPE_TWIP_O_MODE ? View.GONE : View.VISIBLE);
mSigninSignupContainer.setOrientation(mAuthType == Accounts.AUTH_TYPE_TWIP_O_MODE ? LinearLayout.VERTICAL
mSignInSignUpContainer.setOrientation(mAuthType == Accounts.AUTH_TYPE_TWIP_O_MODE ? LinearLayout.VERTICAL
: LinearLayout.HORIZONTAL);
mEditUsername.setText(mUsername);
@ -701,11 +683,6 @@ public class SignInActivity extends BaseAppCompatActivity implements TwitterCons
}
@Override
public int getThemeResourceId() {
return ThemeUtils.getThemeResource(this);
}
static class SignInResponse {
public final boolean already_logged_in, succeed;

45
twidere/src/main/java/org/mariotaku/twidere/activity/support/ThemedAppCompatActivity.java
View File

@ -19,19 +19,16 @@
package org.mariotaku.twidere.activity.support;
import android.content.Context;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity;
import android.util.AttributeSet;
import android.view.View;
import android.support.v7.app.AppCompatDelegate;
import android.support.v7.app.ThemedAppCompatDelegate;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.activity.iface.IThemedActivity;
import org.mariotaku.twidere.util.StrictModeUtils;
import org.mariotaku.twidere.util.ThemeUtils;
import org.mariotaku.twidere.util.Utils;
import org.mariotaku.twidere.view.ShapedImageView;
import org.mariotaku.twidere.view.ShapedImageView.ShapeStyle;
public abstract class ThemedAppCompatActivity extends AppCompatActivity implements Constants, IThemedActivity {
@ -41,6 +38,8 @@ public abstract class ThemedAppCompatActivity extends AppCompatActivity implemen
private int mProfileImageStyle;
private String mCurrentThemeBackgroundOption;
private AppCompatDelegate mDelegate;
@Override
public int getCurrentThemeBackgroundAlpha() {
return mCurrentThemeBackgroundAlpha;
@ -77,15 +76,13 @@ public abstract class ThemedAppCompatActivity extends AppCompatActivity implemen
}
@Override
public final void restart() {
Utils.restartActivity(this);
public int getCurrentProfileImageStyle() {
return mProfileImageStyle;
}
@Override
public void onSupportActionModeStarted(android.support.v7.view.ActionMode mode) {
super.onSupportActionModeStarted(mode);
ThemeUtils.applySupportActionModeColor(mode, this, getCurrentThemeResourceId(),
getCurrentThemeColor(), getThemeBackgroundOption(), true);
public final void restart() {
Utils.restartActivity(this);
}
@Override
@ -99,24 +96,16 @@ public abstract class ThemedAppCompatActivity extends AppCompatActivity implemen
}
@Override
public View onCreateView(String name, @NonNull Context context, @NonNull AttributeSet attrs) {
final View view = ThemeUtils.createView(name, context, attrs, mCurrentThemeColor);
if (view instanceof ShapedImageView) {
final ShapedImageView shapedImageView = (ShapedImageView) view;
shapedImageView.setStyle(mProfileImageStyle);
}
if (view != null) return view;
return super.onCreateView(name, context, attrs);
public void onSupportActionModeStarted(android.support.v7.view.ActionMode mode) {
super.onSupportActionModeStarted(mode);
ThemeUtils.applySupportActionModeColor(mode, this, getCurrentThemeResourceId(),
getCurrentThemeColor(), getThemeBackgroundOption(), true);
}
@Override
protected void onResume() {
super.onResume();
}
@Override
protected void onStart() {
super.onStart();
public AppCompatDelegate getDelegate() {
if (mDelegate != null) return mDelegate;
return mDelegate = ThemedAppCompatDelegate.create(this, this);
}
private void setupTheme() {
@ -126,8 +115,8 @@ public abstract class ThemedAppCompatActivity extends AppCompatActivity implemen
mProfileImageStyle = Utils.getProfileImageStyle(this);
mCurrentThemeBackgroundOption = getThemeBackgroundOption();
setTheme(mCurrentThemeResource);
ThemeUtils.applyWindowBackground(this, getWindow(), mCurrentThemeResource, mCurrentThemeBackgroundOption, mCurrentThemeBackgroundAlpha);
ThemeUtils.applyWindowBackground(this, getWindow(), mCurrentThemeResource,
mCurrentThemeBackgroundOption, mCurrentThemeBackgroundAlpha);
}
}

56
twidere/src/main/java/org/mariotaku/twidere/activity/support/ThemedFragmentActivity.java
View File

@ -34,7 +34,6 @@ import org.mariotaku.twidere.activity.iface.IThemedActivity;
import org.mariotaku.twidere.util.StrictModeUtils;
import org.mariotaku.twidere.util.ThemeUtils;
import org.mariotaku.twidere.util.Utils;
import org.mariotaku.twidere.view.ShapedImageView;
import org.mariotaku.twidere.view.ShapedImageView.ShapeStyle;
public abstract class ThemedFragmentActivity extends FragmentActivity implements Constants, IThemedActivity {
@ -44,16 +43,6 @@ public abstract class ThemedFragmentActivity extends FragmentActivity implements
private int mProfileImageStyle;
private String mCurrentThemeBackgroundOption;
@Override
public final int getCurrentThemeResourceId() {
return mCurrentThemeResource;
}
@Override
public int getThemeBackgroundAlpha() {
return ThemeUtils.getUserThemeBackgroundAlpha(this);
}
@Override
public int getCurrentThemeBackgroundAlpha() {
return mCurrentThemeBackgroundAlpha;
@ -64,21 +53,36 @@ public abstract class ThemedFragmentActivity extends FragmentActivity implements
return mCurrentThemeBackgroundOption;
}
@Override
public String getThemeBackgroundOption() {
return ThemeUtils.getThemeBackgroundOption(this);
}
@Override
public int getCurrentThemeColor() {
return mCurrentThemeColor;
}
@Override
public final int getCurrentThemeResourceId() {
return mCurrentThemeResource;
}
@Override
public int getThemeBackgroundAlpha() {
return ThemeUtils.getUserThemeBackgroundAlpha(this);
}
@Override
public String getThemeBackgroundOption() {
return ThemeUtils.getThemeBackgroundOption(this);
}
@Override
public String getThemeFontFamily() {
return ThemeUtils.getThemeFontFamily(this);
}
@Override
public int getCurrentProfileImageStyle() {
return mProfileImageStyle;
}
@Override
public final void restart() {
Utils.restartActivity(this);
@ -96,23 +100,9 @@ public abstract class ThemedFragmentActivity extends FragmentActivity implements
@Override
public View onCreateView(String name, @NonNull Context context, @NonNull AttributeSet attrs) {
final View view = ThemeUtils.createView(name, context, attrs, mCurrentThemeColor);
if (view instanceof ShapedImageView) {
final ShapedImageView shapedImageView = (ShapedImageView) view;
shapedImageView.setStyle(mProfileImageStyle);
}
if (view != null) return view;
return super.onCreateView(name, context, attrs);
}
@Override
protected void onResume() {
super.onResume();
}
@Override
protected void onStart() {
super.onStart();
final View view = super.onCreateView(name, context, attrs);
ThemeUtils.initView(view, getCurrentThemeColor(), mProfileImageStyle);
return view;
}
@Override

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

@ -278,8 +278,8 @@ public class UserProfileEditorActivity extends BaseDialogWhenLargeActivity imple
}
@Override
public void onSupportContentChanged() {
super.onSupportContentChanged();
public void onContentChanged() {
super.onContentChanged();
mProgressContainer = findViewById(R.id.progress_container);
mEditProfileContent = findViewById(R.id.edit_profile_content);
mProfileBannerView = (ImageView) findViewById(R.id.profile_banner);

1
twidere/src/main/java/org/mariotaku/twidere/app/TwidereApplication.java
View File

@ -292,7 +292,6 @@ public class TwidereApplication extends MultiDexApplication implements Constants
reloadConnectivitySettings();
} else if (KEY_USAGE_STATISTICS.equals(key)) {
stopService(new Intent(this, UCDService.class));
startUsageStatisticsServiceIfNeeded(this);
//spice
stopService(new Intent(this, SpiceService.class));
startUsageStatisticsServiceIfNeeded(this);

15
twidere/src/main/java/org/mariotaku/twidere/fragment/CustomTabsFragment.java
View File

@ -34,6 +34,7 @@ import android.graphics.PorterDuff.Mode;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.v4.content.res.ResourcesCompat;
import android.support.v7.app.ActionBar;
import android.text.TextUtils;
import android.view.ActionMode;
import android.view.LayoutInflater;
@ -59,13 +60,16 @@ import org.mariotaku.querybuilder.Columns.Column;
import org.mariotaku.querybuilder.Expression;
import org.mariotaku.querybuilder.RawItemArray;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.activity.BasePreferenceActivity;
import org.mariotaku.twidere.activity.SettingsActivity;
import org.mariotaku.twidere.activity.iface.IThemedActivity;
import org.mariotaku.twidere.activity.support.CustomTabEditorActivity;
import org.mariotaku.twidere.model.CustomTabConfiguration;
import org.mariotaku.twidere.model.CustomTabConfiguration.CustomTabConfigurationComparator;
import org.mariotaku.twidere.provider.TwidereDataStore.Tabs;
import org.mariotaku.twidere.util.SharedPreferencesWrapper;
import org.mariotaku.twidere.util.ThemeUtils;
import org.mariotaku.twidere.util.TwidereColorUtils;
import org.mariotaku.twidere.util.Utils;
import org.mariotaku.twidere.view.holder.TwoLineWithIconViewHolder;
@ -307,7 +311,16 @@ public class CustomTabsFragment extends BaseFragment implements LoaderCallbacks<
subItem.setIntent(intent);
}
}
ThemeUtils.applyColorFilterToMenuIcon(getActivity(), menu);
final Activity activity = getActivity();
if (activity instanceof BasePreferenceActivity) {
final ActionBar actionBar = ((BasePreferenceActivity) activity).getSupportActionBar();
final int themeColor = ((IThemedActivity) activity).getCurrentThemeColor();
final int itemColor = TwidereColorUtils.getContrastYIQ(themeColor, 192);
final int popupTheme = ThemeUtils.getActionBarPopupThemeRes(actionBar.getThemedContext());
final int popupColor = ThemeUtils.getThemeForegroundColor(activity, popupTheme);
ThemeUtils.applyColorFilterToMenuIcon(menu, itemColor, popupColor, 0, Mode.SRC_ATOP);
}
}
@Override

7
twidere/src/main/java/org/mariotaku/twidere/graphic/ActionIconDrawable.java
View File

@ -21,6 +21,7 @@ package org.mariotaku.twidere.graphic;
import android.graphics.PorterDuff.Mode;
import android.graphics.drawable.Drawable;
import android.support.v7.graphics.drawable.DrawableWrapper;
import android.view.MenuItem;
import org.mariotaku.twidere.util.menu.TwidereMenuInfo;
@ -35,7 +36,7 @@ public class ActionIconDrawable extends DrawableWrapper {
public ActionIconDrawable(Drawable drawable, int defaultColor) {
super(drawable);
mDefaultColor = defaultColor;
setDefaultColor(defaultColor);
setHighlightColor(0);
}
@ -62,7 +63,9 @@ public class ActionIconDrawable extends DrawableWrapper {
}
private void updateColorFilter() {
setColorFilter(mHighlightColor == 0 ? mDefaultColor : mHighlightColor, Mode.SRC_ATOP);
final int color = mHighlightColor == 0 ? mDefaultColor : mHighlightColor;
setColorFilter(color, Mode.SRC_ATOP);
invalidateSelf();
}
}

215
twidere/src/main/java/org/mariotaku/twidere/graphic/DrawableWrapper.java
View File

@ -1,215 +0,0 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.graphic;
import android.content.res.ColorStateList;
import android.graphics.Canvas;
import android.graphics.ColorFilter;
import android.graphics.PorterDuff;
import android.graphics.Rect;
import android.graphics.Region;
import android.graphics.drawable.Drawable;
import android.support.v4.graphics.drawable.DrawableCompat;
import android.view.View;
/**
* Base wrapper that delegates all calls to another {@link Drawable}. The wrapped {@link Drawable}
* <em>must</em> be fully released from any {@link View} before wrapping, otherwise internal {@link
* Drawable.Callback} may be dropped.
*/
class DrawableWrapper extends Drawable implements Drawable.Callback {
private final Drawable mDrawable;
public DrawableWrapper(Drawable drawable) {
mDrawable = drawable;
mDrawable.setCallback(this);
}
@Override
public void draw(Canvas canvas) {
mDrawable.draw(canvas);
}
@Override
public void setBounds(int left, int top, int right, int bottom) {
super.setBounds(left, top, right, bottom);
mDrawable.setBounds(left, top, right, bottom);
}
@Override
public void setChangingConfigurations(int configs) {
mDrawable.setChangingConfigurations(configs);
}
@Override
public int getChangingConfigurations() {
return mDrawable.getChangingConfigurations();
}
@Override
public void setDither(boolean dither) {
mDrawable.setDither(dither);
}
@Override
public void setFilterBitmap(boolean filter) {
mDrawable.setFilterBitmap(filter);
}
@Override
public void setAlpha(int alpha) {
mDrawable.setAlpha(alpha);
}
@Override
public void setColorFilter(ColorFilter cf) {
mDrawable.setColorFilter(cf);
}
@Override
public boolean isStateful() {
return mDrawable.isStateful();
}
@Override
public boolean setState(final int[] stateSet) {
return mDrawable.setState(stateSet);
}
@Override
public int[] getState() {
return mDrawable.getState();
}
@Override
public void jumpToCurrentState() {
DrawableCompat.jumpToCurrentState(mDrawable);
}
@Override
public Drawable getCurrent() {
return mDrawable.getCurrent();
}
@Override
public boolean setVisible(boolean visible, boolean restart) {
return super.setVisible(visible, restart) || mDrawable.setVisible(visible, restart);
}
@Override
public int getOpacity() {
return mDrawable.getOpacity();
}
@Override
public Region getTransparentRegion() {
return mDrawable.getTransparentRegion();
}
@Override
public int getIntrinsicWidth() {
return mDrawable.getIntrinsicWidth();
}
@Override
public int getIntrinsicHeight() {
return mDrawable.getIntrinsicHeight();
}
@Override
public int getMinimumWidth() {
return mDrawable.getMinimumWidth();
}
@Override
public int getMinimumHeight() {
return mDrawable.getMinimumHeight();
}
@Override
public boolean getPadding(Rect padding) {
return mDrawable.getPadding(padding);
}
/**
* {@inheritDoc}
*/
@Override
public void invalidateDrawable(Drawable who) {
invalidateSelf();
}
/**
* {@inheritDoc}
*/
@Override
public void scheduleDrawable(Drawable who, Runnable what, long when) {
scheduleSelf(what, when);
}
/**
* {@inheritDoc}
*/
@Override
public void unscheduleDrawable(Drawable who, Runnable what) {
unscheduleSelf(what);
}
@Override
protected boolean onLevelChange(int level) {
return mDrawable.setLevel(level);
}
@Override
public void setAutoMirrored(boolean mirrored) {
DrawableCompat.setAutoMirrored(mDrawable, mirrored);
}
@Override
public boolean isAutoMirrored() {
return DrawableCompat.isAutoMirrored(mDrawable);
}
@Override
public void setTint(int tint) {
DrawableCompat.setTint(mDrawable, tint);
}
@Override
public void setTintList(ColorStateList tint) {
DrawableCompat.setTintList(mDrawable, tint);
}
@Override
public void setTintMode(PorterDuff.Mode tintMode) {
DrawableCompat.setTintMode(mDrawable, tintMode);
}
@Override
public void setHotspot(float x, float y) {
DrawableCompat.setHotspot(mDrawable, x, y);
}
@Override
public void setHotspotBounds(int left, int top, int right, int bottom) {
DrawableCompat.setHotspotBounds(mDrawable, left, top, right, bottom);
}
}

166
twidere/src/main/java/org/mariotaku/twidere/popup/AccountSelectorPopupWindow.java
View File

@ -1,166 +0,0 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.popup;
import android.content.Context;
import android.content.res.Resources;
import android.os.Build;
import android.support.annotation.NonNull;
import android.util.SparseBooleanArray;
import android.view.LayoutInflater;
import android.view.LayoutInflater.Factory;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AbsListView;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.GridView;
import android.widget.ImageView;
import android.widget.PopupWindow;
import org.apache.commons.lang3.ArrayUtils;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.adapter.ArrayAdapter;
import org.mariotaku.twidere.app.TwidereApplication;
import org.mariotaku.twidere.model.ParcelableAccount;
import org.mariotaku.twidere.util.MediaLoaderWrapper;
import org.mariotaku.twidere.util.ThemeUtils;
import org.mariotaku.twidere.util.ThemedViewFactory;
import org.mariotaku.twidere.util.Utils;
import java.util.List;
/**
* Created by mariotaku on 15/1/12.
*/
public class AccountSelectorPopupWindow {
private final Context mContext;
private final View mAnchor;
private final PopupWindow mPopup;
private final AccountsGridAdapter mAdapter;
private final GridView mGridView;
private AccountSelectionListener mAccountSelectionListener;
public AccountSelectorPopupWindow(Context context, View anchor) {
mContext = context;
mAnchor = anchor;
final int themeAttr;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
themeAttr = android.R.attr.actionOverflowMenuStyle;
} else {
themeAttr = android.R.attr.popupMenuStyle;
}
mAdapter = new AccountsGridAdapter(context);
final Resources resources = context.getResources();
final LayoutInflater inflater = LayoutInflater.from(context);
final int themeColor = ThemeUtils.getUserAccentColor(context);
if (!(context instanceof Factory)) {
inflater.setFactory2(new ThemedViewFactory(themeColor));
}
final View contentView = inflater.inflate(R.layout.popup_account_selector, null);
mGridView = (GridView) contentView.findViewById(R.id.grid_view);
mGridView.setAdapter(mAdapter);
mGridView.setChoiceMode(AbsListView.CHOICE_MODE_MULTIPLE);
mGridView.setOnItemClickListener(new OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
if (mAccountSelectionListener == null) return;
mAccountSelectionListener.onSelectionChanged(getSelectedAccountIds());
}
});
mPopup = new PopupWindow(context, null, themeAttr);
mPopup.setFocusable(true);
mPopup.setWidth(Utils.getActionBarHeight(context) * 2);
mPopup.setWindowLayoutMode(0, ViewGroup.LayoutParams.WRAP_CONTENT);
mPopup.setContentView(contentView);
}
public void setAccountSelectionListener(AccountSelectionListener listener) {
mAccountSelectionListener = listener;
}
public boolean isShowing() {
return mPopup.isShowing();
}
public void dismiss() {
mPopup.dismiss();
}
public void show() {
mPopup.showAsDropDown(mAnchor);
}
public interface AccountSelectionListener {
public void onSelectionChanged(long[] accountIds);
}
public void setSelectedAccountIds(long[] accountIds) {
if (accountIds == null) {
mGridView.clearChoices();
}
for (int i = 0, j = mAdapter.getCount(); i < j; i++) {
mGridView.setItemChecked(i, ArrayUtils.contains(accountIds, mAdapter.getItem(i).account_id));
}
}
@NonNull
public long[] getSelectedAccountIds() {
final long[] accountIds = new long[mGridView.getCheckedItemCount()];
final SparseBooleanArray positions = mGridView.getCheckedItemPositions();
for (int i = 0, j = positions.size(), k = 0; i < j; i++) {
if (positions.valueAt(i)) {
accountIds[k++] = mAdapter.getItem(positions.keyAt(i)).account_id;
}
}
return accountIds;
}
public void setAccounts(List<ParcelableAccount> accounts) {
mAdapter.clear();
if (accounts != null) {
mAdapter.addAll(accounts);
}
}
private static class AccountsGridAdapter extends ArrayAdapter<ParcelableAccount> {
private final MediaLoaderWrapper mImageLoader;
public AccountsGridAdapter(Context context) {
super(context, R.layout.grid_item_selector_account);
mImageLoader = TwidereApplication.getInstance(context).getMediaLoaderWrapper();
}
@Override
public View getView(int position, View convertView, ViewGroup parent) {
final View view = super.getView(position, convertView, parent);
final ParcelableAccount account = getItem(position);
final ImageView icon = (ImageView) view.findViewById(android.R.id.icon);
mImageLoader.displayProfileImage(icon, account.profile_image_url);
return view;
}
}
}

0
twidere/src/google/java/org/mariotaku/twidere/util/ListViewUtils.java → twidere/src/main/java/org/mariotaku/twidere/util/ListViewUtils.java
View File

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

@ -51,7 +51,6 @@ import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.TextPaint;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.ActionMode;
import android.view.ContextMenu.ContextMenuInfo;
import android.view.ContextThemeWrapper;
@ -61,9 +60,8 @@ import android.view.View;
import android.view.View.OnLongClickListener;
import android.view.Window;
import android.view.WindowManager;
import android.widget.CompoundButton;
import android.widget.AdapterView;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.TextView;
import org.apache.commons.lang3.ArrayUtils;
@ -74,12 +72,10 @@ import org.mariotaku.twidere.graphic.ActionBarColorDrawable;
import org.mariotaku.twidere.graphic.ActionIconDrawable;
import org.mariotaku.twidere.text.ParagraphSpacingSpan;
import org.mariotaku.twidere.util.menu.TwidereMenuInfo;
import org.mariotaku.twidere.view.ShapedImageView;
import org.mariotaku.twidere.view.TabPagerIndicator;
import org.mariotaku.twidere.view.iface.IThemedView;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
public class ThemeUtils implements Constants {
@ -88,8 +84,6 @@ public class ThemeUtils implements Constants {
private static final int[] ANIM_CLOSE_STYLE_ATTRS = {android.R.attr.activityCloseEnterAnimation,
android.R.attr.activityCloseExitAnimation};
private static final String[] sClassPrefixList = {"android.widget.", "android.webkit.", "org.mariotaku.twidere.view"};
private ThemeUtils() {
throw new AssertionError();
}
@ -189,7 +183,7 @@ public class ThemeUtils implements Constants {
textView.setText(builder);
}
public static void applySupportActionModeColor(ActionMode mode, FragmentActivity activity,
public static void applySupportActionModeColor(final ActionMode mode, final Activity activity,
int themeRes, int accentColor,
String backgroundOption, boolean outlineEnabled) {
// Very dirty implementation
@ -199,8 +193,8 @@ public class ThemeUtils implements Constants {
applySupportActionModeColor(modeCompat, activity, themeRes, accentColor, backgroundOption, outlineEnabled);
}
public static void applySupportActionModeColor(android.support.v7.view.ActionMode modeCompat,
FragmentActivity activity, int themeRes,
public static void applySupportActionModeColor(final android.support.v7.view.ActionMode modeCompat,
Activity activity, int themeRes,
int accentColor, String backgroundOption,
boolean outlineEnabled) {
// Very dirty implementation
@ -226,8 +220,6 @@ public class ThemeUtils implements Constants {
final TextView actionBarSubtitleView = (TextView) contextView.findViewById(android.support.v7.appcompat.R.id.action_bar_subtitle);
final ImageView actionModeCloseButton = (ImageView) contextView.findViewById(android.support.v7.appcompat.R.id.action_mode_close_button);
final ActionMenuView menuView = ViewUtils.findViewByType(contextView, ActionMenuView.class);
if (actionBarTitleView == null || actionBarSubtitleView == null || actionModeCloseButton == null || menuView == null)
return;
final int actionBarColor;
if (isDarkTheme(themeRes)) {
actionBarColor = context.getResources().getColor(R.color.background_color_action_bar_dark);
@ -236,11 +228,19 @@ public class ThemeUtils implements Constants {
}
final int titleColor = getContrastActionBarTitleColor(context, themeRes, actionBarColor);
final int itemColor = getContrastActionBarItemColor(context, themeRes, actionBarColor);
actionBarTitleView.setTextColor(titleColor);
actionBarSubtitleView.setTextColor(titleColor);
actionModeCloseButton.setColorFilter(itemColor, Mode.SRC_ATOP);
setActionBarOverflowColor(menuView, itemColor);
ThemeUtils.wrapToolbarMenuIcon(menuView, itemColor, itemColor);
if (actionBarTitleView != null) {
actionBarTitleView.setTextColor(titleColor);
}
if (actionBarSubtitleView != null) {
actionBarSubtitleView.setTextColor(titleColor);
}
if (actionModeCloseButton != null) {
actionModeCloseButton.setColorFilter(itemColor, Mode.SRC_ATOP);
}
if (menuView != null) {
setActionBarOverflowColor(menuView, itemColor);
ThemeUtils.wrapToolbarMenuIcon(menuView, itemColor, itemColor);
}
ViewUtils.setBackground(contextView, getActionBarBackground(activity, themeRes, accentColor, backgroundOption, outlineEnabled));
} catch (Exception e) {
e.printStackTrace();
@ -268,45 +268,6 @@ public class ThemeUtils implements Constants {
}
}
public static View createView(final String name, final Context context,
final AttributeSet attrs) {
return createView(name, context, attrs, 0);
}
public static View createView(final String name, final Context context,
final AttributeSet attrs, final int tintColor) {
View view = null;
try {
view = newViewInstance(name, context, attrs);
} catch (final Exception e) {
// In this case we want to let the base class take a crack
// at it.
}
for (final String prefix : sClassPrefixList) {
try {
view = newViewInstance(prefix + name, context, attrs);
} catch (final Exception e) {
// In this case we want to let the base class take a crack
// at it.
}
}
if (view != null) {
applyColorTintForView(view, tintColor);
}
return view;
}
@Deprecated
public static Drawable getActionBarBackground(final Context context, final int themeRes) {
@SuppressWarnings("ConstantConditions")
final TypedArray array = context.obtainStyledAttributes(null, new int[]{android.R.attr.background},
android.R.attr.actionBarStyle, themeRes);
try {
return array.getDrawable(0);
} finally {
array.recycle();
}
}
@NonNull
public static Drawable getActionBarBackground(final Context context, final int themeRes,
@ -802,12 +763,13 @@ public class ThemeUtils implements Constants {
indicator.updateAppearance();
}
public static void initTextView(TextView view) {
if (view.isInEditMode()) return;
final Context context = view.getContext();
// view.setLinkTextColor(ThemeUtils.getUserLinkTextColor(context));
// view.setHighlightColor(ThemeUtils.getUserHighlightColor(context));
view.setTypeface(ThemeUtils.getUserTypeface(context, view.getTypeface()));
public static void initView(View view, int themeColor, int profileImageStyle) {
if (view == null) return;
if (view instanceof ShapedImageView) {
final ShapedImageView shapedImageView = (ShapedImageView) view;
shapedImageView.setStyle(profileImageStyle);
} else if (view instanceof TextView) {
}
}
public static boolean isColoredActionBar(int themeRes) {
@ -1038,7 +1000,7 @@ public class ThemeUtils implements Constants {
final MenuItem item = menu.getItem(i);
wrapMenuItemIcon(item, itemColor, excludeGroups);
if (item.hasSubMenu()) {
wrapMenuIcon(menu, popupItemColor, popupItemColor, excludeGroups);
wrapMenuIcon(item.getSubMenu(), popupItemColor, popupItemColor, excludeGroups);
}
if (item.isVisible()) {
k++;
@ -1094,7 +1056,7 @@ public class ThemeUtils implements Constants {
final MenuItem item = menu.getItem(i);
wrapMenuItemIcon(item, itemColor, excludeGroups);
if (item.hasSubMenu()) {
wrapMenuIcon(menu, popupItemColor, popupItemColor, excludeGroups);
wrapMenuIcon(item.getSubMenu(), popupItemColor, popupItemColor, excludeGroups);
}
if (item.isVisible()) {
k++;
@ -1102,26 +1064,6 @@ public class ThemeUtils implements Constants {
}
}
private static void applyColorTintForView(View view, int tintColor) {
if (view instanceof IThemedView) {
final ColorStateList tintList = ColorStateList.valueOf(tintColor);
((IThemedView) view).setThemeTintColor(tintList);
} else if (view instanceof ProgressBar) {
final ColorStateList tintList = ColorStateList.valueOf(tintColor);
final ProgressBar progressBar = (ProgressBar) view;
ViewUtils.setProgressTintList(progressBar, tintList);
ViewUtils.setProgressBackgroundTintList(progressBar, tintList);
ViewUtils.setIndeterminateTintList(progressBar, tintList);
} else if (view instanceof CompoundButton) {
final ColorStateList tintList = ColorStateList.valueOf(tintColor);
final CompoundButton compoundButton = (CompoundButton) view;
ViewUtils.setButtonTintList(compoundButton, tintList);
} else {
// final ColorStateList tintList = ColorStateList.valueOf(tintColor);
// ViewCompat.setBackgroundTintList(view, tintList);
}
}
@NonNull
private static SharedPreferencesWrapper getSharedPreferencesWrapper(Context context) {
final Context appContext = context.getApplicationContext();
@ -1129,11 +1071,4 @@ public class ThemeUtils implements Constants {
Context.MODE_PRIVATE);
}
private static View newViewInstance(final String className, final Context context, final AttributeSet attrs)
throws ClassNotFoundException, NoSuchMethodException, InstantiationException, IllegalAccessException,
InvocationTargetException {
final Class<?> viewCls = Class.forName(className);
final Constructor<?> constructor = viewCls.getConstructor(Context.class, AttributeSet.class);
return (View) constructor.newInstance(context, attrs);
}
}

47
twidere/src/main/java/org/mariotaku/twidere/util/ThemedViewFactory.java
View File

@ -1,47 +0,0 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.util;
import android.content.Context;
import android.util.AttributeSet;
import android.view.LayoutInflater.Factory2;
import android.view.View;
/**
* Created by mariotaku on 15/1/13.
*/
public class ThemedViewFactory implements Factory2 {
private final int mThemeColor;
public ThemedViewFactory(int themeColor) {
mThemeColor = themeColor;
}
@Override
public View onCreateView(View parent, String name, Context context, AttributeSet attrs) {
return ThemeUtils.createView(name, context, attrs, mThemeColor);
}
@Override
public View onCreateView(String name, Context context, AttributeSet attrs) {
return null;
}
}

4
twidere/src/main/java/org/mariotaku/twidere/view/ActionIconThemedTextView.java
View File

@ -24,15 +24,15 @@ import android.content.res.ColorStateList;
import android.content.res.TypedArray;
import android.graphics.PorterDuff.Mode;
import android.graphics.drawable.Drawable;
import android.support.v7.widget.AppCompatTextView;
import android.util.AttributeSet;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.view.themed.ThemedTextView;
/**
* Created by mariotaku on 14/11/20.
*/
public class ActionIconThemedTextView extends ThemedTextView {
public class ActionIconThemedTextView extends AppCompatTextView {
private final int mIconWidth, mIconHeight;
private int mColor, mDisabledColor, mActivatedColor;

5
twidere/src/main/java/org/mariotaku/twidere/view/HandleSpanClickTextView.java
View File

@ -21,6 +21,7 @@ package org.mariotaku.twidere.view;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.v7.widget.AppCompatTextView;
import android.text.Layout;
import android.text.Selection;
import android.text.Spannable;
@ -29,9 +30,7 @@ import android.text.style.ClickableSpan;
import android.util.AttributeSet;
import android.view.MotionEvent;
import org.mariotaku.twidere.view.themed.ThemedTextView;
public class HandleSpanClickTextView extends ThemedTextView {
public class HandleSpanClickTextView extends AppCompatTextView {
public HandleSpanClickTextView(final Context context) {
super(context);

4
twidere/src/main/java/org/mariotaku/twidere/view/ShortTimeView.java
View File

@ -24,17 +24,17 @@ import android.content.SharedPreferences;
import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
import android.os.Handler;
import android.os.SystemClock;
import android.support.v7.widget.AppCompatTextView;
import android.text.format.DateUtils;
import android.util.AttributeSet;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.view.themed.ThemedTextView;
import static android.text.format.DateUtils.getRelativeTimeSpanString;
import static org.mariotaku.twidere.util.Utils.formatSameDayTime;
public class ShortTimeView extends ThemedTextView implements Constants, OnSharedPreferenceChangeListener {
public class ShortTimeView extends AppCompatTextView implements Constants, OnSharedPreferenceChangeListener {
private static final long TICKER_DURATION = 5000L;

61
twidere/src/main/java/org/mariotaku/twidere/view/SquareActionIconView.java
View File

@ -1,61 +0,0 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.view;
import android.content.Context;
import android.util.AttributeSet;
import android.view.ViewGroup;
public class SquareActionIconView extends ActionIconView {
public SquareActionIconView(final Context context) {
this(context, null);
}
public SquareActionIconView(final Context context, final AttributeSet attrs) {
this(context, attrs, 0);
}
public SquareActionIconView(final Context context, final AttributeSet attrs, final int defStyle) {
super(context, attrs, defStyle);
}
@Override
protected void onMeasure(final int widthMeasureSpec, final int heightMeasureSpec) {
final int width = MeasureSpec.getSize(widthMeasureSpec), height = MeasureSpec.getSize(heightMeasureSpec);
final ViewGroup.LayoutParams lp = getLayoutParams();
if (lp.height == ViewGroup.LayoutParams.MATCH_PARENT && lp.width == ViewGroup.LayoutParams.WRAP_CONTENT) {
super.onMeasure(heightMeasureSpec, heightMeasureSpec);
setMeasuredDimension(height, height);
} else if (lp.width == ViewGroup.LayoutParams.MATCH_PARENT && lp.height == ViewGroup.LayoutParams.WRAP_CONTENT) {
super.onMeasure(widthMeasureSpec, widthMeasureSpec);
setMeasuredDimension(width, width);
} else {
if (width > height) {
super.onMeasure(heightMeasureSpec, heightMeasureSpec);
setMeasuredDimension(height, height);
} else {
super.onMeasure(widthMeasureSpec, widthMeasureSpec);
setMeasuredDimension(width, width);
}
}
}
}

5
twidere/src/main/java/org/mariotaku/twidere/view/StatusComposeEditText.java
View File

@ -20,6 +20,7 @@
package org.mariotaku.twidere.view;
import android.content.Context;
import android.support.v7.widget.AppCompatMultiAutoCompleteTextView;
import android.text.InputType;
import android.text.SpannableString;
import android.text.Spanned;
@ -28,10 +29,8 @@ import android.text.method.ArrowKeyMovementMethod;
import android.util.AttributeSet;
import org.mariotaku.twidere.adapter.UserHashtagAutoCompleteAdapter;
import org.mariotaku.twidere.view.iface.IThemedView;
import org.mariotaku.twidere.view.themed.ThemedMultiAutoCompleteTextView;
public class StatusComposeEditText extends ThemedMultiAutoCompleteTextView implements IThemedView {
public class StatusComposeEditText extends AppCompatMultiAutoCompleteTextView {
private UserHashtagAutoCompleteAdapter mAdapter;
private long mAccountId;

23
twidere/src/main/java/org/mariotaku/twidere/view/StatusTextView.java
View File

@ -1,17 +1,14 @@
package org.mariotaku.twidere.view;
import android.content.Context;
import android.support.v7.widget.AppCompatTextView;
import android.text.Editable;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.SpannableStringBuilder;
import android.util.AttributeSet;
import org.mariotaku.twidere.view.themed.ThemedTextView;
public class StatusTextView extends ThemedTextView {
private OnSelectionChangeListener mOnSelectionChangeListener;
public class StatusTextView extends AppCompatTextView {
public StatusTextView(final Context context) {
this(context, null);
@ -28,22 +25,6 @@ public class StatusTextView extends ThemedTextView {
setSpannableFactory(new SafeSpannableFactory());
}
public void setOnSelectionChangeListener(final OnSelectionChangeListener l) {
mOnSelectionChangeListener = l;
}
@Override
protected void onSelectionChanged(final int selStart, final int selEnd) {
super.onSelectionChanged(selStart, selEnd);
if (mOnSelectionChangeListener != null) {
mOnSelectionChangeListener.onSelectionChanged(selStart, selEnd);
}
}
public interface OnSelectionChangeListener {
void onSelectionChanged(int selStart, int selEnd);
}
private static class SafeSpannableString extends SpannableString {
public SafeSpannableString(CharSequence source) {

39
twidere/src/main/java/org/mariotaku/twidere/view/TwidereActionMenuView.java
View File

@ -1,39 +0,0 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.view;
import android.content.Context;
import android.support.v7.widget.ActionMenuView;
import android.util.AttributeSet;
/**
* Created by mariotaku on 15/1/22.
*/
public class TwidereActionMenuView extends ActionMenuView {
public TwidereActionMenuView(Context context) {
super(context);
}
public TwidereActionMenuView(Context context, AttributeSet attrs) {
super(context, attrs);
}
}

51
twidere/src/main/java/org/mariotaku/twidere/view/themed/ThemedAutoCompleteTextView.java
View File

@ -1,51 +0,0 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2014 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.view.themed;
import android.content.Context;
import android.content.res.ColorStateList;
import android.support.v4.view.ViewCompat;
import android.util.AttributeSet;
import android.widget.AutoCompleteTextView;
import org.mariotaku.twidere.util.ThemeUtils;
import org.mariotaku.twidere.util.ViewUtils;
import org.mariotaku.twidere.view.iface.IThemedView;
public class ThemedAutoCompleteTextView extends AutoCompleteTextView implements IThemedView {
public ThemedAutoCompleteTextView(final Context context) {
this(context, null);
}
public ThemedAutoCompleteTextView(final Context context, final AttributeSet attrs) {
this(context, attrs, android.R.attr.editTextStyle);
}
public ThemedAutoCompleteTextView(final Context context, final AttributeSet attrs, final int defStyle) {
super(context, attrs, defStyle);
ThemeUtils.initTextView(this);
}
@Override
public void setThemeTintColor(ColorStateList color) {
ViewCompat.setBackgroundTintList(this, color);
}
}

43
twidere/src/main/java/org/mariotaku/twidere/view/themed/ThemedCheckBox.java
View File

@ -1,43 +0,0 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2014 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.view.themed;
import android.content.Context;
import android.util.AttributeSet;
import android.widget.CheckBox;
import org.mariotaku.twidere.util.ThemeUtils;
public class ThemedCheckBox extends CheckBox {
public ThemedCheckBox(final Context context) {
this(context, null);
}
public ThemedCheckBox(final Context context, final AttributeSet attrs) {
this(context, attrs, android.R.attr.checkboxStyle);
}
public ThemedCheckBox(final Context context, final AttributeSet attrs, final int defStyle) {
super(context, attrs, defStyle);
ThemeUtils.initTextView(this);
}
}

51
twidere/src/main/java/org/mariotaku/twidere/view/themed/ThemedEditText.java
View File

@ -1,51 +0,0 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2014 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.view.themed;
import android.content.Context;
import android.content.res.ColorStateList;
import android.support.v4.view.ViewCompat;
import android.util.AttributeSet;
import android.widget.EditText;
import org.mariotaku.twidere.util.ThemeUtils;
import org.mariotaku.twidere.util.ViewUtils;
import org.mariotaku.twidere.view.iface.IThemedView;
public class ThemedEditText extends EditText implements IThemedView {
public ThemedEditText(final Context context) {
this(context, null);
}
public ThemedEditText(final Context context, final AttributeSet attrs) {
this(context, attrs, android.R.attr.editTextStyle);
}
public ThemedEditText(final Context context, final AttributeSet attrs, final int defStyle) {
super(context, attrs, defStyle);
ThemeUtils.initTextView(this);
}
@Override
public void setThemeTintColor(ColorStateList color) {
ViewCompat.setBackgroundTintList(this, color);
}
}

50
twidere/src/main/java/org/mariotaku/twidere/view/themed/ThemedMaterialEditText.java
View File

@ -1,50 +0,0 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.view.themed;
import android.content.Context;
import android.content.res.ColorStateList;
import android.util.AttributeSet;
import com.rengwuxian.materialedittext.MaterialEditText;
import org.mariotaku.twidere.view.iface.IThemedView;
/**
* Created by mariotaku on 15/1/18.
*/
public class ThemedMaterialEditText extends MaterialEditText implements IThemedView {
public ThemedMaterialEditText(Context context) {
super(context);
}
public ThemedMaterialEditText(Context context, AttributeSet attrs) {
super(context, attrs);
}
public ThemedMaterialEditText(Context context, AttributeSet attrs, int style) {
super(context, attrs, style);
}
@Override
public void setThemeTintColor(ColorStateList color) {
setPrimaryColor(color.getDefaultColor());
}
}

53
twidere/src/main/java/org/mariotaku/twidere/view/themed/ThemedMultiAutoCompleteTextView.java
View File

@ -1,53 +0,0 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2014 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.view.themed;
import android.content.Context;
import android.content.res.ColorStateList;
import android.support.v4.view.ViewCompat;
import android.util.AttributeSet;
import android.widget.MultiAutoCompleteTextView;
import org.mariotaku.twidere.util.ThemeUtils;
import org.mariotaku.twidere.util.ViewUtils;
import org.mariotaku.twidere.view.iface.IThemedView;
public class ThemedMultiAutoCompleteTextView extends MultiAutoCompleteTextView implements IThemedView {
public ThemedMultiAutoCompleteTextView(final Context context) {
this(context, null);
}
public ThemedMultiAutoCompleteTextView(final Context context, final AttributeSet attrs) {
this(context, attrs, android.R.attr.editTextStyle);
}
public ThemedMultiAutoCompleteTextView(final Context context, final AttributeSet attrs, final int defStyle) {
super(context, attrs, defStyle);
ThemeUtils.initTextView(this);
}
@Override
public void setThemeTintColor(ColorStateList color) {
ViewCompat.setBackgroundTintList(this, color);
setLinkTextColor(color);
setHighlightColor(color.getDefaultColor());
}
}

43
twidere/src/main/java/org/mariotaku/twidere/view/themed/ThemedRadioButton.java
View File

@ -1,43 +0,0 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2014 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.view.themed;
import android.content.Context;
import android.util.AttributeSet;
import android.widget.RadioButton;
import org.mariotaku.twidere.util.ThemeUtils;
public class ThemedRadioButton extends RadioButton {
public ThemedRadioButton(final Context context) {
this(context, null);
}
public ThemedRadioButton(final Context context, final AttributeSet attrs) {
this(context, attrs, android.R.attr.checkboxStyle);
}
public ThemedRadioButton(final Context context, final AttributeSet attrs, final int defStyle) {
super(context, attrs, defStyle);
ThemeUtils.initTextView(this);
}
}

57
twidere/src/main/java/org/mariotaku/twidere/view/themed/ThemedSwitch.java
View File

@ -1,57 +0,0 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2014 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.view.themed;
import android.annotation.TargetApi;
import android.content.Context;
import android.content.res.ColorStateList;
import android.os.Build;
import android.support.v4.graphics.drawable.DrawableCompat;
import android.util.AttributeSet;
import android.widget.Switch;
import org.mariotaku.twidere.util.ThemeUtils;
import org.mariotaku.twidere.view.iface.IThemedView;
public class ThemedSwitch extends Switch implements IThemedView {
public ThemedSwitch(final Context context) {
this(context, null);
}
public ThemedSwitch(final Context context, final AttributeSet attrs) {
super(context, attrs);
ThemeUtils.initTextView(this);
}
@Override
public void setThemeTintColor(ColorStateList color) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
setDrawableTint(color);
}
}
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
private void setDrawableTint(ColorStateList color) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) return;
DrawableCompat.setTintList(getThumbDrawable(), color);
DrawableCompat.setTintList(getTrackDrawable(), color);
}
}

50
twidere/src/main/java/org/mariotaku/twidere/view/themed/ThemedSwitchCompat.java
View File

@ -1,50 +0,0 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.view.themed;
import android.content.Context;
import android.content.res.ColorStateList;
import android.os.Build;
import android.support.v4.graphics.drawable.DrawableCompat;
import android.support.v7.widget.SwitchCompat;
import android.util.AttributeSet;
import org.mariotaku.twidere.util.ThemeUtils;
import org.mariotaku.twidere.view.iface.IThemedView;
public class ThemedSwitchCompat extends SwitchCompat implements IThemedView {
public ThemedSwitchCompat(final Context context) {
this(context, null);
}
public ThemedSwitchCompat(final Context context, final AttributeSet attrs) {
super(context, attrs);
ThemeUtils.initTextView(this);
}
@Override
public void setThemeTintColor(ColorStateList color) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
DrawableCompat.setTintList(getThumbDrawable(), color);
DrawableCompat.setTintList(getTrackDrawable(), color);
}
}
}

53
twidere/src/main/java/org/mariotaku/twidere/view/themed/ThemedTextView.java
View File

@ -1,53 +0,0 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2014 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.view.themed;
import android.content.Context;
import android.content.res.ColorStateList;
import android.graphics.Color;
import android.util.AttributeSet;
import android.widget.TextView;
import org.mariotaku.twidere.util.ThemeUtils;
import org.mariotaku.twidere.view.iface.IThemedView;
public class ThemedTextView extends TextView implements IThemedView {
public ThemedTextView(final Context context) {
this(context, null);
}
public ThemedTextView(final Context context, final AttributeSet attrs) {
this(context, attrs, android.R.attr.textViewStyle);
}
public ThemedTextView(final Context context, final AttributeSet attrs, final int defStyle) {
super(context, attrs, defStyle);
ThemeUtils.initTextView(this);
}
@Override
public void setThemeTintColor(ColorStateList color) {
final int linkTextColor = ThemeUtils.getOptimalLinkColor(color.getDefaultColor(), getCurrentTextColor());
final int red = Color.red(linkTextColor), green = Color.green(linkTextColor), blue = Color.blue(linkTextColor);
setLinkTextColor(linkTextColor);
setHighlightColor(Color.argb(0x66, red, green, blue));
}
}

2
twidere/src/main/res/layout/activity_compose.xml
View File

@ -86,7 +86,7 @@
android:color="?android:textColorSecondary"
android:src="@drawable/ic_action_location"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/location_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
twidere/src/main/res/layout/activity_compose_bottombar.xml
View File

@ -71,7 +71,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<org.mariotaku.twidere.view.TwidereActionMenuView
<android.support.v7.widget.ActionMenuView
android:id="@+id/menu_bar"
android:layout_width="wrap_content"
android:layout_height="match_parent"

27
twidere/src/main/res/layout/activity_settings.xml Normal file
View File

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Twidere - Twitter client for Android
~
~ Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<org.mariotaku.twidere.view.TintedStatusFrameLayout
android:id="@+id/main_content"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:setPadding="true"/>

4
twidere/src/main/res/layout/activity_sign_in.xml
View File

@ -69,7 +69,7 @@
android:orientation="horizontal"
android:padding="8dp">
<android.support.v7.internal.widget.TintButton
<Button
android:id="@+id/sign_up"
style="?android:buttonStyleSmall"
android:layout_width="match_parent"
@ -79,7 +79,7 @@
android:onClick="onClick"
android:text="@string/register"/>
<android.support.v7.internal.widget.TintButton
<Button
android:id="@+id/sign_in"
style="?android:buttonStyleSmall"
android:layout_width="match_parent"

2
twidere/src/main/res/layout/card_item_activity_summary.xml
View File

@ -98,7 +98,7 @@
android:layout_margin="2dp"
android:contentDescription="@string/profile_image"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/activity_profile_image_more_number"
android:layout_width="0dp"
android:layout_height="wrap_content"

2
twidere/src/main/res/layout/card_item_activity_summary_compact.xml
View File

@ -86,7 +86,7 @@
android:layout_margin="2dp"
android:contentDescription="@string/profile_image"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/activity_profile_image_more_number"
android:layout_width="0dp"
android:layout_height="wrap_content"

2
twidere/src/main/res/layout/card_item_message_conversation_common.xml
View File

@ -51,7 +51,7 @@
android:textColor="?android:attr/textColorSecondary"
tools:text="@string/sample_status_text"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

10
twidere/src/main/res/layout/card_item_status_common.xml
View File

@ -59,7 +59,7 @@
tools:src="@drawable/ic_activity_action_retweet"
tools:visibility="visible"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/reply_retweet_status"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -121,7 +121,7 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -131,7 +131,7 @@
android:textStyle="bold"
tools:text="User"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/screen_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -213,7 +213,7 @@
android:visibility="gone"
tools:visibility="visible">
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/quoted_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -223,7 +223,7 @@
android:textStyle="bold"
tools:text="User"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/quoted_screen_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

8
twidere/src/main/res/layout/card_item_status_compact.xml
View File

@ -123,7 +123,7 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -133,7 +133,7 @@
android:textStyle="bold"
tools:text="User"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/screen_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -199,7 +199,7 @@
android:visibility="gone"
tools:visibility="visible">
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/quoted_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -209,7 +209,7 @@
android:textStyle="bold"
tools:text="User"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/quoted_screen_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

12
twidere/src/main/res/layout/card_item_user.xml
View File

@ -85,7 +85,7 @@
android:orientation="vertical"
android:paddingLeft="8dp">
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -95,7 +95,7 @@
android:textStyle="bold"
tools:text="Name"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/screen_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -106,7 +106,7 @@
</LinearLayout>
</RelativeLayout>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -140,7 +140,7 @@
android:orientation="horizontal"
android:padding="8dp">
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/statuses_count"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -150,7 +150,7 @@
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/followers_count"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -160,7 +160,7 @@
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/friends_count"
android:layout_width="0dp"
android:layout_height="wrap_content"

10
twidere/src/main/res/layout/card_item_user_compact.xml
View File

@ -98,7 +98,7 @@
</LinearLayout>
</FrameLayout>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -120,7 +120,7 @@
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/url"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -140,7 +140,7 @@
android:orientation="horizontal"
android:paddingTop="@dimen/element_spacing_small">
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/statuses_count"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -150,7 +150,7 @@
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/followers_count"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -160,7 +160,7 @@
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/friends_count"
android:layout_width="0dp"
android:layout_height="wrap_content"

10
twidere/src/main/res/layout/card_item_user_list.xml
View File

@ -59,7 +59,7 @@
android:orientation="vertical"
android:paddingLeft="@dimen/element_spacing_normal">
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -68,7 +68,7 @@
android:textColor="?android:attr/textColorPrimary"
android:textStyle="bold"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/created_by"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -84,7 +84,7 @@
android:layout_height="0.2dp"
android:background="#40808080"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -98,7 +98,7 @@
android:orientation="horizontal"
android:padding="@dimen/element_spacing_normal">
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/members_count"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -108,7 +108,7 @@
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/subscribers_count"
android:layout_width="0dp"
android:layout_height="wrap_content"

6
twidere/src/main/res/layout/card_item_user_list_compact.xml
View File

@ -87,7 +87,7 @@
</LinearLayout>
</FrameLayout>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -105,7 +105,7 @@
android:orientation="horizontal"
android:paddingTop="@dimen/element_spacing_small">
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/members_count"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -115,7 +115,7 @@
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/subscribers_count"
android:layout_width="0dp"
android:layout_height="wrap_content"

2
twidere/src/main/res/layout/fragment_status.xml
View File

@ -41,7 +41,7 @@
<requestFocus/>
</android.support.v7.widget.RecyclerView>
<org.mariotaku.twidere.view.themed.ThemedMultiAutoCompleteTextView
<MultiAutoCompleteTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"/>

6
twidere/src/main/res/layout/header_drawer_account_selector.xml
View File

@ -96,7 +96,7 @@
android:focusable="false"
android:orientation="vertical">
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -107,7 +107,7 @@
android:textStyle="bold"
tools:text="Name"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/screen_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -124,7 +124,7 @@
android:layout_height="@dimen/element_size_normal"
android:focusable="false">
<org.mariotaku.twidere.view.TwidereActionMenuView
<android.support.v7.widget.ActionMenuView
android:id="@+id/toggle_menu"
android:layout_width="match_parent"
android:layout_height="match_parent"

26
twidere/src/main/res/layout/header_status_common.xml
View File

@ -46,7 +46,7 @@
android:layout_height="wrap_content"
android:layout_margin="@dimen/padding_profile_image_detail_page"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/retweeted_by"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -109,7 +109,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -118,7 +118,7 @@
android:textColor="?android:textColorPrimary"
tools:text="Name"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/screen_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -129,7 +129,7 @@
tools:text="\@username"/>
</LinearLayout>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/time_source"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -209,7 +209,7 @@
android:visibility="gone"
tools:visibility="visible">
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/quoted_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -218,7 +218,7 @@
android:textColor="?android:textColorPrimary"
tools:text="Name"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/quoted_screen_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -334,7 +334,7 @@
android:orientation="horizontal"
android:padding="@dimen/element_spacing_normal">
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/replies_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -344,7 +344,7 @@
android:textColor="?android:textColorPrimary"
tools:text="255"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
@ -364,7 +364,7 @@
android:orientation="horizontal"
android:padding="@dimen/element_spacing_normal">
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/retweets_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -374,7 +374,7 @@
android:textColor="?android:textColorPrimary"
tools:text="255"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
@ -394,7 +394,7 @@
android:orientation="horizontal"
android:padding="@dimen/element_spacing_normal">
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/favorites_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -404,7 +404,7 @@
android:textColor="?android:textColorPrimary"
tools:text="255"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
@ -415,7 +415,7 @@
</LinearLayout>
<org.mariotaku.twidere.view.TwidereActionMenuView
<android.support.v7.widget.ActionMenuView
android:id="@+id/menu_bar"
android:layout_width="match_parent"
android:layout_height="?android:actionBarSize"

24
twidere/src/main/res/layout/header_user.xml
View File

@ -60,7 +60,7 @@
android:layout_centerInParent="true"
android:minWidth="48dp">
<android.support.v7.internal.widget.TintButton
<Button
android:id="@+id/follow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -87,7 +87,7 @@
android:minHeight="@dimen/element_size_normal"
android:orientation="vertical">
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -96,7 +96,7 @@
android:textColor="?android:textColorPrimary"
tools:text="Name"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/screen_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -136,7 +136,7 @@
android:orientation="vertical"
android:padding="@dimen/element_spacing_small">
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/element_spacing_small"
@ -175,7 +175,7 @@
android:color="?android:textColorPrimary"
android:src="@drawable/ic_action_location"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/location"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -232,7 +232,7 @@
android:color="?android:textColorPrimary"
android:src="@drawable/ic_action_portal_cake"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/created_at"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -269,7 +269,7 @@
android:orientation="vertical"
android:padding="@dimen/element_spacing_small">
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/followers_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -278,7 +278,7 @@
android:textColor="?android:textColorPrimary"
tools:text="255"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
@ -298,7 +298,7 @@
android:orientation="vertical"
android:padding="@dimen/element_spacing_small">
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/friends_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -307,7 +307,7 @@
android:textColor="?android:textColorPrimary"
tools:text="255"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
@ -327,7 +327,7 @@
android:orientation="vertical"
android:padding="@dimen/element_spacing_small">
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/listed_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -336,7 +336,7 @@
android:textColor="?android:textColorPrimary"
tools:text="255"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"

6
twidere/src/main/res/layout/layout_user_list_details_common.xml
View File

@ -44,14 +44,14 @@
android:gravity="center_vertical"
android:orientation="vertical">
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/list_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/created_by"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -76,7 +76,7 @@
android:layout_height="0.2dp"
android:background="?android:dividerVertical"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/description"
tools:text="@string/sample_status_text"
android:layout_width="match_parent"

4
twidere/src/main/res/layout/list_item_custom_tab.xml
View File

@ -60,6 +60,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:textColorPrimary"
android:textStyle="bold"/>
<TextView
@ -67,7 +68,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall"/>
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:textColorSecondary"/>
</LinearLayout>
</LinearLayout>

4
twidere/src/main/res/layout/list_item_draft.xml
View File

@ -47,7 +47,7 @@
</org.mariotaku.twidere.view.CardMediaContainer>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -59,7 +59,7 @@
android:textAppearance="?android:textAppearanceSmall"
android:textColor="?android:textColorPrimary"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/time"
android:layout_width="match_parent"
android:layout_height="wrap_content"

86
twidere/src/main/res/layout/list_item_drawer_account.xml
View File

@ -1,86 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Twidere - Twitter client for Android
~
~ Copyright (C) 2012-2014 Mariotaku Lee <mariotaku.lee@gmail.com>
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<org.mariotaku.twidere.view.ColorLabelRelativeLayout
android:id="@+id/account_content"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:descendantFocusability="blocksDescendants"
android:padding="@dimen/element_spacing_small"
app:ignorePadding="true">
<LinearLayout
android:id="@+id/profile_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:gravity="center_vertical"
android:minHeight="?android:listPreferredItemHeightSmall"
android:orientation="horizontal"
android:padding="@dimen/element_spacing_small">
<org.mariotaku.twidere.view.SquareShapedImageView
android:id="@+id/profile_image"
style="?profileImageStyle"
android:layout_width="@dimen/icon_size_list_item_small"
android:layout_height="@dimen/icon_size_list_item_small"
android:layout_weight="0"
android:contentDescription="@string/icon"
android:scaleType="fitCenter"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingLeft="@dimen/element_spacing_small">
<org.mariotaku.twidere.view.themed.ThemedTextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="?android:textAppearanceMedium"
android:textSize="@dimen/accounts_drawer_name_size"/>
<TextView
android:id="@+id/screen_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textSize="@dimen/accounts_drawer_screen_name_size"
android:visibility="gone"/>
</LinearLayout>
<org.mariotaku.twidere.view.themed.ThemedSwitch
android:id="@+id/toggle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"/>
</LinearLayout>
</org.mariotaku.twidere.view.ColorLabelRelativeLayout>

2
twidere/src/main/res/layout/list_item_extra_config.xml
View File

@ -29,7 +29,7 @@
android:minHeight="48dp"
android:orientation="horizontal">
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@android:id/title"
android:layout_width="match_parent"
android:layout_height="48dp"

2
twidere/src/main/res/layout/list_item_menu.xml
View File

@ -35,7 +35,7 @@
android:layout_weight="0"
android:scaleType="centerInside"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@android:id/text1"
android:layout_width="match_parent"
android:layout_height="48dp"

2
twidere/src/main/res/layout/list_item_message_entry.xml
View File

@ -99,7 +99,7 @@
android:textColor="?android:attr/textColorSecondary"
tools:text="12:00"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"

4
twidere/src/main/res/layout/list_item_user_list.xml
View File

@ -35,7 +35,7 @@
android:orientation="vertical"
android:paddingRight="@dimen/element_spacing_normal">
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -46,7 +46,7 @@
android:textStyle="bold"
tools:text="Sample list"/>
<org.mariotaku.twidere.view.themed.ThemedTextView
<TextView
android:id="@+id/created_by"
android:layout_width="match_parent"
android:layout_height="wrap_content"

43
twidere/src/main/res/values-v21/themes_base.xml
View File

@ -20,45 +20,16 @@
<resources>
<style name="Theme.Base" parent="android:Theme.Material">
<!--<item name="android:colorPrimary">@color/material_light_blue</item>-->
<!--<item name="android:colorPrimaryDark">@color/material_light_blue_700</item>-->
<!--<item name="android:colorAccent">@color/material_light_blue_a200</item>-->
<item name="android:colorAccent">#ccc</item>
</style>
<style name="Theme.Base" parent="android:Theme.Material"/>
<style name="Theme.Base.NoActionBar" parent="android:Theme.Material.NoActionBar">
<!--<item name="android:colorPrimary">@color/material_light_blue</item>-->
<!--<item name="android:colorPrimaryDark">@color/material_light_blue_700</item>-->
<!--<item name="android:colorAccent">@color/material_light_blue_a200</item>-->
<item name="android:colorAccent">#ccc</item>
</style>
<style name="Theme.Base.NoActionBar" parent="android:Theme.Material.NoActionBar"/>
<style name="Theme.Base.Dialog" parent="android:Theme.Material.Dialog">
<!--<item name="android:colorPrimary">@color/material_light_blue</item>-->
<!--<item name="android:colorPrimaryDark">@color/material_light_blue_700</item>-->
<!--<item name="android:colorAccent">@color/material_light_blue_a200</item>-->
<item name="android:colorAccent">#ccc</item>
</style>
<style name="Theme.Base.Dialog" parent="android:Theme.Material.Dialog"/>
<style name="Theme.Base.Light" parent="android:Theme.Material.Light">
<!--<item name="android:colorPrimary">@color/material_light_blue</item>-->
<!--<item name="android:colorPrimaryDark">@color/material_light_blue_700</item>-->
<!--<item name="android:colorAccent">@color/material_light_blue_a200</item>-->
<item name="android:colorAccent">#aaa</item>
</style>
<style name="Theme.Base.Light" parent="android:Theme.Material.Light"/>
<style name="Theme.Base.Light.DarkActionBar" parent="android:Theme.Material.Light.DarkActionBar">
<!--<item name="android:colorPrimary">@color/material_light_blue</item>-->
<!--<item name="android:colorPrimaryDark">@color/material_light_blue_700</item>-->
<!--<item name="android:colorAccent">@color/material_light_blue_a200</item>-->
<item name="android:colorAccent">#aaa</item>
</style>
<style name="Theme.Base.Light.DarkActionBar" parent="android:Theme.Material.Light.DarkActionBar"/>
<style name="Theme.Base.Light.Dialog" parent="android:Theme.Material.Light.Dialog"/>
<style name="Theme.Base.Light.Dialog" parent="android:Theme.Material.Light.Dialog">
<!--<item name="android:colorPrimary">@color/material_light_blue</item>-->
<!--<item name="android:colorPrimaryDark">@color/material_light_blue_700</item>-->
<!--<item name="android:colorAccent">@color/material_light_blue_a200</item>-->
<item name="android:colorAccent">#aaa</item>
</style>
</resources>

69
twidere/src/main/res/values/themes_base_appcompat.xml
View File

@ -21,116 +21,47 @@
<resources>
<style name="Theme.Compat.Base" parent="Theme.AppCompat">
<!--<item name="colorPrimary">@color/material_light_blue</item>-->
<!--<item name="colorPrimaryDark">@color/material_light_blue_700</item>-->
<!--<item name="colorAccent">@color/material_light_blue_a200</item>-->
<!-- fix for https://github.com/TwidereProject/Twidere-Android/issues/76-->
<item name="actionModeBackground">?android:colorBackground</item>
<item name="android:textColorTertiary">@color/tertiary_text_mtrl_dark</item>
<item name="android:textColorTertiaryInverse">@color/tertiary_text_mtrl_light</item>
</style>
<style name="Theme.Compat.Base.DialogWhenLarge" parent="Theme.AppCompat.DialogWhenLarge">
<!--<item name="colorPrimary">@color/material_light_blue</item>-->
<!--<item name="colorPrimaryDark">@color/material_light_blue_700</item>-->
<!--<item name="colorAccent">@color/material_light_blue_a200</item>-->
<!-- fix for https://github.com/TwidereProject/Twidere-Android/issues/76-->
<item name="actionModeBackground">?android:colorBackground</item>
<item name="android:textColorTertiary">@color/tertiary_text_mtrl_dark</item>
<item name="android:textColorTertiaryInverse">@color/tertiary_text_mtrl_light</item>
</style>
<style name="Theme.Compat.Base.NoActionBar" parent="Theme.AppCompat.NoActionBar">
<!--<item name="colorPrimary">@color/material_light_blue</item>-->
<!--<item name="colorPrimaryDark">@color/material_light_blue_700</item>-->
<!--<item name="colorAccent">@color/material_light_blue_a200</item>-->
<!-- fix for https://github.com/TwidereProject/Twidere-Android/issues/76-->
<item name="actionModeBackground">?android:colorBackground</item>
<item name="android:textColorTertiary">@color/tertiary_text_mtrl_dark</item>
<item name="android:textColorTertiaryInverse">@color/tertiary_text_mtrl_light</item>
</style>
<style name="Theme.Compat.Base.Dialog" parent="Theme.AppCompat.Dialog">
<!--<item name="colorPrimary">@color/material_light_blue</item>-->
<!--<item name="colorPrimaryDark">@color/material_light_blue_700</item>-->
<!--<item name="colorAccent">@color/material_light_blue_a200</item>-->
<!-- fix for https://github.com/TwidereProject/Twidere-Android/issues/76-->
<item name="actionModeBackground">?android:colorBackground</item>
<item name="android:textColorTertiary">@color/tertiary_text_mtrl_dark</item>
<item name="android:textColorTertiaryInverse">@color/tertiary_text_mtrl_light</item>
</style>
<style name="Theme.Compat.Base.Light" parent="Theme.AppCompat.Light">
<!--<item name="colorPrimary">@color/material_light_blue</item>-->
<!--<item name="colorPrimaryDark">@color/material_light_blue_700</item>-->
<!--<item name="colorAccent">@color/material_light_blue_a200</item>-->
<!-- fix for https://github.com/TwidereProject/Twidere-Android/issues/76-->
<item name="actionModeBackground">?android:colorBackground</item>
<item name="android:textColorTertiary">@color/tertiary_text_mtrl_light</item>
<item name="android:textColorTertiaryInverse">@color/tertiary_text_mtrl_dark</item>
</style>
<style name="Theme.Compat.Base.Light.DialogWhenLarge" parent="Theme.AppCompat.Light.DialogWhenLarge">
<!--<item name="colorPrimary">@color/material_light_blue</item>-->
<!--<item name="colorPrimaryDark">@color/material_light_blue_700</item>-->
<!--<item name="colorAccent">@color/material_light_blue_a200</item>-->
<!-- fix for https://github.com/TwidereProject/Twidere-Android/issues/76-->
<item name="actionModeBackground">?android:colorBackground</item>
<item name="android:textColorTertiary">@color/tertiary_text_mtrl_light</item>
<item name="android:textColorTertiaryInverse">@color/tertiary_text_mtrl_dark</item>
</style>
<style name="Theme.Compat.Base.Light.DarkActionBar" parent="Theme.AppCompat.Light.DarkActionBar">
<!--<item name="colorPrimary">@color/material_light_blue</item>-->
<!--<item name="colorPrimaryDark">@color/material_light_blue_700</item>-->
<!--<item name="colorAccent">@color/material_light_blue_a200</item>-->
<!-- fix for https://github.com/TwidereProject/Twidere-Android/issues/76-->
<item name="actionModeBackground">?android:colorBackground</item>
<item name="android:textColorTertiary">@color/tertiary_text_mtrl_light</item>
<item name="android:textColorTertiaryInverse">@color/tertiary_text_mtrl_dark</item>
</style>
<style name="Theme.Compat.Base.Light.NoActionBar" parent="Theme.AppCompat.Light.NoActionBar">
<!--<item name="colorPrimary">@color/material_light_blue</item>-->
<!--<item name="colorPrimaryDark">@color/material_light_blue_700</item>-->
<!--<item name="colorAccent">@color/material_light_blue_a200</item>-->
<!-- fix for https://github.com/TwidereProject/Twidere-Android/issues/76-->
<item name="actionModeBackground">?android:colorBackground</item>
<item name="android:textColorTertiary">@color/tertiary_text_mtrl_light</item>
<item name="android:textColorTertiaryInverse">@color/tertiary_text_mtrl_dark</item>
</style>
<style name="Theme.Compat.Base.Light.Dialog" parent="Theme.AppCompat.Light.Dialog">
<!--<item name="colorPrimary">@color/material_light_blue</item>-->
<!--<item name="colorPrimaryDark">@color/material_light_blue_700</item>-->
<!--<item name="colorAccent">@color/material_light_blue_a200</item>-->
<!-- fix for https://github.com/TwidereProject/Twidere-Android/issues/76-->
<item name="actionModeBackground">?android:colorBackground</item>
<item name="android:textColorTertiary">@color/tertiary_text_mtrl_light</item>
<item name="android:textColorTertiaryInverse">@color/tertiary_text_mtrl_dark</item>
</style>