diff --git a/Share/src/main/res/values-en/strings.xml b/Share/src/main/res/values-en/strings.xml index bb68d28..30573a8 100644 --- a/Share/src/main/res/values-en/strings.xml +++ b/Share/src/main/res/values-en/strings.xml @@ -5,12 +5,12 @@ Invite Friends Come to PDLIVE to discover more and better live streams. Copy - Friend + Site friends Share To cancel - Search - Share - Success - Chat + Search nickname + Send + Share success + Go chat Please select friends \ No newline at end of file diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml index d6565d7..cd08f2d 100644 --- a/common/src/main/res/values-en-rUS/string.xml +++ b/common/src/main/res/values-en-rUS/string.xml @@ -1462,7 +1462,7 @@ Limited ride And limited avatar frame The current list is empty ~ There are no search results yet. Try using another word~ Age: - Say Hi + Greet Reply Online Offline diff --git a/main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java b/main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java index 47fbc56..a5f38b8 100644 --- a/main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java @@ -491,8 +491,8 @@ public class EditProfileActivity extends AbsActivity { .setUserHeight(height, new com.yunbao.common.http.base.HttpCallback() { @Override public void onSuccess(HttpCallbackModel data) { - ToastUtil.show(data.getMsg()); ((TextView) findViewById(R.id.height)).setText(height + "cm"); + ((TextView) findViewById(R.id.height)).setVisibility(View.VISIBLE); } @Override @@ -502,6 +502,7 @@ public class EditProfileActivity extends AbsActivity { }); } }).setSelectOptions(120) + .setSubmitText(WordUtil.getNewString(R.string.back_community_sure)) .build(); pickerView.setPicker(height); pickerView.show(); diff --git a/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder.java index 3eb16e9..529ed2a 100644 --- a/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder.java @@ -136,8 +136,8 @@ public class MainMessageViewHolder extends AbsMainViewHolder { search = findViewById(R.id.search); contacts.setOnClickListener(view -> { //通讯录 - RouteUtil.forwardActivity(RouteUtil.PATH_ADDRESSBOOK); - // mContext.startActivity(new Intent(mContext, com.yunbao.main.activity.CompleteUserInfoActivity.class)); + //RouteUtil.forwardActivity(RouteUtil.PATH_ADDRESSBOOK); + mContext.startActivity(new Intent(mContext, com.yunbao.main.activity.CompleteUserInfoActivity.class)); // mContext.startActivity(new Intent(mContext, MessageHiConfigRecordActivity.class)); }); search.addTextChangedListener(new TextWatcher() { diff --git a/main/src/main/res/layout/activity_edit_user_hobby.xml b/main/src/main/res/layout/activity_edit_user_hobby.xml index fa9b42b..ebdbb9c 100644 --- a/main/src/main/res/layout/activity_edit_user_hobby.xml +++ b/main/src/main/res/layout/activity_edit_user_hobby.xml @@ -56,7 +56,8 @@ android:layout_marginEnd="21dp" android:layout_marginBottom="112dp" android:background="@drawable/bg_msg_address_book_user_btn_fan" - android:text="@string/edit_profile_hobby_save" + android:textAllCaps="false" + android:text="@string/back_community_sure" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> @@ -64,6 +65,7 @@ android:id="@+id/btn_cancel" android:layout_width="122dp" android:layout_height="54dp" + android:textAllCaps="false" android:layout_marginStart="21dp" android:layout_marginBottom="112dp" android:background="@drawable/dialog_bg_chat_status_config" diff --git a/main/src/main/res/layout/activity_user_info.xml b/main/src/main/res/layout/activity_user_info.xml index 8e64dfd..80ad5e8 100644 --- a/main/src/main/res/layout/activity_user_info.xml +++ b/main/src/main/res/layout/activity_user_info.xml @@ -58,6 +58,7 @@ android:maxLines="2" android:text="@string/activity_reg_user_info_avatar_change" android:textSize="13sp" + android:textAllCaps="false" app:autoSizeMaxTextSize="13sp" app:autoSizeMinTextSize="5sp" app:autoSizeStepGranularity="1sp" diff --git a/main/src/main/res/values/strings.xml b/main/src/main/res/values/strings.xml index 2035bbf..65ce9bc 100644 --- a/main/src/main/res/values/strings.xml +++ b/main/src/main/res/values/strings.xml @@ -62,7 +62,7 @@ 至少传一条语音消息 Personal information Nickname - Sex + Gender *Only one chance to choose gender. Boys Girl