From d067c8bf2735a10f1ccdf0c6b6abf3e69d7181cc Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 7 Mar 2017 14:09:33 +0100 Subject: [PATCH] Made compose form more material --- .../keylesspalace/tusky/ComposeActivity.java | 198 +++++++++++------- .../main/res/drawable/ic_attach_file_24dp.xml | 9 + app/src/main/res/drawable/ic_send_24dp.xml | 9 + .../main/res/drawable/ic_visibility_24dp.xml | 9 + app/src/main/res/layout/activity_compose.xml | 143 +++++++------ app/src/main/res/menu/compose_toolbar.xml | 12 ++ app/src/main/res/values/strings.xml | 7 +- 7 files changed, 236 insertions(+), 151 deletions(-) create mode 100644 app/src/main/res/drawable/ic_attach_file_24dp.xml create mode 100644 app/src/main/res/drawable/ic_send_24dp.xml create mode 100644 app/src/main/res/drawable/ic_visibility_24dp.xml create mode 100644 app/src/main/res/menu/compose_toolbar.xml diff --git a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java index 1d4ad15c3..7561bb197 100644 --- a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java @@ -42,12 +42,15 @@ import android.support.annotation.DrawableRes; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.StringRes; +import android.support.design.widget.FloatingActionButton; import android.support.design.widget.Snackbar; import android.support.v13.view.inputmethod.EditorInfoCompat; import android.support.v13.view.inputmethod.InputConnectionCompat; import android.support.v13.view.inputmethod.InputContentInfoCompat; import android.support.v4.app.ActivityCompat; import android.support.v4.content.ContextCompat; +import android.support.v7.app.ActionBar; +import android.support.v7.widget.Toolbar; import android.text.Editable; import android.text.InputType; import android.text.Spannable; @@ -55,6 +58,8 @@ import android.text.Spanned; import android.text.TextWatcher; import android.text.style.ForegroundColorSpan; import android.view.Gravity; +import android.view.Menu; +import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.view.inputmethod.EditorInfo; @@ -105,7 +110,6 @@ public class ComposeActivity extends BaseActivity { private String domain; private String accessToken; private EditText textEditor; - private ImageButton mediaPick; private LinearLayout mediaPreviewBar; private ArrayList mediaQueued; private CountUpDownLatch waitForMediaLatch; @@ -118,6 +122,8 @@ public class ComposeActivity extends BaseActivity { private InputContentInfoCompat currentInputContentInfo; private int currentFlags; private ProgressDialog finishingUploadDialog; + private EditText contentWarningEditor; + private boolean mediaPickEnabled; private static class QueuedMedia { enum Type { @@ -317,9 +323,30 @@ public class ComposeActivity extends BaseActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_compose); + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + ActionBar actionBar = getSupportActionBar(); + + if (actionBar != null) { + actionBar.setTitle(null); + actionBar.setDisplayHomeAsUpEnabled(true); + actionBar.setDisplayShowHomeEnabled(true); + } + SharedPreferences preferences = getSharedPreferences( getString(R.string.preferences_file_key), Context.MODE_PRIVATE); + mediaPickEnabled = true; + + FloatingActionButton floatingBtn = (FloatingActionButton) findViewById(R.id.floating_btn); + floatingBtn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + sendStatus(); + } + }); + ArrayList savedMediaQueued = null; if (savedInstanceState != null) { showMarkSensitive = savedInstanceState.getBoolean("showMarkSensitive"); @@ -399,77 +426,10 @@ public class ComposeActivity extends BaseActivity { waitForMediaLatch = new CountUpDownLatch(); contentWarningBar = findViewById(R.id.compose_content_warning_bar); - @DrawableRes int drawableId = ThemeUtils.getDrawableId(this, - R.attr.compose_content_warning_bar_background, R.drawable.border_background_dark); - contentWarningBar.setBackgroundResource(drawableId); - final EditText contentWarningEditor = (EditText) findViewById(R.id.field_content_warning); + contentWarningEditor = (EditText) findViewById(R.id.field_content_warning); showContentWarning(false); statusAlreadyInFlight = false; - final Button sendButton = (Button) findViewById(R.id.button_send); - sendButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (statusAlreadyInFlight) { - return; - } - Editable editable = textEditor.getText(); - if (editable.length() <= STATUS_CHARACTER_LIMIT) { - statusAlreadyInFlight = true; - String spoilerText = ""; - if (statusHideText) { - spoilerText = contentWarningEditor.getText().toString(); - } - readyStatus(editable.toString(), statusVisibility, statusMarkSensitive, - spoilerText); - } else { - textEditor.setError(getString(R.string.error_compose_character_limit)); - } - } - }); - - mediaPick = (ImageButton) findViewById(R.id.compose_photo_pick); - mediaPick.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - onMediaPick(); - } - }); - - ImageButton options = (ImageButton) findViewById(R.id.compose_options); - options.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - ComposeOptionsFragment fragment = ComposeOptionsFragment.newInstance( - statusVisibility, statusMarkSensitive, statusHideText, - showMarkSensitive, inReplyToId != null, - new ComposeOptionsFragment.Listener() { - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel dest, int flags) {} - - @Override - public void onVisibilityChanged(String visibility) { - statusVisibility = visibility; - } - - @Override - public void onMarkSensitiveChanged(boolean markSensitive) { - statusMarkSensitive = markSensitive; - } - - @Override - public void onContentWarningChanged(boolean hideText) { - showContentWarning(hideText); - } - }); - fragment.show(getSupportFragmentManager(), null); - } - }); // These can only be added after everything affected by the media queue is initialized. if (savedMediaQueued != null) { @@ -479,6 +439,55 @@ public class ComposeActivity extends BaseActivity { } } + private void showComposeOptions() { + ComposeOptionsFragment fragment = ComposeOptionsFragment.newInstance( + statusVisibility, statusMarkSensitive, statusHideText, + showMarkSensitive, inReplyToId != null, + new ComposeOptionsFragment.Listener() { + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) {} + + @Override + public void onVisibilityChanged(String visibility) { + statusVisibility = visibility; + } + + @Override + public void onMarkSensitiveChanged(boolean markSensitive) { + statusMarkSensitive = markSensitive; + } + + @Override + public void onContentWarningChanged(boolean hideText) { + showContentWarning(hideText); + } + }); + fragment.show(getSupportFragmentManager(), null); + } + + private void sendStatus() { + if (statusAlreadyInFlight) { + return; + } + Editable editable = textEditor.getText(); + if (editable.length() <= STATUS_CHARACTER_LIMIT) { + statusAlreadyInFlight = true; + String spoilerText = ""; + if (statusHideText) { + spoilerText = contentWarningEditor.getText().toString(); + } + readyStatus(editable.toString(), statusVisibility, statusMarkSensitive, + spoilerText); + } else { + textEditor.setError(getString(R.string.error_compose_character_limit)); + } + } + @Override protected void onSaveInstanceState(Bundle outState) { ArrayList savedMediaQueued = new ArrayList<>(); @@ -530,7 +539,7 @@ public class ComposeActivity extends BaseActivity { } else { mimeTypes = Arrays.copyOf(contentMimeTypes, contentMimeTypes.length); } - EditText editText = new EditText(this) { + EditText editText = new android.support.v7.widget.AppCompatEditText(this) { @Override public InputConnection onCreateInputConnection(EditorInfo editorInfo) { final InputConnection ic = super.onCreateInputConnection(editorInfo); @@ -783,15 +792,24 @@ public class ComposeActivity extends BaseActivity { } private void enableMediaPicking() { - mediaPick.setEnabled(true); - ThemeUtils.setImageViewTint(mediaPick, R.attr.compose_media_button_tint); - mediaPick.setImageResource(R.drawable.ic_media); + mediaPickEnabled = true; + invalidateOptionsMenu(); } private void disableMediaPicking() { - mediaPick.setEnabled(false); - ThemeUtils.setImageViewTint(mediaPick, R.attr.compose_media_button_disabled_tint); - mediaPick.setImageResource(R.drawable.ic_media_disabled); + mediaPickEnabled = false; + invalidateOptionsMenu(); + } + + @Override + public boolean onPrepareOptionsMenu(Menu menu) { + if (mediaPickEnabled) { + menu.findItem(R.id.compose_photo_pick).setEnabled(true); + } else { + menu.findItem(R.id.compose_photo_pick).setEnabled(false); + } + + return super.onPrepareOptionsMenu(menu); } private void addMediaToQueue(QueuedMedia.Type type, Bitmap preview, Uri uri, long mediaSize) { @@ -1103,4 +1121,32 @@ public class ComposeActivity extends BaseActivity { contentWarningBar.setVisibility(View.GONE); } } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.compose_toolbar, menu); + return super.onCreateOptionsMenu(menu); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case android.R.id.home: { + onBackPressed(); + return true; + } + + case R.id.compose_photo_pick: { + onMediaPick(); + return true; + } + + case R.id.compose_options: { + showComposeOptions(); + return true; + } + } + + return super.onOptionsItemSelected(item); + } } diff --git a/app/src/main/res/drawable/ic_attach_file_24dp.xml b/app/src/main/res/drawable/ic_attach_file_24dp.xml new file mode 100644 index 000000000..b3c693560 --- /dev/null +++ b/app/src/main/res/drawable/ic_attach_file_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_send_24dp.xml b/app/src/main/res/drawable/ic_send_24dp.xml new file mode 100644 index 000000000..c98a573e3 --- /dev/null +++ b/app/src/main/res/drawable/ic_send_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_visibility_24dp.xml b/app/src/main/res/drawable/ic_visibility_24dp.xml new file mode 100644 index 000000000..bf3a04cb3 --- /dev/null +++ b/app/src/main/res/drawable/ic_visibility_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_compose.xml b/app/src/main/res/layout/activity_compose.xml index 18c1b7197..a8be270b1 100644 --- a/app/src/main/res/layout/activity_compose.xml +++ b/app/src/main/res/layout/activity_compose.xml @@ -1,95 +1,92 @@ - - - - - - - - - + android:layout_height="match_parent"> - - + - - - - - - + android:layout_height="?attr/actionBarSize" + android:elevation="4dp" + android:layout_marginBottom="16dp" + android:background="?attr/toolbar_background_color" /> - - + android:id="@+id/compose_content_warning_bar" + android:paddingTop="0dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:layout_marginBottom="4dp"> + + + - + - + - + - + -