aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDocile-Alligator <25734209+Docile-Alligator@users.noreply.github.com>2024-03-17 23:04:36 +0000
committerDocile-Alligator <25734209+Docile-Alligator@users.noreply.github.com>2024-03-17 23:04:36 +0000
commitb07dc816fd3b21911c12dec66206b0cde240c29e (patch)
tree94cded5adf39d23baba1f8064a3c3d25ad35fe72
parentedc370ff7dfe13915247cc5f60dec61654ad8fed (diff)
downloadinfinity-for-reddit-b07dc816fd3b21911c12dec66206b0cde240c29e.tar
infinity-for-reddit-b07dc816fd3b21911c12dec66206b0cde240c29e.tar.gz
infinity-for-reddit-b07dc816fd3b21911c12dec66206b0cde240c29e.tar.bz2
infinity-for-reddit-b07dc816fd3b21911c12dec66206b0cde240c29e.tar.lz
infinity-for-reddit-b07dc816fd3b21911c12dec66206b0cde240c29e.tar.xz
infinity-for-reddit-b07dc816fd3b21911c12dec66206b0cde240c29e.tar.zst
infinity-for-reddit-b07dc816fd3b21911c12dec66206b0cde240c29e.zip
Click the corresponding layout group to open subreddit listing in PostXXXActivity.
Diffstat (limited to '')
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostGalleryActivity.java264
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostImageActivity.java4
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostLinkActivity.java4
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostPollActivity.java4
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostVideoActivity.java6
-rw-r--r--app/src/main/res/layout/activity_post_gallery.xml1
-rw-r--r--app/src/main/res/layout/activity_post_image.xml1
-rw-r--r--app/src/main/res/layout/activity_post_link.xml1
-rw-r--r--app/src/main/res/layout/activity_post_poll.xml1
-rw-r--r--app/src/main/res/layout/activity_post_video.xml1
10 files changed, 115 insertions, 172 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostGalleryActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostGalleryActivity.java
index c949a737..b27615ef 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostGalleryActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostGalleryActivity.java
@@ -16,14 +16,9 @@ import android.provider.MediaStore;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import androidx.appcompat.widget.Toolbar;
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.core.content.ContextCompat;
import androidx.core.content.FileProvider;
import androidx.recyclerview.widget.GridLayoutManager;
@@ -32,14 +27,9 @@ import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.RequestManager;
import com.bumptech.glide.request.RequestOptions;
-import com.google.android.material.appbar.AppBarLayout;
-import com.google.android.material.button.MaterialButton;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.divider.MaterialDivider;
-import com.google.android.material.materialswitch.MaterialSwitch;
import com.google.android.material.snackbar.Snackbar;
import com.google.gson.Gson;
-import com.libRG.CustomTextView;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
@@ -56,8 +46,6 @@ import java.util.concurrent.Executor;
import javax.inject.Inject;
import javax.inject.Named;
-import butterknife.BindView;
-import butterknife.ButterKnife;
import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
import ml.docilealligator.infinityforreddit.Flair;
import ml.docilealligator.infinityforreddit.Infinity;
@@ -71,13 +59,13 @@ import ml.docilealligator.infinityforreddit.bottomsheetfragments.AccountChooserB
import ml.docilealligator.infinityforreddit.bottomsheetfragments.FlairBottomSheetFragment;
import ml.docilealligator.infinityforreddit.bottomsheetfragments.SelectOrCaptureImageBottomSheetFragment;
import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
+import ml.docilealligator.infinityforreddit.databinding.ActivityPostGalleryBinding;
import ml.docilealligator.infinityforreddit.events.SubmitGalleryPostEvent;
import ml.docilealligator.infinityforreddit.events.SwitchAccountEvent;
import ml.docilealligator.infinityforreddit.services.SubmitPostService;
import ml.docilealligator.infinityforreddit.utils.JSONUtils;
import ml.docilealligator.infinityforreddit.utils.UploadImageUtils;
import ml.docilealligator.infinityforreddit.utils.Utils;
-import pl.droidsonroids.gif.GifImageView;
import retrofit2.Retrofit;
public class PostGalleryActivity extends BaseActivity implements FlairBottomSheetFragment.FlairSelectionCallback,
@@ -101,44 +89,6 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee
private static final int PICK_IMAGE_REQUEST_CODE = 1;
private static final int CAPTURE_IMAGE_REQUEST_CODE = 2;
- @BindView(R.id.coordinator_layout_post_gallery_activity)
- CoordinatorLayout coordinatorLayout;
- @BindView(R.id.appbar_layout_post_gallery_activity)
- AppBarLayout appBarLayout;
- @BindView(R.id.toolbar_post_gallery_activity)
- Toolbar toolbar;
- @BindView(R.id.account_linear_layout_post_gallery_activity)
- LinearLayout accountLinearLayout;
- @BindView(R.id.account_icon_gif_image_view_post_gallery_activity)
- GifImageView accountIconImageView;
- @BindView(R.id.account_name_text_view_post_gallery_activity)
- TextView accountNameTextView;
- @BindView(R.id.subreddit_icon_gif_image_view_post_gallery_activity)
- GifImageView iconGifImageView;
- @BindView(R.id.subreddit_name_text_view_post_gallery_activity)
- TextView subredditNameTextView;
- @BindView(R.id.rules_button_post_gallery_activity)
- MaterialButton rulesButton;
- @BindView(R.id.divider_1_post_gallery_activity)
- MaterialDivider divider1;
- @BindView(R.id.flair_custom_text_view_post_gallery_activity)
- CustomTextView flairTextView;
- @BindView(R.id.spoiler_custom_text_view_post_gallery_activity)
- CustomTextView spoilerTextView;
- @BindView(R.id.nsfw_custom_text_view_post_gallery_activity)
- CustomTextView nsfwTextView;
- @BindView(R.id.receive_post_reply_notifications_linear_layout_post_gallery_activity)
- LinearLayout receivePostReplyNotificationsLinearLayout;
- @BindView(R.id.receive_post_reply_notifications_text_view_post_gallery_activity)
- TextView receivePostReplyNotificationsTextView;
- @BindView(R.id.receive_post_reply_notifications_switch_material_post_gallery_activity)
- MaterialSwitch receivePostReplyNotificationsSwitchMaterial;
- @BindView(R.id.divider_2_post_gallery_activity)
- MaterialDivider divider2;
- @BindView(R.id.post_title_edit_text_post_gallery_activity)
- EditText titleEditText;
- @BindView(R.id.images_recycler_view_post_gallery_activity)
- RecyclerView imagesRecyclerView;
@Inject
@Named("no_oauth")
Retrofit mRetrofit;
@@ -186,6 +136,7 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee
private RedditGallerySubmissionRecyclerViewAdapter adapter;
private Uri imageUri;
private boolean isUploading;
+ private ActivityPostGalleryBinding binding;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -194,24 +145,23 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee
setImmersiveModeNotApplicable();
super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_post_gallery);
-
- ButterKnife.bind(this);
+ binding = ActivityPostGalleryBinding.inflate(getLayoutInflater());
+ setContentView(binding.getRoot());
EventBus.getDefault().register(this);
applyCustomTheme();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && isChangeStatusBarIconColor()) {
- addOnOffsetChangedListener(appBarLayout);
+ addOnOffsetChangedListener(binding.appbarLayoutPostGalleryActivity);
}
- setSupportActionBar(toolbar);
+ setSupportActionBar(binding.toolbarPostGalleryActivity);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
mGlide = Glide.with(this);
- mPostingSnackbar = Snackbar.make(coordinatorLayout, R.string.posting, Snackbar.LENGTH_INDEFINITE);
+ mPostingSnackbar = Snackbar.make(binding.coordinatorLayoutPostGalleryActivity, R.string.posting, Snackbar.LENGTH_INDEFINITE);
resources = getResources();
@@ -220,14 +170,14 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee
SelectOrCaptureImageBottomSheetFragment fragment = new SelectOrCaptureImageBottomSheetFragment();
fragment.show(getSupportFragmentManager(), fragment.getTag());
} else {
- Snackbar.make(coordinatorLayout, R.string.please_wait_image_is_uploading, Snackbar.LENGTH_SHORT).show();
+ Snackbar.make(binding.coordinatorLayoutPostGalleryActivity, R.string.please_wait_image_is_uploading, Snackbar.LENGTH_SHORT).show();
}
});
- imagesRecyclerView.setAdapter(adapter);
+ binding.imagesRecyclerViewPostGalleryActivity.setAdapter(adapter);
Resources resources = getResources();
int nColumns = resources.getBoolean(R.bool.isTablet) || resources.getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE ? 3 : 2;
- ((GridLayoutManager) imagesRecyclerView.getLayoutManager()).setSpanCount(nColumns);
- imagesRecyclerView.addItemDecoration(new RecyclerView.ItemDecoration() {
+ ((GridLayoutManager) binding.imagesRecyclerViewPostGalleryActivity.getLayoutManager()).setSpanCount(nColumns);
+ binding.imagesRecyclerViewPostGalleryActivity.addItemDecoration(new RecyclerView.ItemDecoration() {
@Override
public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
int offset = (int) (Utils.convertDpToPixel(16, PostGalleryActivity.this));
@@ -254,9 +204,9 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee
.apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0)))
.error(mGlide.load(R.drawable.subreddit_default_icon)
.apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0))))
- .into(accountIconImageView);
+ .into(binding.accountIconGifImageViewPostGalleryActivity);
- accountNameTextView.setText(selectedAccount.getAccountName());
+ binding.accountNameTextViewPostGalleryActivity.setText(selectedAccount.getAccountName());
} else {
loadCurrentAccount();
}
@@ -270,9 +220,9 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee
adapter.setRedditGalleryImageInfoList(redditGalleryImageInfoList);
if (subredditName != null) {
- subredditNameTextView.setTextColor(primaryTextColor);
- subredditNameTextView.setText(subredditName);
- flairTextView.setVisibility(View.VISIBLE);
+ binding.subredditNameTextViewPostGalleryActivity.setTextColor(primaryTextColor);
+ binding.subredditNameTextViewPostGalleryActivity.setText(subredditName);
+ binding.flairCustomTextViewPostGalleryActivity.setVisibility(View.VISIBLE);
if (!loadSubredditIconSuccessful) {
loadSubredditIcon();
}
@@ -284,20 +234,20 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee
}
if (flair != null) {
- flairTextView.setText(flair.getText());
- flairTextView.setBackgroundColor(flairBackgroundColor);
- flairTextView.setBorderColor(flairBackgroundColor);
- flairTextView.setTextColor(flairTextColor);
+ binding.flairCustomTextViewPostGalleryActivity.setText(flair.getText());
+ binding.flairCustomTextViewPostGalleryActivity.setBackgroundColor(flairBackgroundColor);
+ binding.flairCustomTextViewPostGalleryActivity.setBorderColor(flairBackgroundColor);
+ binding.flairCustomTextViewPostGalleryActivity.setTextColor(flairTextColor);
}
if (isSpoiler) {
- spoilerTextView.setBackgroundColor(spoilerBackgroundColor);
- spoilerTextView.setBorderColor(spoilerBackgroundColor);
- spoilerTextView.setTextColor(spoilerTextColor);
+ binding.spoilerCustomTextViewPostGalleryActivity.setBackgroundColor(spoilerBackgroundColor);
+ binding.spoilerCustomTextViewPostGalleryActivity.setBorderColor(spoilerBackgroundColor);
+ binding.spoilerCustomTextViewPostGalleryActivity.setTextColor(spoilerTextColor);
}
if (isNSFW) {
- nsfwTextView.setBackgroundColor(nsfwBackgroundColor);
- nsfwTextView.setBorderColor(nsfwBackgroundColor);
- nsfwTextView.setTextColor(nsfwTextColor);
+ binding.nsfwCustomTextViewPostGalleryActivity.setBackgroundColor(nsfwBackgroundColor);
+ binding.nsfwCustomTextViewPostGalleryActivity.setBorderColor(nsfwBackgroundColor);
+ binding.nsfwCustomTextViewPostGalleryActivity.setTextColor(nsfwTextColor);
}
} else {
isPosting = false;
@@ -308,33 +258,31 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee
loadSubredditIconSuccessful = false;
subredditName = getIntent().getStringExtra(EXTRA_SUBREDDIT_NAME);
subredditSelected = true;
- subredditNameTextView.setTextColor(primaryTextColor);
- subredditNameTextView.setText(subredditName);
- flairTextView.setVisibility(View.VISIBLE);
+ binding.subredditNameTextViewPostGalleryActivity.setTextColor(primaryTextColor);
+ binding.subredditNameTextViewPostGalleryActivity.setText(subredditName);
+ binding.flairCustomTextViewPostGalleryActivity.setVisibility(View.VISIBLE);
loadSubredditIcon();
} else {
mGlide.load(R.drawable.subreddit_default_icon)
.apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0)))
- .into(iconGifImageView);
+ .into(binding.subredditIconGifImageViewPostGalleryActivity);
}
}
- accountLinearLayout.setOnClickListener(view -> {
+ binding.accountLinearLayoutPostGalleryActivity.setOnClickListener(view -> {
AccountChooserBottomSheetFragment fragment = new AccountChooserBottomSheetFragment();
fragment.show(getSupportFragmentManager(), fragment.getTag());
});
- iconGifImageView.setOnClickListener(view -> subredditNameTextView.performClick());
-
- subredditNameTextView.setOnClickListener(view -> {
+ binding.subredditRelativeLayoutPostGalleryActivity.setOnClickListener(view -> {
Intent intent = new Intent(this, SubredditSelectionActivity.class);
intent.putExtra(SubredditSelectionActivity.EXTRA_SPECIFIED_ACCOUNT, selectedAccount);
startActivityForResult(intent, SUBREDDIT_SELECTION_REQUEST_CODE);
});
- rulesButton.setOnClickListener(view -> {
+ binding.rulesButtonPostGalleryActivity.setOnClickListener(view -> {
if (subredditName == null) {
- Snackbar.make(coordinatorLayout, R.string.select_a_subreddit, Snackbar.LENGTH_SHORT).show();
+ Snackbar.make(binding.coordinatorLayoutPostGalleryActivity, R.string.select_a_subreddit, Snackbar.LENGTH_SHORT).show();
} else {
Intent intent = new Intent(this, RulesActivity.class);
if (subredditIsUser) {
@@ -346,7 +294,7 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee
}
});
- flairTextView.setOnClickListener(view -> {
+ binding.flairCustomTextViewPostGalleryActivity.setOnClickListener(view -> {
if (flair == null) {
flairSelectionBottomSheetFragment = new FlairBottomSheetFragment();
Bundle bundle = new Bundle();
@@ -354,41 +302,41 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee
flairSelectionBottomSheetFragment.setArguments(bundle);
flairSelectionBottomSheetFragment.show(getSupportFragmentManager(), flairSelectionBottomSheetFragment.getTag());
} else {
- flairTextView.setBackgroundColor(resources.getColor(android.R.color.transparent));
- flairTextView.setTextColor(primaryTextColor);
- flairTextView.setText(getString(R.string.flair));
+ binding.flairCustomTextViewPostGalleryActivity.setBackgroundColor(resources.getColor(android.R.color.transparent));
+ binding.flairCustomTextViewPostGalleryActivity.setTextColor(primaryTextColor);
+ binding.flairCustomTextViewPostGalleryActivity.setText(getString(R.string.flair));
flair = null;
}
});
- spoilerTextView.setOnClickListener(view -> {
+ binding.spoilerCustomTextViewPostGalleryActivity.setOnClickListener(view -> {
if (!isSpoiler) {
- spoilerTextView.setBackgroundColor(spoilerBackgroundColor);
- spoilerTextView.setBorderColor(spoilerBackgroundColor);
- spoilerTextView.setTextColor(spoilerTextColor);
+ binding.spoilerCustomTextViewPostGalleryActivity.setBackgroundColor(spoilerBackgroundColor);
+ binding.spoilerCustomTextViewPostGalleryActivity.setBorderColor(spoilerBackgroundColor);
+ binding.spoilerCustomTextViewPostGalleryActivity.setTextColor(spoilerTextColor);
isSpoiler = true;
} else {
- spoilerTextView.setBackgroundColor(resources.getColor(android.R.color.transparent));
- spoilerTextView.setTextColor(primaryTextColor);
+ binding.spoilerCustomTextViewPostGalleryActivity.setBackgroundColor(resources.getColor(android.R.color.transparent));
+ binding.spoilerCustomTextViewPostGalleryActivity.setTextColor(primaryTextColor);
isSpoiler = false;
}
});
- nsfwTextView.setOnClickListener(view -> {
+ binding.nsfwCustomTextViewPostGalleryActivity.setOnClickListener(view -> {
if (!isNSFW) {
- nsfwTextView.setBackgroundColor(nsfwBackgroundColor);
- nsfwTextView.setBorderColor(nsfwBackgroundColor);
- nsfwTextView.setTextColor(nsfwTextColor);
+ binding.nsfwCustomTextViewPostGalleryActivity.setBackgroundColor(nsfwBackgroundColor);
+ binding.nsfwCustomTextViewPostGalleryActivity.setBorderColor(nsfwBackgroundColor);
+ binding.nsfwCustomTextViewPostGalleryActivity.setTextColor(nsfwTextColor);
isNSFW = true;
} else {
- nsfwTextView.setBackgroundColor(resources.getColor(android.R.color.transparent));
- nsfwTextView.setTextColor(primaryTextColor);
+ binding.nsfwCustomTextViewPostGalleryActivity.setBackgroundColor(resources.getColor(android.R.color.transparent));
+ binding.nsfwCustomTextViewPostGalleryActivity.setTextColor(primaryTextColor);
isNSFW = false;
}
});
- receivePostReplyNotificationsLinearLayout.setOnClickListener(view -> {
- receivePostReplyNotificationsSwitchMaterial.performClick();
+ binding.receivePostReplyNotificationsLinearLayoutPostGalleryActivity.setOnClickListener(view -> {
+ binding.receivePostReplyNotificationsSwitchMaterialPostGalleryActivity.performClick();
});
}
@@ -403,9 +351,9 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee
.apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0)))
.error(mGlide.load(R.drawable.subreddit_default_icon)
.apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0))))
- .into(accountIconImageView);
+ .into(binding.accountIconGifImageViewPostGalleryActivity);
- accountNameTextView.setText(account.getAccountName());
+ binding.accountNameTextViewPostGalleryActivity.setText(account.getAccountName());
}
});
});
@@ -428,37 +376,37 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee
@Override
protected void applyCustomTheme() {
- coordinatorLayout.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor());
- applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(appBarLayout, null, toolbar);
+ binding.coordinatorLayoutPostGalleryActivity.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor());
+ applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(binding.appbarLayoutPostGalleryActivity, null, binding.toolbarPostGalleryActivity);
primaryTextColor = mCustomThemeWrapper.getPrimaryTextColor();
- accountNameTextView.setTextColor(primaryTextColor);
+ binding.accountNameTextViewPostGalleryActivity.setTextColor(primaryTextColor);
int secondaryTextColor = mCustomThemeWrapper.getSecondaryTextColor();
- subredditNameTextView.setTextColor(secondaryTextColor);
- rulesButton.setTextColor(mCustomThemeWrapper.getButtonTextColor());
- rulesButton.setBackgroundColor(mCustomThemeWrapper.getColorPrimaryLightTheme());
- receivePostReplyNotificationsTextView.setTextColor(primaryTextColor);
+ binding.subredditNameTextViewPostGalleryActivity.setTextColor(secondaryTextColor);
+ binding.rulesButtonPostGalleryActivity.setTextColor(mCustomThemeWrapper.getButtonTextColor());
+ binding.rulesButtonPostGalleryActivity.setBackgroundColor(mCustomThemeWrapper.getColorPrimaryLightTheme());
+ binding.receivePostReplyNotificationsTextViewPostGalleryActivity.setTextColor(primaryTextColor);
int dividerColor = mCustomThemeWrapper.getDividerColor();
- divider1.setDividerColor(dividerColor);
- divider2.setDividerColor(dividerColor);
+ binding.divider1PostGalleryActivity.setDividerColor(dividerColor);
+ binding.divider2PostGalleryActivity.setDividerColor(dividerColor);
flairBackgroundColor = mCustomThemeWrapper.getFlairBackgroundColor();
flairTextColor = mCustomThemeWrapper.getFlairTextColor();
spoilerBackgroundColor = mCustomThemeWrapper.getSpoilerBackgroundColor();
spoilerTextColor = mCustomThemeWrapper.getSpoilerTextColor();
nsfwBackgroundColor = mCustomThemeWrapper.getNsfwBackgroundColor();
nsfwTextColor = mCustomThemeWrapper.getNsfwTextColor();
- flairTextView.setTextColor(primaryTextColor);
- spoilerTextView.setTextColor(primaryTextColor);
- nsfwTextView.setTextColor(primaryTextColor);
- titleEditText.setTextColor(primaryTextColor);
- titleEditText.setHintTextColor(secondaryTextColor);
+ binding.flairCustomTextViewPostGalleryActivity.setTextColor(primaryTextColor);
+ binding.spoilerCustomTextViewPostGalleryActivity.setTextColor(primaryTextColor);
+ binding.nsfwCustomTextViewPostGalleryActivity.setTextColor(primaryTextColor);
+ binding.postTitleEditTextPostGalleryActivity.setTextColor(primaryTextColor);
+ binding.postTitleEditTextPostGalleryActivity.setHintTextColor(secondaryTextColor);
if (typeface != null) {
- subredditNameTextView.setTypeface(typeface);
- rulesButton.setTypeface(typeface);
- receivePostReplyNotificationsTextView.setTypeface(typeface);
- flairTextView.setTypeface(typeface);
- spoilerTextView.setTypeface(typeface);
- nsfwTextView.setTypeface(typeface);
- titleEditText.setTypeface(typeface);
+ binding.subredditNameTextViewPostGalleryActivity.setTypeface(typeface);
+ binding.rulesButtonPostGalleryActivity.setTypeface(typeface);
+ binding.receivePostReplyNotificationsTextViewPostGalleryActivity.setTypeface(typeface);
+ binding.flairCustomTextViewPostGalleryActivity.setTypeface(typeface);
+ binding.spoilerCustomTextViewPostGalleryActivity.setTypeface(typeface);
+ binding.nsfwCustomTextViewPostGalleryActivity.setTypeface(typeface);
+ binding.postTitleEditTextPostGalleryActivity.setTypeface(typeface);
}
}
@@ -477,9 +425,9 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee
pictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, imageUri);
startActivityForResult(pictureIntent, CAPTURE_IMAGE_REQUEST_CODE);
} catch (IOException ex) {
- Snackbar.make(coordinatorLayout, R.string.error_creating_temp_file, Snackbar.LENGTH_SHORT).show();
+ Snackbar.make(binding.coordinatorLayoutPostGalleryActivity, R.string.error_creating_temp_file, Snackbar.LENGTH_SHORT).show();
} catch (ActivityNotFoundException e) {
- Snackbar.make(coordinatorLayout, R.string.no_camera_available, Snackbar.LENGTH_SHORT).show();
+ Snackbar.make(binding.coordinatorLayoutPostGalleryActivity, R.string.no_camera_available, Snackbar.LENGTH_SHORT).show();
}
}
@@ -499,14 +447,14 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee
e.printStackTrace();
handler.post(() -> {
adapter.removeFailedToUploadImage();
- Snackbar.make(coordinatorLayout, R.string.get_image_bitmap_failed, Snackbar.LENGTH_LONG).show();
+ Snackbar.make(binding.coordinatorLayoutPostGalleryActivity, R.string.get_image_bitmap_failed, Snackbar.LENGTH_LONG).show();
isUploading = false;
});
} catch (XmlPullParserException | JSONException | IOException e) {
e.printStackTrace();
handler.post(() -> {
adapter.removeFailedToUploadImage();
- Snackbar.make(coordinatorLayout, R.string.upload_image_failed, Snackbar.LENGTH_LONG).show();
+ Snackbar.make(binding.coordinatorLayoutPostGalleryActivity, R.string.upload_image_failed, Snackbar.LENGTH_LONG).show();
isUploading = false;
});
}
@@ -519,11 +467,11 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee
.apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0)))
.error(mGlide.load(R.drawable.subreddit_default_icon)
.apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0))))
- .into(iconGifImageView);
+ .into(binding.subredditIconGifImageViewPostGalleryActivity);
} else {
mGlide.load(R.drawable.subreddit_default_icon)
.apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0)))
- .into(iconGifImageView);
+ .into(binding.subredditIconGifImageViewPostGalleryActivity);
}
}
@@ -567,7 +515,7 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee
return true;
} else {
redditGalleryImageInfoList = adapter.getRedditGalleryImageInfoList();
- if (!titleEditText.getText().toString().equals("") || redditGalleryImageInfoList != null) {
+ if (!binding.postTitleEditTextPostGalleryActivity.getText().toString().equals("") || redditGalleryImageInfoList != null) {
promptAlertDialog(R.string.discard, R.string.discard_detail);
return true;
}
@@ -576,23 +524,23 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee
return true;
} else if (itemId == R.id.action_send_post_gallery_activity) {
if (!subredditSelected) {
- Snackbar.make(coordinatorLayout, R.string.select_a_subreddit, Snackbar.LENGTH_SHORT).show();
+ Snackbar.make(binding.coordinatorLayoutPostGalleryActivity, R.string.select_a_subreddit, Snackbar.LENGTH_SHORT).show();
return true;
}
- if (titleEditText.getText() == null || titleEditText.getText().toString().equals("")) {
- Snackbar.make(coordinatorLayout, R.string.title_required, Snackbar.LENGTH_SHORT).show();
+ if (binding.postTitleEditTextPostGalleryActivity.getText() == null || binding.postTitleEditTextPostGalleryActivity.getText().toString().equals("")) {
+ Snackbar.make(binding.coordinatorLayoutPostGalleryActivity, R.string.title_required, Snackbar.LENGTH_SHORT).show();
return true;
}
redditGalleryImageInfoList = adapter.getRedditGalleryImageInfoList();
if (redditGalleryImageInfoList == null || redditGalleryImageInfoList.isEmpty()) {
- Snackbar.make(coordinatorLayout, R.string.select_an_image, Snackbar.LENGTH_SHORT).show();
+ Snackbar.make(binding.coordinatorLayoutPostGalleryActivity, R.string.select_an_image, Snackbar.LENGTH_SHORT).show();
return true;
}
if (redditGalleryImageInfoList.get(redditGalleryImageInfoList.size() - 1).payload == null) {
- Snackbar.make(coordinatorLayout, R.string.please_wait_image_is_uploading, Snackbar.LENGTH_LONG).show();
+ Snackbar.make(binding.coordinatorLayoutPostGalleryActivity, R.string.please_wait_image_is_uploading, Snackbar.LENGTH_LONG).show();
return true;
}
@@ -605,9 +553,9 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee
String subredditName;
if (subredditIsUser) {
- subredditName = "u_" + subredditNameTextView.getText().toString();
+ subredditName = "u_" + binding.subredditNameTextViewPostGalleryActivity.getText().toString();
} else {
- subredditName = subredditNameTextView.getText().toString();
+ subredditName = binding.subredditNameTextViewPostGalleryActivity.getText().toString();
}
Intent intent = new Intent(this, SubmitPostService.class);
@@ -619,7 +567,7 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee
items.add(i.payload);
}
RedditGalleryPayload payload = new RedditGalleryPayload(subredditName, subredditIsUser ? "profile" : "subreddit",
- titleEditText.getText().toString(), isSpoiler, isNSFW, receivePostReplyNotificationsSwitchMaterial.isChecked(),
+ binding.postTitleEditTextPostGalleryActivity.getText().toString(), isSpoiler, isNSFW, binding.receivePostReplyNotificationsSwitchMaterialPostGalleryActivity.isChecked(),
flair, items);
intent.putExtra(SubmitPostService.EXTRA_REDDIT_GALLERY_PAYLOAD, new Gson().toJson(payload));
@@ -637,7 +585,7 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee
promptAlertDialog(R.string.exit_when_submit, R.string.exit_when_submit_post_detail);
} else {
redditGalleryImageInfoList = adapter.getRedditGalleryImageInfoList();
- if (!titleEditText.getText().toString().equals("") || redditGalleryImageInfoList != null) {
+ if (!binding.postTitleEditTextPostGalleryActivity.getText().toString().equals("") || redditGalleryImageInfoList != null) {
promptAlertDialog(R.string.discard, R.string.discard_detail);
} else {
finish();
@@ -672,20 +620,20 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee
subredditSelected = true;
subredditIsUser = data.getExtras().getBoolean(SubredditSelectionActivity.EXTRA_RETURN_SUBREDDIT_IS_USER);
- subredditNameTextView.setTextColor(primaryTextColor);
- subredditNameTextView.setText(subredditName);
+ binding.subredditNameTextViewPostGalleryActivity.setTextColor(primaryTextColor);
+ binding.subredditNameTextViewPostGalleryActivity.setText(subredditName);
displaySubredditIcon();
- flairTextView.setVisibility(View.VISIBLE);
- flairTextView.setBackgroundColor(resources.getColor(android.R.color.transparent));
- flairTextView.setTextColor(primaryTextColor);
- flairTextView.setText(getString(R.string.flair));
+ binding.flairCustomTextViewPostGalleryActivity.setVisibility(View.VISIBLE);
+ binding.flairCustomTextViewPostGalleryActivity.setBackgroundColor(resources.getColor(android.R.color.transparent));
+ binding.flairCustomTextViewPostGalleryActivity.setTextColor(primaryTextColor);
+ binding.flairCustomTextViewPostGalleryActivity.setText(getString(R.string.flair));
flair = null;
}
} else if (requestCode == PICK_IMAGE_REQUEST_CODE) {
if (resultCode == RESULT_OK) {
if (data == null) {
- Snackbar.make(coordinatorLayout, R.string.error_getting_image, Snackbar.LENGTH_SHORT).show();
+ Snackbar.make(binding.coordinatorLayoutPostGalleryActivity, R.string.error_getting_image, Snackbar.LENGTH_SHORT).show();
return;
}
@@ -710,10 +658,10 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee
@Override
public void flairSelected(Flair flair) {
this.flair = flair;
- flairTextView.setText(flair.getText());
- flairTextView.setBackgroundColor(flairBackgroundColor);
- flairTextView.setBorderColor(flairBackgroundColor);
- flairTextView.setTextColor(flairTextColor);
+ binding.flairCustomTextViewPostGalleryActivity.setText(flair.getText());
+ binding.flairCustomTextViewPostGalleryActivity.setBackgroundColor(flairBackgroundColor);
+ binding.flairCustomTextViewPostGalleryActivity.setBorderColor(flairBackgroundColor);
+ binding.flairCustomTextViewPostGalleryActivity.setTextColor(flairTextColor);
}
@Override
@@ -725,9 +673,9 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee
.apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0)))
.error(mGlide.load(R.drawable.subreddit_default_icon)
.apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0))))
- .into(accountIconImageView);
+ .into(binding.accountIconGifImageViewPostGalleryActivity);
- accountNameTextView.setText(selectedAccount.getAccountName());
+ binding.accountNameTextViewPostGalleryActivity.setText(selectedAccount.getAccountName());
}
}
@@ -755,9 +703,9 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee
mMemu.findItem(R.id.action_send_post_gallery_activity).setEnabled(true);
mMemu.findItem(R.id.action_send_post_gallery_activity).getIcon().setAlpha(255);
if (submitGalleryPostEvent.errorMessage == null || submitGalleryPostEvent.errorMessage.equals("")) {
- Snackbar.make(coordinatorLayout, R.string.post_failed, Snackbar.LENGTH_SHORT).show();
+ Snackbar.make(binding.coordinatorLayoutPostGalleryActivity, R.string.post_failed, Snackbar.LENGTH_SHORT).show();
} else {
- Snackbar.make(coordinatorLayout, submitGalleryPostEvent.errorMessage.substring(0, 1).toUpperCase()
+ Snackbar.make(binding.coordinatorLayoutPostGalleryActivity, submitGalleryPostEvent.errorMessage.substring(0, 1).toUpperCase()
+ submitGalleryPostEvent.errorMessage.substring(1), Snackbar.LENGTH_SHORT).show();
}
}
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostImageActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostImageActivity.java
index 68051528..05169fe4 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostImageActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostImageActivity.java
@@ -239,9 +239,7 @@ public class PostImageActivity extends BaseActivity implements FlairBottomSheetF
fragment.show(getSupportFragmentManager(), fragment.getTag());
});
- binding.subredditIconGifImageViewPostImageActivity.setOnClickListener(view -> binding.subredditNameTextViewPostImageActivity.performClick());
-
- binding.subredditNameTextViewPostImageActivity.setOnClickListener(view -> {
+ binding.subredditRelativeLayoutPostImageActivity.setOnClickListener(view -> {
Intent intent = new Intent(this, SubredditSelectionActivity.class);
intent.putExtra(SubredditSelectionActivity.EXTRA_SPECIFIED_ACCOUNT, selectedAccount);
startActivityForResult(intent, SUBREDDIT_SELECTION_REQUEST_CODE);
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostLinkActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostLinkActivity.java
index 5caa5c27..123b27e9 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostLinkActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostLinkActivity.java
@@ -232,9 +232,7 @@ public class PostLinkActivity extends BaseActivity implements FlairBottomSheetFr
fragment.show(getSupportFragmentManager(), fragment.getTag());
});
- binding.subredditIconGifImageViewPostLinkActivity.setOnClickListener(view -> binding.subredditNameTextViewPostLinkActivity.performClick());
-
- binding.subredditNameTextViewPostLinkActivity.setOnClickListener(view -> {
+ binding.subredditRelativeLayoutPostLinkActivity.setOnClickListener(view -> {
Intent intent = new Intent(this, SubredditSelectionActivity.class);
intent.putExtra(SubredditSelectionActivity.EXTRA_SPECIFIED_ACCOUNT, selectedAccount);
startActivityForResult(intent, SUBREDDIT_SELECTION_REQUEST_CODE);
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostPollActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostPollActivity.java
index c3f6e508..31684679 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostPollActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostPollActivity.java
@@ -249,9 +249,7 @@ public class PostPollActivity extends BaseActivity implements FlairBottomSheetFr
fragment.show(getSupportFragmentManager(), fragment.getTag());
});
- binding.subredditIconGifImageViewPostPollActivity.setOnClickListener(view -> binding.subredditNameTextViewPostPollActivity.performClick());
-
- binding.subredditNameTextViewPostPollActivity.setOnClickListener(view -> {
+ binding.subredditRelativeLayoutPostPollActivity.setOnClickListener(view -> {
Intent intent = new Intent(this, SubredditSelectionActivity.class);
intent.putExtra(SubredditSelectionActivity.EXTRA_SPECIFIED_ACCOUNT, selectedAccount);
startActivityForResult(intent, SUBREDDIT_SELECTION_REQUEST_CODE);
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostVideoActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostVideoActivity.java
index 925bb565..ca351860 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostVideoActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostVideoActivity.java
@@ -259,11 +259,7 @@ public class PostVideoActivity extends BaseActivity implements FlairBottomSheetF
fragment.show(getSupportFragmentManager(), fragment.getTag());
});
- binding.subredditIconGifImageViewPostVideoActivity.setOnClickListener(view -> {
- binding.subredditNameTextViewPostVideoActivity.performClick();
- });
-
- binding.subredditNameTextViewPostVideoActivity.setOnClickListener(view -> {
+ binding.subredditRelativeLayoutPostVideoActivity.setOnClickListener(view -> {
Intent intent = new Intent(this, SubredditSelectionActivity.class);
intent.putExtra(SubredditSelectionActivity.EXTRA_SPECIFIED_ACCOUNT, selectedAccount);
startActivityForResult(intent, SUBREDDIT_SELECTION_REQUEST_CODE);
diff --git a/app/src/main/res/layout/activity_post_gallery.xml b/app/src/main/res/layout/activity_post_gallery.xml
index 2b17d894..acd64fe3 100644
--- a/app/src/main/res/layout/activity_post_gallery.xml
+++ b/app/src/main/res/layout/activity_post_gallery.xml
@@ -61,6 +61,7 @@
</LinearLayout>
<RelativeLayout
+ android:id="@+id/subreddit_relative_layout_post_gallery_activity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
diff --git a/app/src/main/res/layout/activity_post_image.xml b/app/src/main/res/layout/activity_post_image.xml
index 1fc09b8b..b249f9bc 100644
--- a/app/src/main/res/layout/activity_post_image.xml
+++ b/app/src/main/res/layout/activity_post_image.xml
@@ -67,6 +67,7 @@
</LinearLayout>
<RelativeLayout
+ android:id="@+id/subreddit_relative_layout_post_image_activity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
diff --git a/app/src/main/res/layout/activity_post_link.xml b/app/src/main/res/layout/activity_post_link.xml
index 9d475602..765bc8a4 100644
--- a/app/src/main/res/layout/activity_post_link.xml
+++ b/app/src/main/res/layout/activity_post_link.xml
@@ -67,6 +67,7 @@
</LinearLayout>
<RelativeLayout
+ android:id="@+id/subreddit_relative_layout_post_link_activity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
diff --git a/app/src/main/res/layout/activity_post_poll.xml b/app/src/main/res/layout/activity_post_poll.xml
index a65a2edb..e2d4101c 100644
--- a/app/src/main/res/layout/activity_post_poll.xml
+++ b/app/src/main/res/layout/activity_post_poll.xml
@@ -67,6 +67,7 @@
</LinearLayout>
<RelativeLayout
+ android:id="@+id/subreddit_relative_layout_post_poll_activity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
diff --git a/app/src/main/res/layout/activity_post_video.xml b/app/src/main/res/layout/activity_post_video.xml
index 14812cae..bc1d9b98 100644
--- a/app/src/main/res/layout/activity_post_video.xml
+++ b/app/src/main/res/layout/activity_post_video.xml
@@ -67,6 +67,7 @@
</LinearLayout>
<RelativeLayout
+ android:id="@+id/subreddit_relative_layout_post_video_activity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"