Some UI tweaks.

6 files changed, 56 insertions, 63 deletions

diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/EditProfileActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/EditProfileActivity.java
index f267e9f4..27086981 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/EditProfileActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/EditProfileActivity.java
@@ -2,6 +2,7 @@ package ml.docilealligator.infinityforreddit.activities;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.Gravity;
 import android.view.Menu;
@@ -17,7 +18,6 @@ import android.widget.Toast;
 
 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.lifecycle.ViewModelProvider;
@@ -26,6 +26,8 @@ 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.appbar.CollapsingToolbarLayout;
+import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.r0adkll.slidr.Slidr;
 import com.r0adkll.slidr.model.SlidrInterface;
@@ -50,6 +52,7 @@ import ml.docilealligator.infinityforreddit.services.EditProfileService;
 import ml.docilealligator.infinityforreddit.user.UserViewModel;
 import ml.docilealligator.infinityforreddit.utils.EditProfileUtils;
 import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
+import pl.droidsonroids.gif.GifImageView;
 import retrofit2.Retrofit;
 
 public class EditProfileActivity extends BaseActivity {
@@ -61,14 +64,16 @@ public class EditProfileActivity extends BaseActivity {
     CoordinatorLayout root;
     @BindView(R.id.content_view_edit_profile_activity)
     LinearLayout content;
+    @BindView(R.id.collapsing_toolbar_layout_edit_profile_activity)
+    CollapsingToolbarLayout collapsingToolbarLayout;
     @BindView(R.id.appbar_layout_view_edit_profile_activity)
     AppBarLayout appBarLayout;
     @BindView(R.id.toolbar_view_edit_profile_activity)
-    Toolbar toolbar;
+    MaterialToolbar toolbar;
     @BindView(R.id.image_view_banner_edit_profile_activity)
-    ImageView bannerImageView;
+    GifImageView bannerImageView;
     @BindView(R.id.image_view_avatar_edit_profile_activity)
-    ImageView avatarImageView;
+    GifImageView avatarImageView;
     @BindView(R.id.image_view_change_banner_edit_profile_activity)
     ImageView changeBanner;
     @BindView(R.id.image_view_change_avatar_edit_profile_activity)
@@ -92,20 +97,28 @@ public class EditProfileActivity extends BaseActivity {
     @Inject
     CustomThemeWrapper mCustomThemeWrapper;
 
-    //
     private String mAccountName;
     private String mAccessToken;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         ((Infinity) getApplication()).getAppComponent().inject(this);
-        setTransparentStatusBarAfterToolbarCollapsed();
+
+        setImmersiveModeNotApplicable();
+
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_edit_profile);
+
         ButterKnife.bind(this);
+
         EventBus.getDefault().register(this);
+
         applyCustomTheme();
-        adjustToolbar(toolbar);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && isChangeStatusBarIconColor()) {
+            addOnOffsetChangedListener(appBarLayout);
+        }
+
         setSupportActionBar(toolbar);
 
         if (mSharedPreferences.getBoolean(SharedPreferencesUtils.SWIPE_RIGHT_TO_GO_BACK, true)) {
@@ -328,8 +341,9 @@ public class EditProfileActivity extends BaseActivity {
 
     @Override
     protected void applyCustomTheme() {
-        applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(appBarLayout, null, toolbar);
+        applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(appBarLayout, collapsingToolbarLayout, toolbar);
         root.setBackgroundColor(mCustomThemeWrapper.getBackgroundColor());
+
         changeColorTextView(content, mCustomThemeWrapper.getPrimaryTextColor());
     }
 
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 3dcb726e..a3c12c29 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostGalleryActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostGalleryActivity.java
@@ -35,6 +35,7 @@ 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.snackbar.Snackbar;
 import com.google.android.material.switchmaterial.SwitchMaterial;
 import com.google.gson.Gson;
@@ -110,27 +111,23 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee
     @BindView(R.id.rules_button_post_gallery_activity)
     MaterialButton rulesButton;
     @BindView(R.id.divider_1_post_gallery_activity)
-    View divider1;
+    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.divider_2_post_gallery_activity)
-    View divider2;
     @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)
     SwitchMaterial receivePostReplyNotificationsSwitchMaterial;
-    @BindView(R.id.divider_3_post_gallery_activity)
-    View divider3;
+    @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.divider_4_post_gallery_activity)
-    View divider4;
     @BindView(R.id.images_recycler_view_post_gallery_activity)
     RecyclerView imagesRecyclerView;
     @Inject
@@ -415,10 +412,8 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee
         primaryTextColor = mCustomThemeWrapper.getPrimaryTextColor();
         receivePostReplyNotificationsTextView.setTextColor(primaryTextColor);
         int dividerColor = mCustomThemeWrapper.getDividerColor();
-        divider1.setBackgroundColor(dividerColor);
-        divider2.setBackgroundColor(dividerColor);
-        divider3.setBackgroundColor(dividerColor);
-        divider4.setBackgroundColor(dividerColor);
+        divider1.setDividerColor(dividerColor);
+        divider2.setDividerColor(dividerColor);
         flairBackgroundColor = mCustomThemeWrapper.getFlairBackgroundColor();
         flairTextColor = mCustomThemeWrapper.getFlairTextColor();
         spoilerBackgroundColor = mCustomThemeWrapper.getSpoilerBackgroundColor();
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 cf6c7664..759f4911 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostImageActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostImageActivity.java
@@ -32,6 +32,7 @@ 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.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
 import com.google.android.material.switchmaterial.SwitchMaterial;
@@ -97,27 +98,23 @@ public class PostImageActivity extends BaseActivity implements FlairBottomSheetF
     @BindView(R.id.rules_button_post_image_activity)
     MaterialButton rulesButton;
     @BindView(R.id.divider_1_post_image_activity)
-    View divider1;
+    MaterialDivider divider1;
     @BindView(R.id.flair_custom_text_view_post_image_activity)
     CustomTextView flairTextView;
     @BindView(R.id.spoiler_custom_text_view_post_image_activity)
     CustomTextView spoilerTextView;
     @BindView(R.id.nsfw_custom_text_view_post_image_activity)
     CustomTextView nsfwTextView;
-    @BindView(R.id.divider_2_post_image_activity)
-    View divider2;
     @BindView(R.id.receive_post_reply_notifications_linear_layout_post_image_activity)
     LinearLayout receivePostReplyNotificationsLinearLayout;
     @BindView(R.id.receive_post_reply_notifications_text_view_post_image_activity)
     TextView receivePostReplyNotificationsTextView;
     @BindView(R.id.receive_post_reply_notifications_switch_material_post_image_activity)
     SwitchMaterial receivePostReplyNotificationsSwitchMaterial;
-    @BindView(R.id.divider_3_post_image_activity)
-    View divider3;
+    @BindView(R.id.divider_2_post_image_activity)
+    MaterialDivider divider2;
     @BindView(R.id.post_title_edit_text_post_image_activity)
     EditText titleEditText;
-    @BindView(R.id.divider_4_post_image_activity)
-    View divider4;
     @BindView(R.id.select_image_constraint_layout_post_image_activity)
     ConstraintLayout constraintLayout;
     @BindView(R.id.capture_fab_post_image_activity)
@@ -396,10 +393,8 @@ public class PostImageActivity extends BaseActivity implements FlairBottomSheetF
         primaryTextColor = mCustomThemeWrapper.getPrimaryTextColor();
         receivePostReplyNotificationsTextView.setTextColor(primaryTextColor);
         int dividerColor = mCustomThemeWrapper.getDividerColor();
-        divider1.setBackgroundColor(dividerColor);
-        divider2.setBackgroundColor(dividerColor);
-        divider3.setBackgroundColor(dividerColor);
-        divider4.setBackgroundColor(dividerColor);
+        divider1.setDividerColor(dividerColor);
+        divider2.setDividerColor(dividerColor);
         flairBackgroundColor = mCustomThemeWrapper.getFlairBackgroundColor();
         flairTextColor = mCustomThemeWrapper.getFlairTextColor();
         spoilerBackgroundColor = mCustomThemeWrapper.getSpoilerBackgroundColor();
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 eecefa75..a24ece41 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostLinkActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostLinkActivity.java
@@ -26,6 +26,7 @@ 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.snackbar.Snackbar;
 import com.google.android.material.switchmaterial.SwitchMaterial;
 import com.libRG.CustomTextView;
@@ -91,11 +92,9 @@ public class PostLinkActivity extends BaseActivity implements FlairBottomSheetFr
     @BindView(R.id.rules_button_post_link_activity)
     MaterialButton rulesButton;
     @BindView(R.id.divider_1_post_link_activity)
-    View divider1;
+    MaterialDivider divider1;
     @BindView(R.id.divider_2_post_link_activity)
-    View divider2;
-    @BindView(R.id.divider_4_post_link_activity)
-    View divider4;
+    MaterialDivider divider2;
     @BindView(R.id.flair_custom_text_view_post_link_activity)
     CustomTextView flairTextView;
     @BindView(R.id.spoiler_custom_text_view_post_link_activity)
@@ -108,8 +107,6 @@ public class PostLinkActivity extends BaseActivity implements FlairBottomSheetFr
     TextView receivePostReplyNotificationsTextView;
     @BindView(R.id.receive_post_reply_notifications_switch_material_post_link_activity)
     SwitchMaterial receivePostReplyNotificationsSwitchMaterial;
-    @BindView(R.id.divider_3_post_link_activity)
-    View divider3;
     @BindView(R.id.post_title_edit_text_post_link_activity)
     EditText titleEditText;
     @BindView(R.id.suggest_title_button_post_link_activity)
@@ -370,10 +367,8 @@ public class PostLinkActivity extends BaseActivity implements FlairBottomSheetFr
         primaryTextColor = mCustomThemeWrapper.getPrimaryTextColor();
         receivePostReplyNotificationsTextView.setTextColor(primaryTextColor);
         int dividerColor = mCustomThemeWrapper.getDividerColor();
-        divider1.setBackgroundColor(dividerColor);
-        divider2.setBackgroundColor(dividerColor);
-        divider3.setBackgroundColor(dividerColor);
-        divider4.setBackgroundColor(dividerColor);
+        divider1.setDividerColor(dividerColor);
+        divider2.setDividerColor(dividerColor);
         flairBackgroundColor = mCustomThemeWrapper.getFlairBackgroundColor();
         flairTextColor = mCustomThemeWrapper.getFlairTextColor();
         spoilerBackgroundColor = mCustomThemeWrapper.getSpoilerBackgroundColor();
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostTextActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostTextActivity.java
index 5336051c..b54e56af 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostTextActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostTextActivity.java
@@ -33,6 +33,7 @@ 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.snackbar.Snackbar;
 import com.google.android.material.switchmaterial.SwitchMaterial;
 import com.libRG.CustomTextView;
@@ -107,27 +108,23 @@ public class PostTextActivity extends BaseActivity implements FlairBottomSheetFr
     @BindView(R.id.rules_button_post_text_activity)
     MaterialButton rulesButton;
     @BindView(R.id.divider_1_post_text_activity)
-    View divider1;
+    MaterialDivider divider1;
     @BindView(R.id.flair_custom_text_view_post_text_activity)
     CustomTextView flairTextView;
     @BindView(R.id.spoiler_custom_text_view_post_text_activity)
     CustomTextView spoilerTextView;
     @BindView(R.id.nsfw_custom_text_view_post_text_activity)
     CustomTextView nsfwTextView;
-    @BindView(R.id.divider_2_post_text_activity)
-    View divider2;
     @BindView(R.id.receive_post_reply_notifications_linear_layout_post_text_activity)
     LinearLayout receivePostReplyNotificationsLinearLayout;
     @BindView(R.id.receive_post_reply_notifications_text_view_post_text_activity)
     TextView receivePostReplyNotificationsTextView;
     @BindView(R.id.receive_post_reply_notifications_switch_material_post_text_activity)
     SwitchMaterial receivePostReplyNotificationsSwitchMaterial;
-    @BindView(R.id.divider_3_post_text_activity)
-    View divider3;
+    @BindView(R.id.divider_2_post_text_activity)
+    MaterialDivider divider2;
     @BindView(R.id.post_title_edit_text_post_text_activity)
     EditText titleEditText;
-    @BindView(R.id.divider_4_post_text_activity)
-    View divider4;
     @BindView(R.id.post_text_content_edit_text_post_text_activity)
     EditText contentEditText;
     @BindView(R.id.markdown_bottom_bar_recycler_view_post_text_activity)
@@ -394,10 +391,8 @@ public class PostTextActivity extends BaseActivity implements FlairBottomSheetFr
         primaryTextColor = mCustomThemeWrapper.getPrimaryTextColor();
         receivePostReplyNotificationsTextView.setTextColor(primaryTextColor);
         int dividerColor = mCustomThemeWrapper.getDividerColor();
-        divider1.setBackgroundColor(dividerColor);
-        divider2.setBackgroundColor(dividerColor);
-        divider3.setBackgroundColor(dividerColor);
-        divider4.setBackgroundColor(dividerColor);
+        divider1.setDividerColor(dividerColor);
+        divider2.setDividerColor(dividerColor);
         flairBackgroundColor = mCustomThemeWrapper.getFlairBackgroundColor();
         flairTextColor = mCustomThemeWrapper.getFlairTextColor();
         spoilerBackgroundColor = mCustomThemeWrapper.getSpoilerBackgroundColor();
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 f80b5e94..d1d09ddc 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostVideoActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostVideoActivity.java
@@ -1,5 +1,6 @@
 package ml.docilealligator.infinityforreddit.activities;
 
+import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
@@ -14,6 +15,7 @@ import android.view.View;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -36,6 +38,7 @@ import com.google.android.exoplayer2.util.Util;
 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.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
 import com.google.android.material.switchmaterial.SwitchMaterial;
@@ -98,27 +101,23 @@ public class PostVideoActivity extends BaseActivity implements FlairBottomSheetF
     @BindView(R.id.rules_button_post_video_activity)
     MaterialButton rulesButton;
     @BindView(R.id.divider_1_post_video_activity)
-    View divider1;
+    MaterialDivider divider1;
     @BindView(R.id.flair_custom_text_view_post_video_activity)
     CustomTextView flairTextView;
     @BindView(R.id.spoiler_custom_text_view_post_video_activity)
     CustomTextView spoilerTextView;
     @BindView(R.id.nsfw_custom_text_view_post_video_activity)
     CustomTextView nsfwTextView;
-    @BindView(R.id.divider_2_post_video_activity)
-    View divider2;
     @BindView(R.id.receive_post_reply_notifications_linear_layout_post_video_activity)
     LinearLayout receivePostReplyNotificationsLinearLayout;
     @BindView(R.id.receive_post_reply_notifications_text_view_post_video_activity)
     TextView receivePostReplyNotificationsTextView;
     @BindView(R.id.receive_post_reply_notifications_switch_material_post_video_activity)
     SwitchMaterial receivePostReplyNotificationsSwitchMaterial;
-    @BindView(R.id.divider_3_post_video_activity)
-    View divider3;
+    @BindView(R.id.divider_2_post_video_activity)
+    MaterialDivider divider2;
     @BindView(R.id.post_title_edit_text_post_video_activity)
     EditText titleEditText;
-    @BindView(R.id.divider_4_post_video_activity)
-    View divider4;
     @BindView(R.id.select_video_constraint_layout_post_video_activity)
     ConstraintLayout constraintLayout;
     @BindView(R.id.capture_fab_post_video_activity)
@@ -364,8 +363,10 @@ public class PostVideoActivity extends BaseActivity implements FlairBottomSheetF
 
         captureFab.setOnClickListener(view -> {
             Intent takeVideoIntent = new Intent(MediaStore.ACTION_VIDEO_CAPTURE);
-            if (takeVideoIntent.resolveActivity(getPackageManager()) != null) {
+            try {
                 startActivityForResult(takeVideoIntent, CAPTURE_VIDEO_REQUEST_CODE);
+            } catch (ActivityNotFoundException e) {
+                Toast.makeText(this, R.string.no_camera_available, Toast.LENGTH_SHORT).show();
             }
         });
 
@@ -407,10 +408,8 @@ public class PostVideoActivity extends BaseActivity implements FlairBottomSheetF
         primaryTextColor = mCustomThemeWrapper.getPrimaryTextColor();
         receivePostReplyNotificationsTextView.setTextColor(primaryTextColor);
         int dividerColor = mCustomThemeWrapper.getDividerColor();
-        divider1.setBackgroundColor(dividerColor);
-        divider2.setBackgroundColor(dividerColor);
-        divider3.setBackgroundColor(dividerColor);
-        divider4.setBackgroundColor(dividerColor);
+        divider1.setDividerColor(dividerColor);
+        divider2.setDividerColor(dividerColor);
         flairBackgroundColor = mCustomThemeWrapper.getFlairBackgroundColor();
         flairTextColor = mCustomThemeWrapper.getFlairTextColor();
         spoilerBackgroundColor = mCustomThemeWrapper.getSpoilerBackgroundColor();