diff options
15 files changed, 132 insertions, 197 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 51a0ca10..14b7f150 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -394,8 +394,9 @@ android:theme="@style/AppTheme.SlidableWithTranslucentWindow" /> <activity android:name=".activities.EditProfileActivity" + android:label="@string/edit_profile_activity_label" android:parentActivityName=".activities.MainActivity" - android:theme="@style/AppTheme.SlidableWithTranslucentWindow" + android:theme="@style/AppTheme.Slidable" android:windowSoftInputMode="adjustPan" /> <provider 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(); diff --git a/app/src/main/res/layout/activity_edit_profile.xml b/app/src/main/res/layout/activity_edit_profile.xml index 453ad5c4..47d6aba3 100644 --- a/app/src/main/res/layout/activity_edit_profile.xml +++ b/app/src/main/res/layout/activity_edit_profile.xml @@ -13,14 +13,23 @@ android:layout_height="wrap_content" android:theme="@style/AppTheme.AppBarOverlay"> - <androidx.appcompat.widget.Toolbar - android:id="@+id/toolbar_view_edit_profile_activity" + <com.google.android.material.appbar.CollapsingToolbarLayout + android:id="@+id/collapsing_toolbar_layout_edit_profile_activity" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="?attr/actionBarSize" - app:navigationIcon="?attr/homeAsUpIndicator" - app:popupTheme="@style/AppTheme.PopupOverlay" - app:title="@string/action_edit_profile" /> + android:layout_height="match_parent" + app:layout_scrollFlags="scroll|enterAlways" + app:titleEnabled="false" + app:toolbarId="@+id/toolbar_post_text_activity"> + + <com.google.android.material.appbar.MaterialToolbar + android:id="@+id/toolbar_view_edit_profile_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?attr/actionBarSize" + app:navigationIcon="?attr/homeAsUpIndicator" + app:popupTheme="@style/AppTheme.PopupOverlay" /> + + </com.google.android.material.appbar.CollapsingToolbarLayout> </com.google.android.material.appbar.AppBarLayout> @@ -42,14 +51,12 @@ <FrameLayout android:id="@+id/frame_layout_view_banner_edit_profile_activity" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="8dp"> + android:layout_height="wrap_content"> - <ImageView + <pl.droidsonroids.gif.GifImageView android:id="@+id/image_view_banner_edit_profile_activity" android:layout_width="match_parent" android:layout_height="180dp" - android:contentDescription="@null" android:scaleType="centerCrop" tools:src="@tools:sample/backgrounds/scenic" /> @@ -68,17 +75,16 @@ <FrameLayout android:id="@+id/frame_layout_view_avatar_edit_profile_activity" - android:layout_width="74dp" - android:layout_height="74dp" + android:layout_width="72dp" + android:layout_height="72dp" android:layout_marginStart="24dp" android:layout_marginTop="143dp" android:elevation="4dp"> - <ImageView + <pl.droidsonroids.gif.GifImageView android:id="@+id/image_view_avatar_edit_profile_activity" - android:layout_width="74dp" - android:layout_height="74dp" - android:contentDescription="@null" + android:layout_width="72dp" + android:layout_height="72dp" tools:src="@tools:sample/avatars" /> <ImageView @@ -96,22 +102,17 @@ </FrameLayout> - <View - android:layout_width="match_parent" - android:layout_height="1dp" - android:layout_margin="8dp" - android:background="?dividerVertical" /> - <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="8dp" - android:orientation="vertical" - android:padding="8dp"> + android:orientation="vertical"> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" + android:paddingTop="48dp" + android:paddingStart="16dp" + android:paddingEnd="16dp" android:fontFamily="?attr/font_family" android:text="@string/display_name_text" android:textSize="?attr/font_18" /> @@ -120,20 +121,19 @@ android:id="@+id/edit_text_display_name_edit_profile_activity" android:layout_width="match_parent" android:layout_height="wrap_content" + android:padding="16dp" android:gravity="top" + android:background="#00000000" android:hint="@string/display_name_hint" android:importantForAutofill="no" android:inputType="textCapSentences" - android:lines="1" - android:maxLength="30" - android:maxLines="1" - android:paddingStart="16dp" - android:paddingEnd="16dp" - android:paddingBottom="16dp" /> + android:maxLength="30" /> <TextView android:layout_width="match_parent" android:layout_height="wrap_content" + android:paddingStart="16dp" + android:paddingEnd="16dp" android:text="@string/display_name_description" /> </LinearLayout> @@ -141,13 +141,14 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="8dp" - android:orientation="vertical" - android:padding="8dp"> + android:orientation="vertical"> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" + android:paddingTop="48dp" + android:paddingStart="16dp" + android:paddingEnd="16dp" android:fontFamily="?attr/font_family" android:text="@string/about_you_text" android:textSize="?attr/font_18" /> @@ -156,16 +157,13 @@ android:id="@+id/edit_text_about_you_edit_profile_activity" android:layout_width="match_parent" android:layout_height="wrap_content" + android:padding="16dp" android:gravity="top" + android:background="#00000000" android:hint="@string/about_you_hint" android:importantForAutofill="no" android:inputType="textCapSentences|textMultiLine" - android:lines="4" - android:maxLength="200" - android:maxLines="4" - android:paddingStart="16dp" - android:paddingEnd="16dp" - android:paddingBottom="16dp" /> + android:maxLength="200" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_post_gallery.xml b/app/src/main/res/layout/activity_post_gallery.xml index b66d0c34..66fd39ac 100644 --- a/app/src/main/res/layout/activity_post_gallery.xml +++ b/app/src/main/res/layout/activity_post_gallery.xml @@ -73,10 +73,10 @@ </RelativeLayout> - <View + <com.google.android.material.divider.MaterialDivider android:id="@+id/divider_1_post_gallery_activity" android:layout_width="match_parent" - android:layout_height="1dp" /> + android:layout_height="wrap_content" /> <LinearLayout android:layout_width="match_parent" @@ -127,17 +127,10 @@ </LinearLayout> - <View - android:id="@+id/divider_2_post_gallery_activity" - android:layout_width="match_parent" - android:layout_height="1dp" /> - <LinearLayout android:id="@+id/receive_post_reply_notifications_linear_layout_post_gallery_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="8dp" - android:paddingBottom="8dp" android:paddingStart="16dp" android:paddingEnd="16dp" android:clickable="true" @@ -164,10 +157,10 @@ </LinearLayout> - <View - android:id="@+id/divider_3_post_gallery_activity" + <com.google.android.material.divider.MaterialDivider + android:id="@+id/divider_2_post_gallery_activity" android:layout_width="match_parent" - android:layout_height="1dp" /> + android:layout_height="wrap_content" /> <EditText android:id="@+id/post_title_edit_text_post_gallery_activity" @@ -182,11 +175,6 @@ android:textSize="?attr/title_font_18" android:fontFamily="?attr/title_font_family" /> - <View - android:id="@+id/divider_4_post_gallery_activity" - android:layout_width="match_parent" - android:layout_height="1dp" /> - <androidx.recyclerview.widget.RecyclerView android:id="@+id/images_recycler_view_post_gallery_activity" android:layout_width="match_parent" diff --git a/app/src/main/res/layout/activity_post_image.xml b/app/src/main/res/layout/activity_post_image.xml index a73dfcf4..fc4c15cd 100644 --- a/app/src/main/res/layout/activity_post_image.xml +++ b/app/src/main/res/layout/activity_post_image.xml @@ -73,10 +73,10 @@ </RelativeLayout> - <View + <com.google.android.material.divider.MaterialDivider android:id="@+id/divider_1_post_image_activity" android:layout_width="match_parent" - android:layout_height="1dp" /> + android:layout_height="wrap_content" /> <LinearLayout android:layout_width="match_parent" @@ -127,17 +127,10 @@ </LinearLayout> - <View - android:id="@+id/divider_2_post_image_activity" - android:layout_width="match_parent" - android:layout_height="1dp" /> - <LinearLayout android:id="@+id/receive_post_reply_notifications_linear_layout_post_image_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="8dp" - android:paddingBottom="8dp" android:paddingStart="16dp" android:paddingEnd="16dp" android:clickable="true" @@ -164,10 +157,10 @@ </LinearLayout> - <View - android:id="@+id/divider_3_post_image_activity" + <com.google.android.material.divider.MaterialDivider + android:id="@+id/divider_2_post_image_activity" android:layout_width="match_parent" - android:layout_height="1dp" /> + android:layout_height="wrap_content" /> <EditText android:id="@+id/post_title_edit_text_post_image_activity" @@ -182,11 +175,6 @@ android:textSize="?attr/title_font_18" android:fontFamily="?attr/title_font_family" /> - <View - android:id="@+id/divider_4_post_image_activity" - android:layout_width="match_parent" - android:layout_height="1dp" /> - <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/select_image_constraint_layout_post_image_activity" android:layout_width="match_parent" diff --git a/app/src/main/res/layout/activity_post_link.xml b/app/src/main/res/layout/activity_post_link.xml index f7a26366..29c33d4b 100644 --- a/app/src/main/res/layout/activity_post_link.xml +++ b/app/src/main/res/layout/activity_post_link.xml @@ -73,10 +73,10 @@ </RelativeLayout> - <View + <com.google.android.material.divider.MaterialDivider android:id="@+id/divider_1_post_link_activity" android:layout_width="match_parent" - android:layout_height="1dp" /> + android:layout_height="wrap_content" /> <LinearLayout android:layout_width="match_parent" @@ -127,17 +127,10 @@ </LinearLayout> - <View - android:id="@+id/divider_2_post_link_activity" - android:layout_width="match_parent" - android:layout_height="1dp" /> - <LinearLayout android:id="@+id/receive_post_reply_notifications_linear_layout_post_link_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="8dp" - android:paddingBottom="8dp" android:paddingStart="16dp" android:paddingEnd="16dp" android:clickable="true" @@ -164,10 +157,10 @@ </LinearLayout> - <View - android:id="@+id/divider_3_post_link_activity" + <com.google.android.material.divider.MaterialDivider + android:id="@+id/divider_2_post_link_activity" android:layout_width="match_parent" - android:layout_height="1dp" /> + android:layout_height="wrap_content" /> <LinearLayout android:layout_width="match_parent" @@ -201,11 +194,6 @@ </LinearLayout> - <View - android:id="@+id/divider_4_post_link_activity" - android:layout_width="match_parent" - android:layout_height="1dp" /> - <EditText android:id="@+id/post_link_edit_text_post_link_activity" android:layout_width="match_parent" diff --git a/app/src/main/res/layout/activity_post_text.xml b/app/src/main/res/layout/activity_post_text.xml index e6c1a366..78728545 100644 --- a/app/src/main/res/layout/activity_post_text.xml +++ b/app/src/main/res/layout/activity_post_text.xml @@ -79,10 +79,10 @@ </RelativeLayout> - <View + <com.google.android.material.divider.MaterialDivider android:id="@+id/divider_1_post_text_activity" android:layout_width="match_parent" - android:layout_height="1dp" /> + android:layout_height="wrap_content" /> <LinearLayout android:layout_width="match_parent" @@ -130,17 +130,10 @@ </LinearLayout> - <View - android:id="@+id/divider_2_post_text_activity" - android:layout_width="match_parent" - android:layout_height="1dp" /> - <LinearLayout android:id="@+id/receive_post_reply_notifications_linear_layout_post_text_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="8dp" - android:paddingBottom="8dp" android:paddingStart="16dp" android:paddingEnd="16dp" android:clickable="true" @@ -167,10 +160,10 @@ </LinearLayout> - <View - android:id="@+id/divider_3_post_text_activity" + <com.google.android.material.divider.MaterialDivider + android:id="@+id/divider_2_post_text_activity" android:layout_width="match_parent" - android:layout_height="1dp" /> + android:layout_height="wrap_content" /> <EditText android:id="@+id/post_title_edit_text_post_text_activity" @@ -184,11 +177,6 @@ android:textSize="?attr/title_font_18" android:fontFamily="?attr/title_font_family" /> - <View - android:id="@+id/divider_4_post_text_activity" - android:layout_width="match_parent" - android:layout_height="1dp" /> - <EditText android:id="@+id/post_text_content_edit_text_post_text_activity" android:layout_width="match_parent" diff --git a/app/src/main/res/layout/activity_post_video.xml b/app/src/main/res/layout/activity_post_video.xml index 31632565..f9b34698 100644 --- a/app/src/main/res/layout/activity_post_video.xml +++ b/app/src/main/res/layout/activity_post_video.xml @@ -73,10 +73,10 @@ </RelativeLayout> - <View + <com.google.android.material.divider.MaterialDivider android:id="@+id/divider_1_post_video_activity" android:layout_width="match_parent" - android:layout_height="1dp" /> + android:layout_height="wrap_content" /> <LinearLayout android:layout_width="match_parent" @@ -127,17 +127,10 @@ </LinearLayout> - <View - android:id="@+id/divider_2_post_video_activity" - android:layout_width="match_parent" - android:layout_height="1dp" /> - <LinearLayout android:id="@+id/receive_post_reply_notifications_linear_layout_post_video_activity" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="8dp" - android:paddingBottom="8dp" android:paddingStart="16dp" android:paddingEnd="16dp" android:clickable="true" @@ -164,10 +157,10 @@ </LinearLayout> - <View - android:id="@+id/divider_3_post_video_activity" + <com.google.android.material.divider.MaterialDivider + android:id="@+id/divider_2_post_video_activity" android:layout_width="match_parent" - android:layout_height="1dp" /> + android:layout_height="wrap_content" /> <EditText android:id="@+id/post_title_edit_text_post_video_activity" @@ -182,11 +175,6 @@ android:textSize="?attr/title_font_18" android:fontFamily="?attr/title_font_family" /> - <View - android:id="@+id/divider_4_post_video_activity" - android:layout_width="match_parent" - android:layout_height="1dp" /> - <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/select_video_constraint_layout_post_video_activity" android:layout_width="match_parent" @@ -197,25 +185,27 @@ android:id="@+id/capture_fab_post_video_activity" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:padding="16dp" android:src="@drawable/ic_outline_add_a_photo_24dp" + app:useCompatPadding="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/select_from_library_fab_post_video_activity" app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:tint="@android:color/white" /> + app:layout_constraintTop_toTopOf="parent" /> <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/select_from_library_fab_post_video_activity" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:padding="16dp" android:src="@drawable/ic_outline_select_photo_24dp" + app:useCompatPadding="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintStart_toEndOf="@+id/capture_fab_post_video_activity" - app:layout_constraintTop_toTopOf="parent" - app:tint="@android:color/white" /> + app:layout_constraintTop_toTopOf="parent" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/menu/edit_profile_activity.xml b/app/src/main/res/menu/edit_profile_activity.xml index fe96ba20..4d5ec31d 100644 --- a/app/src/main/res/menu/edit_profile_activity.xml +++ b/app/src/main/res/menu/edit_profile_activity.xml @@ -6,6 +6,6 @@ android:id="@+id/action_save_edit_profile_activity" android:orderInCategory="1" android:title="@string/action_save" - android:icon="@drawable/ic_save_to_database_24dp" + android:icon="@drawable/ic_check_circle_toolbar_24dp" app:showAsAction="ifRoom" /> </menu>
\ 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 3b8753e8..9d2f509e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -43,6 +43,7 @@ <string name="post_gallery_activity_label">Gallery Post</string> <string name="trending_activity_label">Trending</string> <string name="wiki_activity_label">Wiki</string> + <string name="edit_profile_activity_label">Edit Profile</string> <string name="navigation_drawer_open">Open navigation drawer</string> <string name="navigation_drawer_close">Close navigation drawer</string> @@ -1226,9 +1227,9 @@ <string name="remove_banner">Remove Banner</string> <string name="display_name_text">Display Name</string> <string name="display_name_hint">Show on your profile page</string> - <string name="display_name_description">This will be displayed to viewer of your profile page and does not change your username</string> + <string name="display_name_description">This will be displayed to viewers of your profile page and does not change your username.</string> <string name="about_you_text">About You</string> - <string name="about_you_hint">A little description of your self</string> + <string name="about_you_hint">A little description of yourself</string> <string name="message_remove_avatar_success">Success remove Avatar</string> <string name="message_remove_avatar_failed_fmt">Failed remove Avatar %s</string> <string name="message_remove_banner_success">Success remove Banner</string> |