update
This commit is contained in:
@@ -24,6 +24,12 @@
|
||||
android:background="@color/white"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:tab_draw_badge="true"
|
||||
app:tab_badge_offset_x="40dp"
|
||||
app:tab_badge_offset_y="15dp"
|
||||
app:tab_badge_text="2"
|
||||
app:tab_badge_text_size="10sp"
|
||||
app:tab_badge_gravity="right"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:tab_draw_indicator="false"
|
||||
app:tab_item_is_equ_width="true">
|
||||
@@ -46,7 +52,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="10sp"
|
||||
android:gravity="center"
|
||||
android:text="交友" />
|
||||
android:text="@string/home_label_friends" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
@@ -66,7 +72,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="10sp"
|
||||
android:gravity="center"
|
||||
android:text="动态" />
|
||||
android:text="@string/home_label_dynamic" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
@@ -86,7 +92,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="10sp"
|
||||
android:gravity="center"
|
||||
android:text="消息" />
|
||||
android:text="@string/home_label_chat" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
@@ -106,7 +112,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="10sp"
|
||||
android:gravity="center"
|
||||
android:text="我的" />
|
||||
android:text="@string/home_label_my" />
|
||||
</LinearLayout>
|
||||
</com.angcyo.tablayout.DslTabLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
<include
|
||||
android:id="@+id/include"
|
||||
android:layout_marginTop="@dimen/activity_top"
|
||||
layout="@layout/view_activity_title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="71dp"
|
||||
@@ -31,7 +32,7 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="21dp"
|
||||
android:text="打招呼文案"
|
||||
android:text="@string/greet_switch_title"
|
||||
android:textColor="#999999"
|
||||
android:textSize="14sp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
@@ -89,7 +90,7 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="9dp"
|
||||
android:text="上传图片(非必選)"
|
||||
android:text="@string/greet_upload_img"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/imageView5"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
@@ -119,7 +120,7 @@
|
||||
android:layout_height="42dp"
|
||||
android:layout_marginEnd="14dp"
|
||||
android:background="@drawable/bg_msg_greet_config_btn_cancel"
|
||||
android:text="清除设置"
|
||||
android:text="@string/greet_clear_config"
|
||||
android:textColor="#FFFFFF"
|
||||
android:textSize="16sp" />
|
||||
|
||||
@@ -128,7 +129,7 @@
|
||||
android:layout_width="118dp"
|
||||
android:layout_height="42dp"
|
||||
android:background="@drawable/bg_msg_greet_config_btn_apply"
|
||||
android:text="保存设置"
|
||||
android:text="@string/greet_save_config"
|
||||
android:textColor="#FFFFFF"
|
||||
|
||||
android:textSize="16sp" />
|
||||
|
||||
@@ -1,18 +1,19 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="110dp"
|
||||
android:layout_height="80dp"
|
||||
android:background="@mipmap/bg_msg_more"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/ll_config"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1"
|
||||
android:layout_gravity="start"
|
||||
android:layout_marginStart="14dp"
|
||||
android:layout_marginTop="20dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
@@ -35,11 +36,12 @@
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/ll_read"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_gravity="start"
|
||||
android:layout_marginStart="14dp"
|
||||
android:layout_marginTop="5dp"
|
||||
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
|
||||
@@ -2,11 +2,12 @@
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:background="#F7F7F7"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_height="wrap_content">
|
||||
android:layout_marginEnd="16dp"
|
||||
android:layout_marginBottom="20dp"
|
||||
android:background="#F7F7F7">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/constraintLayout"
|
||||
@@ -54,20 +55,31 @@
|
||||
|
||||
<TextView
|
||||
android:id="@+id/rc_conversation_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="100dp"
|
||||
android:layout_height="20dp"
|
||||
android:layout_marginStart="8dp"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"
|
||||
android:lines="6"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/constraintLayout"
|
||||
app:layout_constraintStart_toEndOf="@+id/constraintLayout"
|
||||
tools:text="@tools:sample/lorem[4:10]" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/separator"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:text="·"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/rc_conversation_content" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/rc_conversation_date"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="20dp"
|
||||
android:layout_marginStart="5dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/rc_conversation_content"
|
||||
app:layout_constraintStart_toEndOf="@+id/separator"
|
||||
tools:text="@tools:sample/date/hhmm" />
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
|
||||
@@ -1,4 +1,17 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="app_name">1v1</string>
|
||||
<string name="title_activity_tag_selection">选择活动</string>
|
||||
<string name="message_chat_tip1">【安全提示】為保障您的權益,慶提高警惕,不要輕易添加或提供第三方聯繫方式</string>
|
||||
<string name="system_tip_success">成功</string>
|
||||
<string name="system_tip_failure">失败</string>
|
||||
<string name="system_tip_error">错误</string>
|
||||
<string name="home_label_friends">交友</string>
|
||||
<string name="home_label_dynamic">动态</string>
|
||||
<string name="home_label_chat">消息</string>
|
||||
<string name="home_label_my">我的</string>
|
||||
<string name="greet_switch_title">打招呼文案</string>
|
||||
<string name="greet_upload_img">上传图片(非必選)</string>
|
||||
<string name="greet_clear_config">清除设置</string>
|
||||
<string name="greet_save_config">保存设置</string>
|
||||
</resources>
|
||||
@@ -1,4 +1,17 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="app_name">1v1</string>
|
||||
<string name="title_activity_tag_selection">选择活动</string>
|
||||
<string name="message_chat_tip1">【安全提示】為保障您的權益,慶提高警惕,不要輕易添加或提供第三方聯繫方式</string>
|
||||
<string name="system_tip_success">成功</string>
|
||||
<string name="system_tip_failure">失败</string>
|
||||
<string name="system_tip_error">错误</string>
|
||||
<string name="home_label_friends">交友</string>
|
||||
<string name="home_label_dynamic">动态</string>
|
||||
<string name="home_label_chat">消息</string>
|
||||
<string name="home_label_my">我的</string>
|
||||
<string name="greet_switch_title">打招呼文案</string>
|
||||
<string name="greet_upload_img">上传图片(非必選)</string>
|
||||
<string name="greet_clear_config">清除设置</string>
|
||||
<string name="greet_save_config">保存设置</string>
|
||||
</resources>
|
||||
4
OneToOne/src/main/res/values/dimens.xml
Normal file
4
OneToOne/src/main/res/values/dimens.xml
Normal file
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<dimen name="activity_top">42dp</dimen>
|
||||
</resources>
|
||||
@@ -1,4 +1,17 @@
|
||||
<resources>
|
||||
<string name="app_name">1v1</string>
|
||||
<string name="title_activity_tag_selection">TagSelection_Activity</string>
|
||||
<string name="message_chat_tip1">[Safety Tips]</string>
|
||||
<string name="system_tip_success">success</string>
|
||||
<string name="system_tip_failure">failure</string>
|
||||
<string name="system_tip_error">error</string>
|
||||
<string name="home_label_friends">Friends</string>
|
||||
<string name="home_label_dynamic">Dynamic</string>
|
||||
<string name="home_label_chat">Message</string>
|
||||
<string name="home_label_my">My</string>
|
||||
<string name="greet_switch_title">Greeting copy</string>
|
||||
<string name="greet_upload_img">Upload a picture (not required)</string>
|
||||
<string name="greet_clear_config">Clear Settings</string>
|
||||
<string name="greet_save_config">Save Settings</string>
|
||||
|
||||
</resources>
|
||||
Reference in New Issue
Block a user