From d6d6ed5407bf8479957290d1e7cf79279dd4c427 Mon Sep 17 00:00:00 2001 From: Alex Ning Date: Thu, 11 Nov 2021 20:37:28 +0800 Subject: UI changes in EditProfileActivity. --- .../activities/EditProfileActivity.java | 24 ++++++------ app/src/main/res/layout/activity_edit_profile.xml | 44 +++++++++++----------- app/src/main/res/values/strings.xml | 20 +++++----- 3 files changed, 46 insertions(+), 42 deletions(-) (limited to 'app/src') 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 27086981..d9248652 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/EditProfileActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/EditProfileActivity.java @@ -143,22 +143,26 @@ public class EditProfileActivity extends BaseActivity { new ViewModelProvider(this, userViewModelFactory).get(UserViewModel.class); userViewModel.getUserLiveData().observe(this, userData -> { - if (userData == null) return;// + if (userData == null) { + return; + } // BANNER final String userBanner = userData.getBanner(); LayoutParams cBannerLp = (LayoutParams) changeBanner.getLayoutParams(); if (userBanner == null || userBanner.isEmpty()) { changeBanner.setLongClickable(false); - changeBanner.setImageResource(R.drawable.ic_add_day_night_24dp); - changeBanner.setLayoutParams(new LayoutParams(cBannerLp.width, cBannerLp.height, Gravity.CENTER)); + cBannerLp.gravity = Gravity.CENTER; + changeBanner.setLayoutParams(cBannerLp); changeBanner.setOnLongClickListener(v -> false); } else { changeBanner.setLongClickable(true); - changeBanner.setImageResource(R.drawable.ic_outline_add_a_photo_day_night_24dp); - changeBanner.setLayoutParams(new LayoutParams(cBannerLp.width, cBannerLp.height, Gravity.END | Gravity.BOTTOM)); + cBannerLp.gravity = Gravity.END | Gravity.BOTTOM; + changeBanner.setLayoutParams(cBannerLp); glide.load(userBanner).into(bannerImageView); changeBanner.setOnLongClickListener(view -> { - if (mAccessToken == null) return false; + if (mAccessToken == null) { + return false; + } new MaterialAlertDialogBuilder(this, R.style.MaterialAlertDialogTheme) .setTitle(R.string.remove_banner) .setMessage(R.string.are_you_sure) @@ -195,15 +199,13 @@ public class EditProfileActivity extends BaseActivity { LayoutParams cAvatarLp = (LayoutParams) changeAvatar.getLayoutParams(); if (userAvatar.contains("avatar_default_")) { changeAvatar.setLongClickable(false); - changeAvatar.setImageResource(R.drawable.ic_add_day_night_24dp); - changeAvatar.setLayoutParams(new LayoutParams(cAvatarLp.width, cAvatarLp.height, Gravity.CENTER)); changeAvatar.setOnLongClickListener(v -> false); } else { changeAvatar.setLongClickable(true); - changeAvatar.setImageResource(R.drawable.ic_outline_add_a_photo_day_night_24dp); - changeAvatar.setLayoutParams(new LayoutParams(cAvatarLp.width, cAvatarLp.height, Gravity.END | Gravity.BOTTOM)); changeAvatar.setOnLongClickListener(view -> { - if (mAccessToken == null) return false; + if (mAccessToken == null) { + return false; + } new MaterialAlertDialogBuilder(this, R.style.MaterialAlertDialogTheme) .setTitle(R.string.remove_avatar) .setMessage(R.string.are_you_sure) diff --git a/app/src/main/res/layout/activity_edit_profile.xml b/app/src/main/res/layout/activity_edit_profile.xml index 47d6aba3..4f3ad007 100644 --- a/app/src/main/res/layout/activity_edit_profile.xml +++ b/app/src/main/res/layout/activity_edit_profile.xml @@ -62,23 +62,22 @@ @@ -113,17 +110,18 @@ 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" /> + android:textSize="?attr/font_18" + android:fontFamily="?attr/font_family" /> + android:text="@string/display_name_description" + android:textSize="?attr/font_12" + android:fontFamily="?attr/font_family" /> @@ -149,9 +149,9 @@ 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" /> + android:textSize="?attr/font_18" + android:fontFamily="?attr/font_family" /> This will be displayed to viewers of your profile page and does not change your username. About You A little description of yourself - Success remove Avatar - Failed remove Avatar %s - Success remove Banner - Failed remove Banner %s - Success changing Avatar - Failed changing Avatar %s - Success changing Banner - Failed changing Banner %s - Success save profile - Failed save profile %s + Remove avatar successfully + Failed to remove avatar %s + Remove banner successfully + Failed to remove banner %s + Change avatar successfully + Failed to change avatar %s + Changing banner successfully + Failed to change banner %s + Save profile successfully + Failed to save profile %s -- cgit v1.2.3