diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/ModifyInfoActivity.java b/app/src/main/java/com/yizhuan/erban/ui/login/ModifyInfoActivity.java index cc73549e3..035961ce0 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/ModifyInfoActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/login/ModifyInfoActivity.java @@ -2,8 +2,12 @@ package com.yizhuan.erban.ui.login; import android.content.Intent; import android.os.Bundle; + import androidx.coordinatorlayout.widget.CoordinatorLayout; +import androidx.core.content.ContextCompat; + import com.google.android.material.snackbar.Snackbar; + import android.text.Editable; import android.text.InputFilter; import android.text.TextWatcher; @@ -12,6 +16,7 @@ import android.widget.EditText; import android.widget.RelativeLayout; import android.widget.TextView; +import com.netease.nim.uikit.StatusBarUtil; import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseActivity; import com.yizhuan.erban.base.TitleBar; @@ -22,7 +27,7 @@ import com.yizhuan.xchat_android_core.user.bean.UserInfo; * Created by zhouxiangfeng on 2017/5/13. */ -public class ModifyInfoActivity extends BaseActivity implements View.OnClickListener{ +public class ModifyInfoActivity extends BaseActivity implements View.OnClickListener { public static final int CONTENT_MODIFY = 1; public static final int NICK_MODIFY = 2; public static final String MODIFY_TYPE = "modify_type"; @@ -80,7 +85,7 @@ public class ModifyInfoActivity extends BaseActivity implements View.OnClickList if (userInfo != null) { if (modifyType == CONTENT_MODIFY) { etEditText.setText(userInfo.getUserDesc()); - } else if (modifyType == NICK_MODIFY){ + } else if (modifyType == NICK_MODIFY) { etEditTextNick.setText(userInfo.getNick()); } } @@ -93,26 +98,19 @@ public class ModifyInfoActivity extends BaseActivity implements View.OnClickList etEditText.setFilters(new InputFilter[]{new InputFilter.LengthFilter(60)}); etEditText.addTextChangedListener(textWatcher); rlNickGroup.setVisibility(View.GONE); - initTitleBar("修改个人介绍"); + initWhiteTitleBar("修改个人介绍"); } else if (modifyType == NICK_MODIFY) { rlNickGroup.setVisibility(View.VISIBLE); rlContentGroup.setVisibility(View.GONE); etEditTextNick.setFilters(new InputFilter[]{new InputFilter.LengthFilter(15)}); etEditTextNick.addTextChangedListener(textWatcher); - initTitleBar("修改昵称"); - - } else + initWhiteTitleBar("修改昵称"); + } else { initTitleBar(""); - - } - - @Override - public void initTitleBar(String title) { - super.initTitleBar(title); - TitleBar titleBar = findViewById(R.id.title_bar); - titleBar.setActionTextColor(R.color.text_color_primary); - titleBar.addAction(new TitleBar.TextAction(getString(R.string.label_modify_info_confirm)) { + } + mTitleBar.addAction(new TitleBar.TextAction(getString(R.string.label_modify_info_confirm), + ContextCompat.getColor(this, R.color.text_normal_c6c6e9)) { @Override public void performAction(View view) { @@ -139,8 +137,10 @@ public class ModifyInfoActivity extends BaseActivity implements View.OnClickList } }); + } + private void onSetListener() { findViewById(R.id.iv_nick_delete).setOnClickListener(this); findViewById(R.id.iv_content_delete).setOnClickListener(this); @@ -178,4 +178,14 @@ public class ModifyInfoActivity extends BaseActivity implements View.OnClickList } + @Override + protected boolean needSteepStateBar() { + return true; + } + + @Override + protected void setStatusBar() { + StatusBarUtil.transparencyBar(this); + } + } diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java index 1008e4533..00265040d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java @@ -483,13 +483,11 @@ public class UserInfoActivity extends BaseBindingActivity 0; tvNoVoice.setVisibility(hasVoice ? View.GONE : View.VISIBLE); -// tvVoice.setVisibility(hasVoice ? View.VISIBLE : View.GONE); -// tvVoice.setText(hasVoice ? getString(R.string.user_info_voice_dur, userInfo.getVoiceDura()) : ""); - UserPhotoAdapter adapter = new UserPhotoAdapter(userInfo.getPrivatePhoto(), 1, userInfo.getUid()); adapter.setSmall(true); adapter.setImageClickListener(this); @@ -131,7 +117,6 @@ public class UserInfoModifyActivity extends BaseActivity tvBirth = findViewById(R.id.tv_birth); tvNick = findViewById(R.id.tv_nick); tvDesc = findViewById(R.id.tv_desc); -// tvVoice = findViewById(R.id.tv_voice); tvNoVoice = findViewById(R.id.tv_no_voice); photosRecyclerView = findViewById(R.id.rv_photos); findViewById(R.id.layout_avatar).setOnClickListener(this); @@ -256,7 +241,6 @@ public class UserInfoModifyActivity extends BaseActivity // 获取数据并刷新显示 audioFileUrl = data.getStringExtra(RecordingVoiceActivity.AUDIO_FILE); int audioDura = data.getIntExtra(RecordingVoiceActivity.AUDIO_DURA, 0); -// tvVoice.setText(getString(R.string.user_info_voice_dur, audioDura)); // 更新用户信息 UserInfo user = new UserInfo(); @@ -322,7 +306,6 @@ public class UserInfoModifyActivity extends BaseActivity break; case R.id.layout_photos: -// UIHelper.showModifyPhotosAct(UserInfoModifyActivity.this, userId); UserModifyPhotosActivity.startForResult(UserInfoModifyActivity.this, userId, Method.PHOTO); break; default: @@ -407,4 +390,14 @@ public class UserInfoModifyActivity extends BaseActivity toast(e.getMessage()); } }; + + @Override + protected boolean needSteepStateBar() { + return true; + } + + @Override + protected void setStatusBar() { + StatusBarUtil.transparencyBar(this); + } } diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/UserModifyPhotosActivity.java b/app/src/main/java/com/yizhuan/erban/ui/user/UserModifyPhotosActivity.java index 99012fc89..411c2d0a5 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/UserModifyPhotosActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/user/UserModifyPhotosActivity.java @@ -11,6 +11,7 @@ import android.widget.GridView; import com.jph.takephoto.app.TakePhotoActivity; import com.jph.takephoto.compress.CompressConfig; import com.jph.takephoto.model.TResult; +import com.netease.nim.uikit.StatusBarUtil; import com.orhanobut.logger.Logger; import com.trello.rxlifecycle3.android.ActivityEvent; import com.yizhuan.erban.R; @@ -68,22 +69,15 @@ public class UserModifyPhotosActivity extends TakePhotoActivity implements UserM } private void initView() { - initTitleBar("我的相册"); + initWhiteTitleBar("我的相册"); TitleBar titleBar = findViewById(R.id.title_bar); - titleBar.addAction(new TitleBar.TextAction("编辑",getResources().getColor(R.color.color_666666)) { + titleBar.addAction(new TitleBar.TextAction("编辑",getResources().getColor(R.color.text_normal_c6c6e9)) { @Override public void performAction(View view) { notifyEditMode(); } }); - photoGridView = findViewById(R.id.gridView); -// dialog = new BottomSelectDialog(this); -//// dialog.create(); -// dialog.setHideTitle(true); -// dialog.setTvOne("拍照上传"); -// dialog.setTvTwo("本地相册"); -// dialog.setButtonText("取消"); } @Override @@ -190,19 +184,6 @@ public class UserModifyPhotosActivity extends TakePhotoActivity implements UserM intent.putExtra("position", position1); intent.putExtra("photoList", userPhotos1); startActivity(intent); -// PhotoPreviewIntent intent = new PhotoPreviewIntent(this); -// intent.setCurrentItem(position-1); // 当前选中照片的下标 -// ArrayList paths = new ArrayList<>(); -// paths.add(userInfo.getAvatar()); -// paths.add(userInfo.getAvatar()); -// paths.add(userInfo.getAvatar()); -// paths.add(userInfo.getAvatar()); -// paths.add(userInfo.getAvatar()); -// paths.add(userInfo.getAvatar()); -// intent.setPhotoPaths(paths); -// startActivityForResult(intent, 201); - - } } @@ -265,4 +246,14 @@ public class UserModifyPhotosActivity extends TakePhotoActivity implements UserM toast(msg); } + @Override + protected boolean needSteepStateBar() { + return true; + } + + @Override + protected void setStatusBar() { + StatusBarUtil.transparencyBar(this); + } + } diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/RollPagerView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/RollPagerView.java index dbd8dd15f..92fd8a065 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/RollPagerView.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/RollPagerView.java @@ -349,7 +349,7 @@ public class RollPagerView extends RelativeLayout implements OnPageChangeListene removeView(mHintView); } this.mHintView = (View) hintview; - if (hintview != null && hintview instanceof View) { + if (hintview != null) { initHint(hintview); } } diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/hintview/TextHintView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/hintview/TextHintView.java index 217776828..cc3cf3f47 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/hintview/TextHintView.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/hintview/TextHintView.java @@ -24,7 +24,6 @@ public class TextHintView extends AppCompatTextView implements HintView { @Override public void initView(int length, int gravity) { this.length = length; - setTextColor(Color.WHITE); switch (gravity) { case 0: setGravity(Gravity.LEFT| Gravity.CENTER_VERTICAL); diff --git a/app/src/main/res/layout/activity_modify_info.xml b/app/src/main/res/layout/activity_modify_info.xml index 410a663a5..512561533 100644 --- a/app/src/main/res/layout/activity_modify_info.xml +++ b/app/src/main/res/layout/activity_modify_info.xml @@ -3,8 +3,7 @@ android:id="@+id/layout_coordinator" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white" - android:fitsSystemWindows="true" + android:background="@color/bg_normal_1c1b22" android:orientation="vertical"> @@ -26,7 +26,7 @@ android:layout_marginTop="10dp" android:layout_marginBottom="10dp" android:padding="11dp" - android:background="@drawable/bg_shape_modify_info" > + android:background="@drawable/bg_2a2a39_0_15" > + android:src="@drawable/icon_dy_delete_pic"/> @@ -91,6 +91,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="end" + android:textColor="@color/text_normal_c6c6e9" android:layout_marginEnd="15dp"/> diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml index 8771271a3..46cc66ecf 100644 --- a/app/src/main/res/layout/activity_user_info.xml +++ b/app/src/main/res/layout/activity_user_info.xml @@ -24,31 +24,24 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + android:layout_height="250dp" + app:edge_position="bottom"> - - - - - + app:rollviewpager_hint_gravity="right" + app:rollviewpager_hint_paddingBottom="60dp" + app:rollviewpager_hint_paddingRight="20dp" + app:rollviewpager_play_delay="5000" /> - - + + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_25" /> + android:background="@color/line_color_353548" /> + android:layout_gravity="center" + android:padding="15dp" + android:src="@drawable/arrow_right_white" /> + android:layout_marginLeft="15dp" + android:layout_marginRight="15dp" + android:background="@color/line_color_353548" /> + android:textColor="@color/text_title_white" + android:textSize="14sp" /> + android:layout_marginLeft="15dp" + android:layout_marginRight="15dp" + android:background="@color/line_color_353548" /> + android:paddingRight="15dp"> + android:textColor="@color/text_title_white" + android:textSize="14sp" /> + android:layout_marginLeft="15dp" + android:layout_marginRight="15dp" + android:background="@color/line_color_353548" /> + android:orientation="horizontal"> + android:textColor="@color/text_title_white" + android:textSize="14sp" /> - - - + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_gravity="center_vertical|end" /> - + + android:src="@drawable/arrow_right_white" /> + android:layout_marginLeft="15dp" + android:layout_marginRight="15dp" + android:background="@color/line_color_353548" /> + android:visibility="gone"> + android:textColor="@color/text_title_white" + android:textSize="14sp" /> + android:textSize="@dimen/font_normal" + android:visibility="gone" /> @@ -243,8 +232,8 @@ android:id="@+id/iv_audio_record" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_centerVertical="true" android:layout_alignParentEnd="true" + android:layout_centerVertical="true" android:padding="15dp" android:src="@mipmap/common_ic_more_arrow" /> @@ -252,30 +241,30 @@ + android:layout_marginLeft="15dp" + android:layout_marginRight="15dp" + android:background="@color/line_color_353548" /> + android:orientation="horizontal"> + android:textColor="@color/text_title_white" + android:textSize="14sp" /> @@ -292,10 +281,10 @@ android:id="@+id/tv_desc" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:hint="@string/label_hint_desc_setting" android:layout_marginStart="10dp" - android:textColor="@color/text_color_primary" - android:textColorHint="@color/text_color_secondary" /> + android:hint="@string/label_hint_desc_setting" + android:textColor="@color/text_normal_c6c6e9" + android:textColorHint="@color/text_secondary_4f516a" /> @@ -307,16 +296,16 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:padding="15dp" - android:src="@mipmap/common_ic_more_arrow" /> + android:src="@drawable/arrow_right_white" /> + android:layout_marginLeft="15dp" + android:layout_marginRight="15dp" + android:background="@color/line_color_353548" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_user_photos_modify.xml b/app/src/main/res/layout/activity_user_photos_modify.xml index 883ceb011..4df8c7d21 100644 --- a/app/src/main/res/layout/activity_user_photos_modify.xml +++ b/app/src/main/res/layout/activity_user_photos_modify.xml @@ -2,10 +2,11 @@ + android:background="@color/bg_normal_1c1b22"> diff --git a/app/src/main/res/layout/banner_userinfo_photo_item.xml b/app/src/main/res/layout/banner_userinfo_photo_item.xml index 8efa63ba9..0f61574b5 100644 --- a/app/src/main/res/layout/banner_userinfo_photo_item.xml +++ b/app/src/main/res/layout/banner_userinfo_photo_item.xml @@ -2,6 +2,6 @@