From eaef58037c9df2cb7938c4a34f2ee5bcaf6b0d17 Mon Sep 17 00:00:00 2001 From: Alex Ning Date: Wed, 14 Aug 2019 13:53:08 +0800 Subject: [PATCH] Editing flair is now available. --- .idea/assetWizardSettings.xml | 4 +- .idea/caches/build_file_checksums.ser | Bin 533 -> 533 bytes .idea/caches/gradle_models.ser | Bin 263235 -> 264768 bytes app/build.gradle | 2 +- .../FlairBottomSheetFragment.java | 16 +++--- .../FlairBottomSheetRecyclerViewAdapter.java | 52 +++++++++++++++++- .../infinityforreddit/PostImageActivity.java | 18 +++--- .../infinityforreddit/PostLinkActivity.java | 2 + .../infinityforreddit/PostTextActivity.java | 18 +++--- .../infinityforreddit/PostVideoActivity.java | 18 +++--- .../res/drawable/ic_outline_edit_24px.xml | 9 +++ app/src/main/res/layout/dialog_edit_flair.xml | 24 ++++++++ app/src/main/res/layout/item_flair.xml | 26 ++++++--- app/src/main/res/values/strings.xml | 4 ++ build.gradle | 4 +- 15 files changed, 149 insertions(+), 48 deletions(-) create mode 100644 app/src/main/res/drawable/ic_outline_edit_24px.xml create mode 100644 app/src/main/res/layout/dialog_edit_flair.xml diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml index 767068f9..1d145e97 100644 --- a/.idea/assetWizardSettings.xml +++ b/.idea/assetWizardSettings.xml @@ -35,9 +35,9 @@ - + - + diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 5919b4e67b264488a9b1ec5352e8c7896eccd796..7c7ab19541f297d7148eb506cd2deca93f2fcbd9 100644 GIT binary patch delta 53 zcmV-50LuTB1eFAkm;{cLM{bdvpAd+}W^^7;pt@8oOiEj%*#whI0l5)_0s5||jfJlD LPAen>BDM8+T9FqB delta 53 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 diff --git a/app/build.gradle b/app/build.gradle index b172df20..6cfa4e13 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,7 +34,7 @@ repositories { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'androidx.appcompat:appcompat:1.1.0-rc01' - implementation 'com.google.android.material:material:1.1.0-alpha08' + implementation 'com.google.android.material:material:1.1.0-alpha09' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.legacy:legacy-support-v13:1.0.0' diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/FlairBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/FlairBottomSheetFragment.java index 6a9987cf..6087e350 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/FlairBottomSheetFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/FlairBottomSheetFragment.java @@ -2,8 +2,6 @@ package ml.docilealligator.infinityforreddit; import android.app.Activity; -import android.content.res.Configuration; -import android.os.Build; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -47,7 +45,7 @@ public class FlairBottomSheetFragment extends BottomSheetDialogFragment { private String mAccessToken; private String mSubredditName; - private Activity mAcitivity; + private Activity mActivity; private FlairBottomSheetRecyclerViewAdapter mAdapter; @Inject @@ -70,17 +68,17 @@ public class FlairBottomSheetFragment extends BottomSheetDialogFragment { ButterKnife.bind(this, rootView); - mAcitivity = getActivity(); + mActivity = getActivity(); - ((Infinity) mAcitivity.getApplication()).getAppComponent().inject(this); + ((Infinity) mActivity.getApplication()).getAppComponent().inject(this); - if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O + /*if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && (getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) != Configuration.UI_MODE_NIGHT_YES) { rootView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR); - } + }*/ - mAdapter = new FlairBottomSheetRecyclerViewAdapter(flair -> { - ((FlairSelectionCallback) mAcitivity).flairSelected(flair); + mAdapter = new FlairBottomSheetRecyclerViewAdapter(mActivity, flair -> { + ((FlairSelectionCallback) mActivity).flairSelected(flair); dismiss(); }); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/FlairBottomSheetRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/FlairBottomSheetRecyclerViewAdapter.java index f3cf3328..d1eecf20 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/FlairBottomSheetRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/FlairBottomSheetRecyclerViewAdapter.java @@ -1,13 +1,20 @@ package ml.docilealligator.infinityforreddit; +import android.app.Activity; +import android.content.Context; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.inputmethod.InputMethodManager; +import android.widget.EditText; +import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; + import java.util.ArrayList; import butterknife.BindView; @@ -18,10 +25,12 @@ class FlairBottomSheetRecyclerViewAdapter extends RecyclerView.Adapter flairs; private ItemClickListener itemClickListener; - FlairBottomSheetRecyclerViewAdapter(ItemClickListener itemClickListener) { + FlairBottomSheetRecyclerViewAdapter(Context context, ItemClickListener itemClickListener) { + this.context = context; this.itemClickListener = itemClickListener; } @@ -33,6 +42,36 @@ class FlairBottomSheetRecyclerViewAdapter extends RecyclerView.Adapter { + View dialogView = ((Activity) context).getLayoutInflater().inflate(R.layout.dialog_edit_flair, null); + EditText flairEditText = dialogView.findViewById(R.id.flair_edit_text_edit_flair_dialog); + flairEditText.requestFocus(); + InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE); + if(imm != null) { + imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0); + } + new MaterialAlertDialogBuilder(context, R.style.MaterialAlertDialogTheme) + .setTitle(R.string.edit_flair) + .setView(dialogView) + .setPositiveButton(R.string.ok, (dialogInterface, i) + -> { + Flair flair = flairs.get(holder.getAdapterPosition()); + flair.setText(flairEditText.getText().toString()); + itemClickListener.onClick(flair); + }) + .setNegativeButton(R.string.cancel, null) + .show(); + }); + } + + if(flairs.get(holder.getAdapterPosition()).isEditable() && flairs.get(holder.getAdapterPosition()).getText().equals("")) { + holder.itemView.setOnClickListener(view -> holder.editFlairImageView.performClick()); + } else { + holder.itemView.setOnClickListener(view -> itemClickListener.onClick(flairs.get(holder.getAdapterPosition()))); + } + holder.flairTextView.setText(flairs.get(holder.getAdapterPosition()).getText()); } @@ -41,19 +80,26 @@ class FlairBottomSheetRecyclerViewAdapter extends RecyclerView.Adapter flairs) { this.flairs = flairs; notifyDataSetChanged(); } class FlairViewHolder extends RecyclerView.ViewHolder { + View itemView; @BindView(R.id.flair_text_view_item_flair) TextView flairTextView; + @BindView(R.id.edit_flair_image_view_item_flair) ImageView editFlairImageView; FlairViewHolder(@NonNull View itemView) { super(itemView); ButterKnife.bind(this, itemView); - - flairTextView.setOnClickListener(view -> itemClickListener.onClick(flairs.get(getAdapterPosition()))); + this.itemView = itemView; } } } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/PostImageActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/PostImageActivity.java index 7d2a999b..67bcd4ed 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/PostImageActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/PostImageActivity.java @@ -72,7 +72,7 @@ public class PostImageActivity extends AppCompatActivity implements FlairBottomS @BindView(R.id.coordinator_layout_post_image_activity) CoordinatorLayout coordinatorLayout; @BindView(R.id.toolbar_post_image_activity) Toolbar toolbar; @BindView(R.id.subreddit_icon_gif_image_view_post_image_activity) GifImageView iconGifImageView; - @BindView(R.id.subreddit_name_text_view_post_image_activity) TextView subreditNameTextView; + @BindView(R.id.subreddit_name_text_view_post_image_activity) TextView subredditNameTextView; @BindView(R.id.rules_button_post_image_activity) Button rulesButton; @BindView(R.id.flair_custom_text_view_post_image_activity) CustomTextView flairTextView; @BindView(R.id.spoiler_custom_text_view_post_image_activity) CustomTextView spoilerTextView; @@ -168,7 +168,8 @@ public class PostImageActivity extends AppCompatActivity implements FlairBottomS } if(subredditName != null) { - subreditNameTextView.setText(subredditName); + subredditNameTextView.setTextColor(getResources().getColor(R.color.primaryTextColor)); + subredditNameTextView.setText(subredditName); flairTextView.setVisibility(View.VISIBLE); if(!loadSubredditIconSuccessful) { loadSubredditIcon(); @@ -198,7 +199,8 @@ public class PostImageActivity extends AppCompatActivity implements FlairBottomS if(getIntent().hasExtra(EXTRA_SUBREDDIT_NAME)) { subredditName = getIntent().getExtras().getString(EXTRA_SUBREDDIT_NAME); - subreditNameTextView.setText(subredditName); + subredditNameTextView.setTextColor(getResources().getColor(R.color.primaryTextColor)); + subredditNameTextView.setText(subredditName); loadSubredditIcon(); } else { mGlide.load(R.drawable.subreddit_default_icon) @@ -212,7 +214,7 @@ public class PostImageActivity extends AppCompatActivity implements FlairBottomS startActivityForResult(intent, SUBREDDIT_SELECTION_REQUEST_CODE); }); - subreditNameTextView.setOnClickListener(view -> { + subredditNameTextView.setOnClickListener(view -> { Intent intent = new Intent(this, SubredditSelectionActivity.class); startActivityForResult(intent, SUBREDDIT_SELECTION_REQUEST_CODE); }); @@ -376,9 +378,9 @@ public class PostImageActivity extends AppCompatActivity implements FlairBottomS String subredditName; if(subredditIsUser) { - subredditName = "u_" + subreditNameTextView.getText().toString(); + subredditName = "u_" + subredditNameTextView.getText().toString(); } else { - subredditName = subreditNameTextView.getText().toString(); + subredditName = subredditNameTextView.getText().toString(); } Intent intent = new Intent(this, SubmitPostService.class); @@ -433,8 +435,8 @@ public class PostImageActivity extends AppCompatActivity implements FlairBottomS subredditSelected = true; subredditIsUser = data.getExtras().getBoolean(SubredditSelectionActivity.EXTRA_RETURN_SUBREDDIT_IS_USER); - subreditNameTextView.setTextColor(getResources().getColor(R.color.primaryTextColor)); - subreditNameTextView.setText(subredditName); + subredditNameTextView.setTextColor(getResources().getColor(R.color.primaryTextColor)); + subredditNameTextView.setText(subredditName); displaySubredditIcon(); flairTextView.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/PostLinkActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/PostLinkActivity.java index 15b47cce..7643ec07 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/PostLinkActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/PostLinkActivity.java @@ -138,6 +138,7 @@ public class PostLinkActivity extends AppCompatActivity implements FlairBottomSh isNSFW = savedInstanceState.getBoolean(IS_NSFW_STATE); if(subredditName != null) { + subredditNameTextView.setTextColor(getResources().getColor(R.color.primaryTextColor)); subredditNameTextView.setText(subredditName); flairTextView.setVisibility(View.VISIBLE); if(!loadSubredditIconSuccessful) { @@ -168,6 +169,7 @@ public class PostLinkActivity extends AppCompatActivity implements FlairBottomSh if(getIntent().hasExtra(EXTRA_SUBREDDIT_NAME)) { subredditName = getIntent().getExtras().getString(EXTRA_SUBREDDIT_NAME); + subredditNameTextView.setTextColor(getResources().getColor(R.color.primaryTextColor)); subredditNameTextView.setText(subredditName); flairTextView.setVisibility(View.VISIBLE); loadSubredditIcon(); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/PostTextActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/PostTextActivity.java index 7d401c90..105da07f 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/PostTextActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/PostTextActivity.java @@ -58,7 +58,7 @@ public class PostTextActivity extends AppCompatActivity implements FlairBottomSh @BindView(R.id.coordinator_layout_post_text_activity) CoordinatorLayout coordinatorLayout; @BindView(R.id.toolbar_post_text_activity) Toolbar toolbar; @BindView(R.id.subreddit_icon_gif_image_view_search_activity) GifImageView iconGifImageView; - @BindView(R.id.subreddit_name_text_view_search_activity) TextView subreditNameTextView; + @BindView(R.id.subreddit_name_text_view_search_activity) TextView subredditNameTextView; @BindView(R.id.rules_button_post_text_activity) Button rulesButton; @BindView(R.id.flair_custom_text_view_post_text_activity) CustomTextView flairTextView; @BindView(R.id.spoiler_custom_text_view_post_text_activity) CustomTextView spoilerTextView; @@ -131,7 +131,8 @@ public class PostTextActivity extends AppCompatActivity implements FlairBottomSh isNSFW = savedInstanceState.getBoolean(IS_NSFW_STATE); if(subredditName != null) { - subreditNameTextView.setText(subredditName); + subredditNameTextView.setTextColor(getResources().getColor(R.color.primaryTextColor)); + subredditNameTextView.setText(subredditName); flairTextView.setVisibility(View.VISIBLE); if(!loadSubredditIconSuccessful) { loadSubredditIcon(); @@ -160,7 +161,8 @@ public class PostTextActivity extends AppCompatActivity implements FlairBottomSh if(getIntent().hasExtra(EXTRA_SUBREDDIT_NAME)) { loadSubredditIconSuccessful = false; subredditName = getIntent().getExtras().getString(EXTRA_SUBREDDIT_NAME); - subreditNameTextView.setText(subredditName); + subredditNameTextView.setTextColor(getResources().getColor(R.color.primaryTextColor)); + subredditNameTextView.setText(subredditName); flairTextView.setVisibility(View.VISIBLE); loadSubredditIcon(); } else { @@ -175,7 +177,7 @@ public class PostTextActivity extends AppCompatActivity implements FlairBottomSh startActivityForResult(intent, SUBREDDIT_SELECTION_REQUEST_CODE); }); - subreditNameTextView.setOnClickListener(view -> { + subredditNameTextView.setOnClickListener(view -> { Intent intent = new Intent(this, SubredditSelectionActivity.class); startActivityForResult(intent, SUBREDDIT_SELECTION_REQUEST_CODE); }); @@ -299,9 +301,9 @@ public class PostTextActivity extends AppCompatActivity implements FlairBottomSh String subredditName; if(subredditIsUser) { - subredditName = "u_" + subreditNameTextView.getText().toString(); + subredditName = "u_" + subredditNameTextView.getText().toString(); } else { - subredditName = subreditNameTextView.getText().toString(); + subredditName = subredditNameTextView.getText().toString(); } Intent intent = new Intent(this, SubmitPostService.class); @@ -348,8 +350,8 @@ public class PostTextActivity extends AppCompatActivity implements FlairBottomSh subredditSelected = true; subredditIsUser = data.getExtras().getBoolean(SubredditSelectionActivity.EXTRA_RETURN_SUBREDDIT_IS_USER); - subreditNameTextView.setTextColor(getResources().getColor(R.color.primaryTextColor)); - subreditNameTextView.setText(subredditName); + subredditNameTextView.setTextColor(getResources().getColor(R.color.primaryTextColor)); + subredditNameTextView.setText(subredditName); displaySubredditIcon(); flairTextView.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/PostVideoActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/PostVideoActivity.java index b0ab91bb..fcf3a5d4 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/PostVideoActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/PostVideoActivity.java @@ -67,7 +67,7 @@ public class PostVideoActivity extends AppCompatActivity implements FlairBottomS @BindView(R.id.coordinator_layout_post_video_activity) CoordinatorLayout coordinatorLayout; @BindView(R.id.toolbar_post_video_activity) Toolbar toolbar; @BindView(R.id.subreddit_icon_gif_image_view_post_video_activity) GifImageView iconGifImageView; - @BindView(R.id.subreddit_name_text_view_post_video_activity) TextView subreditNameTextView; + @BindView(R.id.subreddit_name_text_view_post_video_activity) TextView subredditNameTextView; @BindView(R.id.rules_button_post_video_activity) Button rulesButton; @BindView(R.id.flair_custom_text_view_post_video_activity) CustomTextView flairTextView; @BindView(R.id.spoiler_custom_text_view_post_video_activity) CustomTextView spoilerTextView; @@ -166,7 +166,8 @@ public class PostVideoActivity extends AppCompatActivity implements FlairBottomS } if(subredditName != null) { - subreditNameTextView.setText(subredditName); + subredditNameTextView.setTextColor(getResources().getColor(R.color.primaryTextColor)); + subredditNameTextView.setText(subredditName); flairTextView.setVisibility(View.VISIBLE); if(!loadSubredditIconSuccessful) { loadSubredditIcon(); @@ -196,7 +197,8 @@ public class PostVideoActivity extends AppCompatActivity implements FlairBottomS if(getIntent().hasExtra(EXTRA_SUBREDDIT_NAME)) { subredditName = getIntent().getExtras().getString(EXTRA_SUBREDDIT_NAME); - subreditNameTextView.setText(subredditName); + subredditNameTextView.setTextColor(getResources().getColor(R.color.primaryTextColor)); + subredditNameTextView.setText(subredditName); loadSubredditIcon(); } else { mGlide.load(R.drawable.subreddit_default_icon) @@ -210,7 +212,7 @@ public class PostVideoActivity extends AppCompatActivity implements FlairBottomS startActivityForResult(intent, SUBREDDIT_SELECTION_REQUEST_CODE); }); - subreditNameTextView.setOnClickListener(view -> { + subredditNameTextView.setOnClickListener(view -> { Intent intent = new Intent(this, SubredditSelectionActivity.class); startActivityForResult(intent, SUBREDDIT_SELECTION_REQUEST_CODE); }); @@ -371,9 +373,9 @@ public class PostVideoActivity extends AppCompatActivity implements FlairBottomS String subredditName; if(subredditIsUser) { - subredditName = "u_" + subreditNameTextView.getText().toString(); + subredditName = "u_" + subredditNameTextView.getText().toString(); } else { - subredditName = subreditNameTextView.getText().toString(); + subredditName = subredditNameTextView.getText().toString(); } Intent intent = new Intent(this, SubmitPostService.class); @@ -434,8 +436,8 @@ public class PostVideoActivity extends AppCompatActivity implements FlairBottomS subredditSelected = true; subredditIsUser = data.getExtras().getBoolean(SubredditSelectionActivity.EXTRA_RETURN_SUBREDDIT_IS_USER); - subreditNameTextView.setTextColor(getResources().getColor(R.color.primaryTextColor)); - subreditNameTextView.setText(subredditName); + subredditNameTextView.setTextColor(getResources().getColor(R.color.primaryTextColor)); + subredditNameTextView.setText(subredditName); displaySubredditIcon(); flairTextView.setVisibility(View.VISIBLE); diff --git a/app/src/main/res/drawable/ic_outline_edit_24px.xml b/app/src/main/res/drawable/ic_outline_edit_24px.xml new file mode 100644 index 00000000..17a2a81f --- /dev/null +++ b/app/src/main/res/drawable/ic_outline_edit_24px.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/dialog_edit_flair.xml b/app/src/main/res/layout/dialog_edit_flair.xml new file mode 100644 index 00000000..7893cf66 --- /dev/null +++ b/app/src/main/res/layout/dialog_edit_flair.xml @@ -0,0 +1,24 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_flair.xml b/app/src/main/res/layout/item_flair.xml index c6006358..7cce337f 100644 --- a/app/src/main/res/layout/item_flair.xml +++ b/app/src/main/res/layout/item_flair.xml @@ -1,16 +1,28 @@ + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground"> + android:textColor="@color/primaryTextColor" /> + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c7b64362..86af0755 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -194,6 +194,7 @@ Edit Delete Cancel + OK Edit successful Delete successfully Delete failed @@ -207,4 +208,7 @@ Unmark spoiler failed Update flair successful Update flair failed + + Edit Flair + Only allow less than 64 characters diff --git a/build.gradle b/build.gradle index 367dc7bf..dc4f01a7 100644 --- a/build.gradle +++ b/build.gradle @@ -31,6 +31,6 @@ task clean(type: Delete) { } ext { - roomVersion = '2.2.0-alpha01' - archLifecycleVersion = '2.2.0-alpha02' + roomVersion = '2.2.0-alpha02' + archLifecycleVersion = '2.2.0-alpha03' } \ No newline at end of file