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

implemented #379

This commit is contained in:
Mariotaku Lee 2016-02-19 10:56:39 +08:00
parent 17edd9232f
commit 473b2fa7be
5 changed files with 46 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,6 +192,8 @@ public class ComposeActivity extends ThemedFragmentActivity implements OnMenuIte
private View mLocationContainer;
private ActionIconView mLocationIcon;
private TextView mLocationText;
private TextView mReplyLabel;
private View mReplyLabelDivider;
// Adapters
private MediaPreviewAdapter mMediaPreviewAdapter;
@ -212,6 +214,7 @@ public class ComposeActivity extends ThemedFragmentActivity implements OnMenuIte
// Listeners
private LocationListener mLocationListener;
private boolean mNameFirst;
@Override
public int getThemeColor() {
@ -556,6 +559,8 @@ public class ComposeActivity extends ThemedFragmentActivity implements OnMenuIte
mLocationContainer = findViewById(R.id.location_container);
mLocationIcon = (ActionIconView) findViewById(R.id.location_icon);
mLocationText = (TextView) findViewById(R.id.location_text);
mReplyLabel = (TextView) findViewById(R.id.reply_label);
mReplyLabelDivider = findViewById(R.id.reply_label_divider);
}
@NonNull
@ -613,6 +618,7 @@ public class ComposeActivity extends ThemedFragmentActivity implements OnMenuIte
super.onCreate(savedInstanceState);
GeneralComponentHelper.build(this).inject(this);
mLocationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
mNameFirst = mPreferences.getBoolean(KEY_NAME_FIRST);
setContentView(R.layout.activity_compose);
setFinishOnTouchOutside(false);
final ParcelableCredentials[] accounts = DataStoreUtils.getCredentialsArray(this, false, false);
@ -918,6 +924,8 @@ public class ComposeActivity extends ThemedFragmentActivity implements OnMenuIte
mMentionUser = intent.getParcelableExtra(EXTRA_USER);
mInReplyToStatus = intent.getParcelableExtra(EXTRA_STATUS);
mInReplyToStatusId = mInReplyToStatus != null ? mInReplyToStatus.id : -1;
mReplyLabel.setVisibility(View.GONE);
mReplyLabelDivider.setVisibility(View.GONE);
switch (action) {
case INTENT_ACTION_REPLY: {
return handleReplyIntent(mInReplyToStatus);
@ -965,6 +973,10 @@ public class ComposeActivity extends ThemedFragmentActivity implements OnMenuIte
mEditText.setText(Utils.getQuoteStatus(this, status.id, status.user_screen_name, status.text_plain));
mEditText.setSelection(0);
mAccountsAdapter.setSelectedAccountIds(status.account_id);
final String replyToName = mUserColorNameManager.getDisplayName(status, mNameFirst, false);
mReplyLabel.setText(getString(R.string.quote_name_text, replyToName, status.text_unescaped));
mReplyLabel.setVisibility(View.VISIBLE);
mReplyLabelDivider.setVisibility(View.VISIBLE);
return true;
}
@ -998,6 +1010,10 @@ public class ComposeActivity extends ThemedFragmentActivity implements OnMenuIte
final int selectionEnd = mEditText.length();
mEditText.setSelection(selectionStart, selectionEnd);
mAccountsAdapter.setSelectedAccountIds(status.account_id);
final String replyToName = mUserColorNameManager.getDisplayName(status, mNameFirst, false);
mReplyLabel.setText(getString(R.string.reply_to_name_text, replyToName, status.text_unescaped));
mReplyLabel.setVisibility(View.VISIBLE);
mReplyLabelDivider.setVisibility(View.VISIBLE);
return true;
}
@ -1065,16 +1081,15 @@ public class ComposeActivity extends ThemedFragmentActivity implements OnMenuIte
private boolean setComposeTitle(final Intent intent) {
final String action = intent.getAction();
final boolean nameFirst = mPreferences.getBoolean(KEY_NAME_FIRST);
if (INTENT_ACTION_REPLY.equals(action)) {
if (mInReplyToStatus == null) return false;
final String displayName = mUserColorNameManager.getDisplayName(mInReplyToStatus.user_id, mInReplyToStatus.user_name,
mInReplyToStatus.user_screen_name, nameFirst, false);
mInReplyToStatus.user_screen_name, mNameFirst, false);
setTitle(getString(R.string.reply_to, displayName));
} else if (INTENT_ACTION_QUOTE.equals(action)) {
if (mInReplyToStatus == null) return false;
final String displayName = mUserColorNameManager.getDisplayName(mInReplyToStatus.user_id, mInReplyToStatus.user_name,
mInReplyToStatus.user_screen_name, nameFirst, false);
mInReplyToStatus.user_screen_name, mNameFirst, false);
setTitle(getString(R.string.quote_user, displayName));
} else if (INTENT_ACTION_EDIT_DRAFT.equals(action)) {
if (mDraftItem == null) return false;
@ -1082,7 +1097,7 @@ public class ComposeActivity extends ThemedFragmentActivity implements OnMenuIte
} else if (INTENT_ACTION_MENTION.equals(action)) {
if (mMentionUser == null) return false;
final String displayName = mUserColorNameManager.getDisplayName(mMentionUser.id, mMentionUser.name,
mMentionUser.screen_name, nameFirst, false);
mMentionUser.screen_name, mNameFirst, false);
setTitle(getString(R.string.mention_user, displayName));
} else if (INTENT_ACTION_REPLY_MULTIPLE.equals(action)) {
setTitle(R.string.reply);

11
twidere/src/main/java/org/mariotaku/twidere/util/TwidereValidator.java
View File

@ -19,6 +19,7 @@
package org.mariotaku.twidere.util;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import com.twitter.Validator;
@ -31,10 +32,14 @@ public class TwidereValidator implements Constants {
private final int mMaxTweetLength;
private final Validator mValidator;
public TwidereValidator(final SharedPreferencesWrapper preferences) {
public TwidereValidator(@Nullable final SharedPreferencesWrapper preferences) {
mValidator = new Validator();
final String textLimit = preferences.getString(KEY_STATUS_TEXT_LIMIT, null);
mMaxTweetLength = NumberUtils.toInt(textLimit, Validator.MAX_TWEET_LENGTH);
if (preferences != null) {
final String textLimit = preferences.getString(KEY_STATUS_TEXT_LIMIT, null);
mMaxTweetLength = NumberUtils.toInt(textLimit, Validator.MAX_TWEET_LENGTH);
} else {
mMaxTweetLength = Validator.MAX_TWEET_LENGTH;
}
}
public int getMaxTweetLength() {

3
twidere/src/main/java/org/mariotaku/twidere/view/StatusTextCountView.java
View File

@ -49,11 +49,12 @@ public class StatusTextCountView extends AppCompatTextView {
public StatusTextCountView(final Context context, final AttributeSet attrs, final int defStyle) {
super(context, attrs, defStyle);
mValidator = DependencyHolder.get(context).getValidator();
if (isInEditMode()) {
mValidator = new TwidereValidator(null);
mTextColor = 0;
mLocale = Locale.getDefault();
} else {
mValidator = DependencyHolder.get(context).getValidator();
final int textAppearance = ThemeUtils.getTitleTextAppearance(context);
final TypedArray a = context.obtainStyledAttributes(textAppearance, new int[]{android.R.attr.textColor});
mTextColor = a.getColor(0, 0);

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

@ -39,6 +39,21 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/reply_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:panelColorBackground"
android:ellipsize="end"
android:padding="@dimen/element_spacing_normal"
android:singleLine="true"/>
<View
android:id="@+id/reply_label_divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?dividerVertical"/>
<org.mariotaku.twidere.view.ComposeEditText
android:id="@+id/edit_text"
android:layout_width="match_parent"

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

@ -851,4 +851,6 @@
<string name="bandwidth_saving_mode">Bandwidth saving mode</string>
<string name="bandwidth_saving_mode_summary">Disable media preview on metered network</string>
<string name="recent_media">Recent media</string>
<string name="reply_to_name_text">Reply to <xliff:g id="name">%1$s</xliff:g>: <xliff:g id="text">%2$s</xliff:g></string>
<string name="quote_name_text">Quote <xliff:g id="name">%1$s</xliff:g>: <xliff:g id="text">%2$s</xliff:g></string>
</resources>