diff --git a/android/app/src/main/java/com/hyzq/boss/BossUi.java b/android/app/src/main/java/com/hyzq/boss/BossUi.java index b588fc2..27f5b93 100644 --- a/android/app/src/main/java/com/hyzq/boss/BossUi.java +++ b/android/app/src/main/java/com/hyzq/boss/BossUi.java @@ -1145,6 +1145,7 @@ public final class BossUi { TextView kindView = new TextView(context); kindView.setText(kindLabel); kindView.setTextSize(11); + kindView.setIncludeFontPadding(false); kindView.setTypeface(Typeface.DEFAULT_BOLD); kindView.setTextColor(context.getColor(outgoing ? R.color.boss_surface : R.color.boss_text_muted)); kindView.setPadding(0, 0, 0, dp(context, 6)); @@ -1154,7 +1155,8 @@ public final class BossUi { TextView bodyView = new TextView(context); bodyView.setText(BossMarkdown.render(context, body, outgoing)); bodyView.setTextSize(14); - bodyView.setLineSpacing(0f, 1.34f); + bodyView.setIncludeFontPadding(false); + bodyView.setLineSpacing(0f, 1.26f); bodyView.setTextColor(context.getColor(outgoing ? R.color.boss_surface : R.color.boss_text_primary)); bodyView.setMaxWidth(maxBubbleWidth); bodyView.setBreakStrategy(Layout.BREAK_STRATEGY_HIGH_QUALITY); @@ -2275,6 +2277,7 @@ public final class BossUi { String metaText = buildMessageMetaText(senderLabel, meta, outgoing); metaView.setText(metaText); metaView.setTextSize(11); + metaView.setIncludeFontPadding(false); metaView.setTextColor(context.getColor(R.color.boss_text_soft)); metaView.setPadding(dp(context, 6), 0, dp(context, 6), dp(context, 4)); wrapper.addView(metaView); @@ -2472,6 +2475,7 @@ public final class BossUi { String metaText = buildMessageMetaText(senderLabel, meta, outgoing); metaView.setText(metaText); metaView.setTextSize(11); + metaView.setIncludeFontPadding(false); metaView.setTextColor(context.getColor(R.color.boss_text_soft)); metaView.setPadding(dp(context, 6), 0, dp(context, 6), dp(context, 4)); wrapper.addView(metaView); diff --git a/android/app/src/main/java/com/hyzq/boss/ProjectDetailActivity.java b/android/app/src/main/java/com/hyzq/boss/ProjectDetailActivity.java index b719e54..596536e 100644 --- a/android/app/src/main/java/com/hyzq/boss/ProjectDetailActivity.java +++ b/android/app/src/main/java/com/hyzq/boss/ProjectDetailActivity.java @@ -1333,16 +1333,16 @@ public class ProjectDetailActivity extends BossScreenActivity { private Button buildQuickActionButton(String label, boolean highlight) { Button button = new Button(this); - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(0, BossUi.dp(this, 40), 1f); + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(0, BossUi.dp(this, 36), 1f); if (quickActionsLayout.getChildCount() > 0) { - params.leftMargin = BossUi.dp(this, 8); + params.leftMargin = BossUi.dp(this, 6); } button.setLayoutParams(params); button.setMinWidth(0); button.setText(label); - button.setTextSize(14); + button.setTextSize(13); button.setAllCaps(false); - button.setPadding(BossUi.dp(this, 12), 0, BossUi.dp(this, 12), 0); + button.setPadding(BossUi.dp(this, 10), 0, BossUi.dp(this, 10), 0); button.setBackgroundResource(highlight ? R.drawable.bg_primary_button : R.drawable.bg_secondary_button); button.setTextColor(getColor(highlight ? R.color.boss_surface : R.color.boss_text_primary)); return button; diff --git a/android/app/src/main/res/layout/activity_conversation_info.xml b/android/app/src/main/res/layout/activity_conversation_info.xml index 72f6f44..addcddd 100644 --- a/android/app/src/main/res/layout/activity_conversation_info.xml +++ b/android/app/src/main/res/layout/activity_conversation_info.xml @@ -37,8 +37,11 @@ diff --git a/android/app/src/main/res/layout/activity_forward_target.xml b/android/app/src/main/res/layout/activity_forward_target.xml index e1202bf..e52aab2 100644 --- a/android/app/src/main/res/layout/activity_forward_target.xml +++ b/android/app/src/main/res/layout/activity_forward_target.xml @@ -37,8 +37,11 @@ diff --git a/android/app/src/main/res/layout/activity_group_create.xml b/android/app/src/main/res/layout/activity_group_create.xml index 81aa0c2..e9a530f 100644 --- a/android/app/src/main/res/layout/activity_group_create.xml +++ b/android/app/src/main/res/layout/activity_group_create.xml @@ -37,8 +37,11 @@ diff --git a/android/app/src/main/res/layout/activity_group_info.xml b/android/app/src/main/res/layout/activity_group_info.xml index 1e655e3..f956f2e 100644 --- a/android/app/src/main/res/layout/activity_group_info.xml +++ b/android/app/src/main/res/layout/activity_group_info.xml @@ -37,8 +37,11 @@ diff --git a/android/app/src/main/res/layout/activity_project_chat.xml b/android/app/src/main/res/layout/activity_project_chat.xml index 5f6dbc6..d03161f 100644 --- a/android/app/src/main/res/layout/activity_project_chat.xml +++ b/android/app/src/main/res/layout/activity_project_chat.xml @@ -40,6 +40,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:ellipsize="end" + android:includeFontPadding="false" android:maxLines="1" android:text="项目详情" android:textColor="@color/boss_text_primary" @@ -48,9 +49,12 @@ @@ -103,9 +107,9 @@ android:background="@color/boss_bg_app" android:orientation="vertical" android:paddingLeft="12dp" - android:paddingTop="10dp" + android:paddingTop="8dp" android:paddingRight="12dp" - android:paddingBottom="12dp"> + android:paddingBottom="8dp"> + android:paddingBottom="10dp"> @@ -199,23 +203,25 @@ android:hint="输入消息" android:inputType="textCapSentences|textMultiLine" android:maxLines="4" - android:minHeight="44dp" - android:paddingLeft="14dp" - android:paddingTop="10dp" - android:paddingRight="14dp" - android:paddingBottom="10dp" + android:minHeight="40dp" + android:paddingLeft="12dp" + android:paddingTop="8dp" + android:paddingRight="12dp" + android:paddingBottom="8dp" android:textColor="@color/boss_text_primary" - android:textColorHint="@color/boss_text_muted" /> + android:textColorHint="@color/boss_text_muted" + android:textSize="14sp" />