moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Modify]个人页头像和编辑资料页面还有个人中心修改

Browse Source
This commit is contained in:
wushaocheng
2023-02-10 19:02:23 +08:00
parent 36f86fc6c5
commit 4b570318a6
16 changed files with 102 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/yizhuan/erban/avroom/recommendcard/RecommendCardFragment.java
View File

@@ -37,7 +37,6 @@ import io.reactivex.Single;
* 推荐位的fragment
* Created by lvzebiao on 2019/1/30.
*/
public class RecommendCardFragment extends BaseFragment implements IRecyclerListener<RecommendCard, BaseViewHolder> {
private RefreshRecyclerView<FragmentEvent, RecommendCard, BaseViewHolder> refreshRecyclerView;

1
app/src/main/java/com/yizhuan/erban/ui/user/UserInfoModifyActivity.kt
View File

@@ -111,6 +111,7 @@ class UserInfoModifyActivity : BaseViewBindingActivity<ActivityUserInfoModifyBin
binding.civAvatar
)
binding.ivAvatarAuditing.visibility = if (userInfo.isReview) View.VISIBLE else View.GONE
binding.tvAvatarAuditing.visibility = if (userInfo.isReview) View.VISIBLE else View.GONE
val birth = TimeUtil.getDateTimeString(userInfo.birth, "yyyy-MM-dd")
binding.tvBirth.text = birth
binding.tvNick.text = RegexUtil.getPrintableString(userInfo.nick)

2
app/src/main/java/com/yizhuan/erban/ui/user/view/UserInfoGiftWallFragment.kt
View File

@@ -17,8 +17,6 @@ import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes
@ActLayoutRes(R.layout.fragment_userinfo_gift_wall)
class UserInfoGiftWallFragment : BaseViewBindingFragment<FragmentUserinfoGiftWallBinding>() {
override fun init() {

2
app/src/main/java/com/yizhuan/erban/ui/user/view/UserInfoInfoFragment.kt
View File

@@ -39,8 +39,6 @@ import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
import java.util.*
@ActLayoutRes(R.layout.fragment_userinfo_userinfo)
class UserInfoInfoFragment : BaseViewBindingFragment<FragmentUserinfoUserinfoBinding>() {
private val vm: UserInfoViewModel by activityViewModels()

BIN
app/src/main/res/drawable-xhdpi/ic_avatar_auditing.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 930 B

BIN
app/src/main/res/drawable-xhdpi/ic_avatar_auditing_me.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1008 B

4
app/src/main/res/drawable/bg_common_cancel.xml
View File

@@ -4,8 +4,8 @@
<corners android:radius="100dp" />
<gradient
android:angle="180"
android:endColor="#4DFFA936"
android:startColor="#4DFFCB47"
android:endColor="#FFA936"
android:startColor="#FFCB47"
android:type="linear"
android:useLevel="true" />
</shape>

3
app/src/main/res/layout/activity_user_info.xml
View File

@@ -483,7 +483,6 @@
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_5"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_60"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
@@ -491,7 +490,7 @@
<ViewStub
android:id="@+id/vs_bottom_layout"
android:layout_width="match_parent"
android:layout_height="74dp"
android:layout_height="@dimen/dp_60"
android:layout_alignParentBottom="true"
android:layout="@layout/user_info_bottom_layout"
app:layout_behavior="com.yizhuan.erban.ui.user.ScrollAwareBehavior" />

35
app/src/main/res/layout/activity_user_info_modify.xml
View File

@@ -37,23 +37,36 @@
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/civ_avatar"
android:layout_width="55dp"
android:layout_height="55dp"
android:layout_width="@dimen/dp_50"
android:layout_height="@dimen/dp_50"
android:layout_centerVertical="true"
android:layout_toStartOf="@+id/iv_arrow"
android:src="@drawable/default_avatar" />
<androidx.constraintlayout.utils.widget.ImageFilterView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_avatar_auditing"
android:layout_width="55dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@id/civ_avatar"
android:layout_alignRight="@id/civ_avatar"
android:layout_alignStart="@id/civ_avatar"
android:layout_alignEnd="@id/civ_avatar"
android:layout_alignBottom="@id/civ_avatar"
android:scaleType="fitXY"
android:layout_marginStart="@dimen/dp_2"
android:layout_marginEnd="@dimen/dp_2"
android:src="@drawable/ic_avatar_auditing"
android:visibility="visible" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_avatar_auditing"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignStart="@id/iv_avatar_auditing"
android:layout_alignTop="@id/iv_avatar_auditing"
android:layout_alignEnd="@id/iv_avatar_auditing"
android:layout_alignBottom="@id/iv_avatar_auditing"
android:gravity="center"
android:text="@string/in_audit"
android:textColor="@color/white"
android:textSize="@dimen/sp_9" />
<ImageView
android:id="@+id/iv_arrow"
@@ -247,12 +260,12 @@
tools:text="60" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_16"
android:text="''"
android:textColor="@color/white"
android:textSize="@dimen/sp_14"
android:layout_marginEnd="@dimen/dp_16"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:textSize="@dimen/sp_14" />
</LinearLayout>

27
app/src/main/res/layout/fragment_me.xml
View File

@@ -54,9 +54,9 @@
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/iv_user_head"
avatarUrl="@{TextUtils.isEmptyText(userInfo.newAvatar)?userInfo.avatar:userInfo.newAvatar}"
android:layout_width="68dp"
android:layout_height="68dp"
android:layout_marginStart="20dp"
android:layout_width="74dp"
android:layout_height="74dp"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_10"
android:onClick="@{click}"
android:src="@drawable/default_man"
@@ -64,15 +64,30 @@
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="68dp"
android:layout_height="16dp"
android:id="@+id/iv_audit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:scaleType="fitCenter"
android:src="@drawable/ic_avatar_auditing"
android:src="@drawable/ic_avatar_auditing_me"
android:visibility="@{userInfo.isReview()?View.VISIBLE:View.GONE}"
android:layout_marginStart="@dimen/dp_4"
android:layout_marginEnd="@dimen/dp_4"
app:layout_constraintBottom_toBottomOf="@id/iv_user_head"
app:layout_constraintLeft_toLeftOf="@id/iv_user_head"
app:layout_constraintRight_toRightOf="@id/iv_user_head" />
<androidx.appcompat.widget.AppCompatTextView
android:text="@string/in_audit"
android:textSize="@dimen/sp_11"
android:textColor="@color/white"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="@{userInfo.isReview()?View.VISIBLE:View.GONE}"
app:layout_constraintStart_toStartOf="@+id/iv_audit"
app:layout_constraintEnd_toEndOf="@+id/iv_audit"
app:layout_constraintTop_toTopOf="@+id/iv_audit"
app:layout_constraintBottom_toBottomOf="@+id/iv_audit"/>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_user_info"
android:layout_width="0dp"

74
app/src/main/res/layout/fragment_userinfo_gift_wall.xml
View File

@@ -1,46 +1,52 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/ll_top"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_ffffff_8"
android:orientation="vertical"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
android:layout_height="wrap_content">
<com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
android:id="@+id/magic_indicator_gift"
android:layout_width="wrap_content"
android:layout_height="22dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_14" />
<androidx.viewpager.widget.ViewPager
android:id="@+id/view_pager_gift"
<LinearLayout
android:id="@+id/ll_top"
android:layout_width="match_parent"
android:layout_height="320dp" />
android:layout_height="wrap_content"
android:background="@drawable/bg_ffffff_8"
android:orientation="vertical"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
</LinearLayout>
<com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
android:id="@+id/magic_indicator_gift"
android:layout_width="wrap_content"
android:layout_height="22dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_14" />
<ImageView
android:id="@+id/iv_gift_detail"
android:src="@drawable/icon_arrow_right_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/dp_8"
android:paddingEnd="@dimen/dp_8"
android:paddingTop="@dimen/dp_8"
android:paddingBottom="@dimen/dp_8"
android:layout_marginEnd="15dp"
android:layout_marginTop="15dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<androidx.viewpager.widget.ViewPager
android:id="@+id/view_pager_gift"
android:layout_width="match_parent"
android:layout_height="320dp" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
<ImageView
android:id="@+id/iv_gift_detail"
android:src="@drawable/icon_arrow_right_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/dp_8"
android:paddingEnd="@dimen/dp_8"
android:paddingTop="@dimen/dp_8"
android:paddingBottom="@dimen/dp_8"
android:layout_marginEnd="15dp"
android:layout_marginTop="15dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>

22
app/src/main/res/layout/fragment_userinfo_userinfo.xml
View File

@@ -5,9 +5,10 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:id="@+id/ll_personal_data"
@@ -16,7 +17,6 @@
android:background="@drawable/bg_ffffff_8"
android:orientation="vertical"
android:padding="@dimen/dp_12"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible">
<androidx.appcompat.widget.AppCompatTextView
@@ -113,11 +113,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_10"
android:visibility="gone"
android:gravity="center"
android:textColor="@color/text_title_color"
android:textSize="@dimen/sp_12"
tools:text="@string/no_room_has_been_added_yet"/>
android:visibility="gone"
tools:text="@string/no_room_has_been_added_yet" />
</LinearLayout>
@@ -152,14 +152,16 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/mRecyclerView"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_14"
android:layout_marginBottom="@dimen/dp_14"
android:layout_marginBottom="@dimen/dp_60"
android:background="@drawable/bg_ffffff_8"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintTop_toBottomOf="@+id/ll_personal_data" />
android:overScrollMode="never"
android:scrollbars="none"
android:nestedScrollingEnabled="false"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>

2
app/src/main/res/layout/user_info_bottom_layout.xml
View File

@@ -3,7 +3,6 @@
android:id="@+id/bottom_view_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:background="@color/transparent"
android:gravity="center"
android:orientation="horizontal">
@@ -33,5 +32,4 @@
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
</LinearLayout>

1
app/src/main/res/values/strings.xml
View File

@@ -5055,5 +5055,6 @@
<string name="the_default_dynamic_cannot_be_liked">默認動態不能點贊</string>
<string name="the_default_dynamic_cannot_be_commented">默認動態不能評論</string>
<string name="on_the_mic_not_record">正在上麥中，不能錄音</string>
<string name="in_audit">審核中</string>
</resources>

9
app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java
View File

@@ -205,13 +205,6 @@ public class DynamicDetailActivity extends BaseViewBindingActivity<ActivityDynam
@Override
public void init() {
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_dynamic_detail);
dynamicId = getIntent().getLongExtra(EXTRA_DYNAMIC_ID, 0L);
worldId = getIntent().getLongExtra(EXTRA_WORLD_ID, 0L);
initWhiteTitleBar(ResUtil.getString(R.string.dynamic_view_dynamicdetailactivity_09));
@@ -227,7 +220,6 @@ public class DynamicDetailActivity extends BaseViewBindingActivity<ActivityDynam
}
}
private void initView() {
binding.tvSend.setOnClickListener(this);
binding.ivEmoji.setOnClickListener(this);
@@ -302,7 +294,6 @@ public class DynamicDetailActivity extends BaseViewBindingActivity<ActivityDynam
}
private void initHeaderView() {
mHeaderView = LayoutInflater.from(this).inflate(R.layout.head_dynamic_detail, null);
ivAvatar = mHeaderView.findViewById(R.id.iv_avatar);

2
core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ClanInfo.java
View File

@@ -5,8 +5,6 @@ import lombok.Data;
@Data
public class ClanInfo {
private String avatar;
private String clanHallNum;
private int clanMemberNum;
private int id;
private String name;
private long elderUid;