Skip to content

B
beyond-clouds-android
Commit c6fd01dc by 胡学良
Options

优化页面结构

parent 403e5269
Showing with 126 additions and 80 deletions
app/src/main/AndroidManifest.xml
......@@ -12,11 +12,11 @@
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".ui.page.PublishQuestionActivity">
<!-- <intent-filter>-->
<!-- <action android:name="android.intent.action.MAIN" />-->
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<!-- <category android:name="android.intent.category.LAUNCHER" />-->
<!-- </intent-filter>-->
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:theme="@style/AppTheme.FullScreen"
......@@ -36,11 +36,11 @@
</activity>
<activity android:name=".ui.page.PublishBlogActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<!-- <intent-filter>-->
<!-- <action android:name="android.intent.action.MAIN" />-->
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<!-- <category android:name="android.intent.category.LAUNCHER" />-->
<!-- </intent-filter>-->
</activity>
<activity android:name=".ui.page.ProjectsActivity"></activity>
<activity android:name=".ui.page.FansActivity" />
......
app/src/main/java/cn/yunliyunwai/beyondclouds/ui/page/PublishQuestionActivity.java
......@@ -70,13 +70,13 @@ public class PublishQuestionActivity extends AppCompatActivity {
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
@Override
public void onTabSelected(TabLayout.Tab tab) {
tab.setText(getImageSpanSelected(tabImages.get(tab.getPosition())));
tab.setText(getImageSpanSelected(tabImages.get(tab.getPosition()), "#00aae6"));
}
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
@Override
public void onTabUnselected(TabLayout.Tab tab) {
tab.setText(getImageSpanUnSelected(tabImages.get(tab.getPosition())));
tab.setText(getImageSpanSelected(tabImages.get(tab.getPosition()), "#999999"));
}
@Override
......@@ -106,23 +106,19 @@ public class PublishQuestionActivity extends AppCompatActivity {
}
//点击头部图片时改变图片颜色
/**
* 点击头部图片时改变图片颜色
* 选中时：#00aae6
* 未选中时：#999999
* @param imageId 图片ID
* @param color 颜色
* @return
*/
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
private CharSequence getImageSpanSelected(int imageId) {
private CharSequence getImageSpanSelected(int imageId, String color) {
Drawable dImage = getResources().getDrawable(imageId);
dImage.setBounds(0, 0, dImage.getIntrinsicWidth()/2, dImage.getIntrinsicHeight()/2);
dImage.setTint(Color.parseColor("#00aae6"));
SpannableString sp = new SpannableString(" ");
ImageSpan imageSpan = new ImageSpan(dImage, ImageSpan.ALIGN_BOTTOM);
sp.setSpan(imageSpan, 0, 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
return sp;
}
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
private CharSequence getImageSpanUnSelected(int imageId) {
Drawable dImage = getResources().getDrawable(imageId);
dImage.setBounds(0, 0, dImage.getIntrinsicWidth()/2, dImage.getIntrinsicHeight()/2);
dImage.setTint(Color.parseColor("#999999"));
dImage.setTint(Color.parseColor(color));
SpannableString sp = new SpannableString(" ");
ImageSpan imageSpan = new ImageSpan(dImage, ImageSpan.ALIGN_BOTTOM);
sp.setSpan(imageSpan, 0, 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
......@@ -220,7 +216,8 @@ public class PublishQuestionActivity extends AppCompatActivity {
addMarkdownGrammar(createTable());
break;
case ORDERED_LIST:
addMarkdownGrammar("\n1. \n2. \n3.");
addMarkdownGrammar("\n1. \n2. \n3. ");
break;
default:
Log.d("msg", tag);
}
......@@ -238,11 +235,11 @@ public class PublishQuestionActivity extends AppCompatActivity {
binding.editTextQuestionContent.setSelection(binding.editTextQuestionContent.getText().toString().length());
}
/**
* 添加封面图的按钮点击事件
* 点击则进入手机系统相册
* @param view
*/
public void addCover(View view) {
PictureSelector. create(this)
.openGallery(PictureMimeType.ofImage())
......
app/src/main/res/layout/activity_publish_question.xml
......@@ -6,6 +6,28 @@
android:layout_height="match_parent"
tools:context=".ui.page.PublishQuestionActivity">
<View
android:id="@+id/page_tool_bar_cross_line"
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_marginTop="64dp"
android:background="#efefef"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<Button
android:layout_width="40dp"
android:layout_height="20dp"
android:text="预览"
android:textSize="15sp"
android:textColor="#00aae6"
android:padding="0dp"
android:background="@android:color/transparent"
app:layout_constraintEnd_toEndOf="@id/publish_question_right_guide_line"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/page_tool_bar_cross_line" />
<EditText
android:id="@+id/edit_text_question_title"
android:layout_width="0dp"
......@@ -15,10 +37,10 @@
android:textColor="#666666"
android:singleLine="true"
android:background="@null"
android:layout_marginTop="64dp"
android:layout_marginTop="20dp"
app:layout_constraintStart_toStartOf="@id/publish_question_left_guide_line"
app:layout_constraintEnd_toEndOf="@id/publish_question_right_guide_line"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toBottomOf="@id/page_tool_bar_cross_line"/>
<View
android:id="@+id/barrier_question_title_bottom"
......@@ -33,17 +55,17 @@
<EditText
android:id="@+id/edit_text_question_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="0dp"
android:hint="问题详情"
android:textSize="15sp"
android:textColor="#999999"
android:paddingTop="17dp"
android:background="@null"
android:lines="9"
android:gravity="top"
app:layout_constraintStart_toStartOf="@id/publish_question_left_guide_line"
app:layout_constraintEnd_toEndOf="@id/publish_question_right_guide_line"
app:layout_constraintTop_toBottomOf="@id/barrier_question_title_bottom"/>
app:layout_constraintTop_toBottomOf="@id/barrier_question_title_bottom"
app:layout_constraintBottom_toTopOf="@id/question_tool_bar"/>
<androidx.viewpager.widget.ViewPager
android:id="@+id/question_tool_bar"
......@@ -51,7 +73,8 @@
android:layout_height="0dp"
android:background="#efefef"
app:layout_constraintTop_toBottomOf="@id/edit_text_question_content"
app:layout_constraintBottom_toBottomOf="parent">
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHeight_percent="0.5457">
<com.google.android.material.tabs.TabLayout
android:id="@+id/question_tab_layout"
......
app/src/main/res/layout/fragment_font.xml
......@@ -9,12 +9,14 @@
<!-- Markdown字体按钮区域 start -->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/font_button_area"
android:layout_width="310dp"
android:layout_height="40dp"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="20dp"
android:background="@drawable/markdown_button_area"
app:layout_constraintStart_toStartOf="@id/font_fragment_left_guide_line"
app:layout_constraintTop_toTopOf="parent">
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_percent="0.747"
app:layout_constraintHeight_percent="0.125">
<ImageButton
android:id="@+id/button_font_bold"
......@@ -110,26 +112,29 @@
<!-- Markdown字体按钮区域 end -->
<Button
android:layout_width="60dp"
android:layout_height="40dp"
android:layout_width="0dp"
android:layout_height="0dp"
android:text="重置"
android:textColor="#999999"
android:textSize="12sp"
android:background="@drawable/markdown_button_area"
android:layout_marginTop="20dp"
android:stateListAnimator="@null"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="@id/font_fragment_right_guide_line" />
app:layout_constraintTop_toTopOf="@id/font_button_area"
app:layout_constraintBottom_toBottomOf="@id/font_button_area"
app:layout_constraintEnd_toEndOf="@id/font_fragment_right_guide_line"
app:layout_constraintWidth_percent="0.16" />
<!-- Markdown标题按钮区域 start -->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/title_button_area"
android:layout_width="310dp"
android:layout_height="40dp"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="20dp"
android:background="@drawable/markdown_button_area"
app:layout_constraintTop_toBottomOf="@id/font_button_area"
app:layout_constraintStart_toStartOf="@id/font_fragment_left_guide_line">
app:layout_constraintStart_toStartOf="@id/font_fragment_left_guide_line"
app:layout_constraintWidth_percent="0.747"
app:layout_constraintHeight_percent="0.125">
<ImageButton
android:id="@+id/button_h1"
......@@ -226,25 +231,28 @@
<!-- Markdown标题按钮区域 end -->
<Button
android:layout_width="60dp"
android:layout_height="40dp"
android:layout_width="0dp"
android:layout_height="0dp"
android:text="正文"
android:textColor="#00aae6"
android:textSize="12sp"
android:background="@drawable/markdown_button_area"
android:stateListAnimator="@null"
app:layout_constraintTop_toTopOf="@id/title_button_area"
app:layout_constraintEnd_toEndOf="@id/font_fragment_right_guide_line" />
app:layout_constraintBottom_toBottomOf="@id/title_button_area"
app:layout_constraintEnd_toEndOf="@id/font_fragment_right_guide_line"
app:layout_constraintWidth_percent="0.16"/>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/first_color_area"
android:layout_width="0dp"
android:layout_height="40dp"
android:layout_height="0dp"
android:layout_marginTop="20dp"
android:background="@drawable/markdown_button_area"
app:layout_constraintStart_toStartOf="@id/font_fragment_left_guide_line"
app:layout_constraintEnd_toEndOf="@id/font_fragment_right_guide_line"
app:layout_constraintTop_toBottomOf="@id/title_button_area">
app:layout_constraintTop_toBottomOf="@id/title_button_area"
app:layout_constraintHeight_percent="0.125">
<Button
android:id="@+id/button_color_000000"
......@@ -339,12 +347,13 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/second_color_area"
android:layout_width="0dp"
android:layout_height="40dp"
android:layout_height="0dp"
android:layout_marginTop="20dp"
android:background="@drawable/markdown_button_area"
app:layout_constraintStart_toStartOf="@id/font_fragment_left_guide_line"
app:layout_constraintEnd_toEndOf="@id/font_fragment_right_guide_line"
app:layout_constraintTop_toBottomOf="@id/first_color_area">
app:layout_constraintTop_toBottomOf="@id/first_color_area"
app:layout_constraintHeight_percent="0.125">
<Button
android:id="@+id/button_color_ffffff"
......@@ -439,12 +448,13 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/third_color_area"
android:layout_width="0dp"
android:layout_height="40dp"
android:layout_height="0dp"
android:layout_marginTop="20dp"
android:background="@drawable/markdown_button_area"
app:layout_constraintStart_toStartOf="@id/font_fragment_left_guide_line"
app:layout_constraintEnd_toEndOf="@id/font_fragment_right_guide_line"
app:layout_constraintTop_toBottomOf="@id/second_color_area">
app:layout_constraintTop_toBottomOf="@id/second_color_area"
app:layout_constraintHeight_percent="0.125">
<Button
android:id="@+id/button_color_f5f8fa"
......
app/src/main/res/layout/fragment_more.xml
......@@ -9,12 +9,14 @@
<!-- 分割线 start -->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cross_line"
android:layout_width="185dp"
android:layout_height="40dp"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@drawable/markdown_button_area"
android:layout_marginTop="20dp"
app:layout_constraintStart_toStartOf="@id/more_fragment_left_guide_line"
app:layout_constraintTop_toTopOf="parent">
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_percent="0.459"
app:layout_constraintHeight_percent="0.125">
<Button
android:layout_width="match_parent"
......@@ -50,12 +52,14 @@
<!-- 分割虚线 start -->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cross_hidden_line"
android:layout_width="185dp"
android:layout_height="40dp"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@drawable/markdown_button_area"
android:layout_marginTop="20dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="@id/more_fragment_right_guide_line">
app:layout_constraintEnd_toEndOf="@id/more_fragment_right_guide_line"
app:layout_constraintWidth_percent="0.459"
app:layout_constraintHeight_percent="0.125">
<View
android:layout_width="10dp"
......@@ -109,8 +113,8 @@
<!-- 超链接 start -->
<Button
android:layout_width="86dp"
android:layout_height="40dp"
android:layout_width="0dp"
android:layout_height="0dp"
android:text="超链接"
android:textSize="12sp"
android:textColor="#999999"
......@@ -118,13 +122,15 @@
android:stateListAnimator="@null"
android:background="@drawable/markdown_button_area"
app:layout_constraintTop_toBottomOf="@id/cross_line"
app:layout_constraintStart_toStartOf="@id/more_fragment_left_guide_line" />
app:layout_constraintStart_toStartOf="@id/more_fragment_left_guide_line"
app:layout_constraintWidth_percent="0.219"
app:layout_constraintHeight_percent="0.125"/>
<!-- 超链接 end -->
<!-- 代码块 start -->
<Button
android:layout_width="86dp"
android:layout_height="40dp"
android:layout_width="0dp"
android:layout_height="0dp"
android:tag="CODE_BLOCK"
android:text="代码块"
android:textSize="12sp"
......@@ -135,18 +141,22 @@
android:background="@drawable/markdown_button_area"
app:layout_constraintTop_toBottomOf="@id/cross_line"
app:layout_constraintEnd_toEndOf="@id/cross_line"
tools:ignore="OnClick" />
tools:ignore="OnClick"
app:layout_constraintWidth_percent="0.219"
app:layout_constraintHeight_percent="0.125"/>
<!-- 代码块 end -->
<!-- 表格 start -->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/form_area"
android:layout_width="185dp"
android:layout_height="40dp"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="20dp"
android:background="@drawable/markdown_button_area"
app:layout_constraintTop_toBottomOf="@id/cross_hidden_line"
app:layout_constraintEnd_toEndOf="@id/more_fragment_right_guide_line">
app:layout_constraintEnd_toEndOf="@id/more_fragment_right_guide_line"
app:layout_constraintWidth_percent="0.459"
app:layout_constraintHeight_percent="0.125">
<EditText
android:id="@+id/edit_text_form_row"
......@@ -210,8 +220,8 @@
<!-- 添加封面图 start -->
<Button
android:id="@+id/button_add_cover"
android:layout_width="185dp"
android:layout_height="120dp"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="20dp"
android:text="添加封面图"
android:textSize="12sp"
......@@ -221,7 +231,9 @@
android:background="@drawable/markdown_button_area"
app:layout_constraintTop_toBottomOf="@id/form_area"
app:layout_constraintStart_toStartOf="@id/more_fragment_left_guide_line"
tools:ignore="OnClick" />
tools:ignore="OnClick"
app:layout_constraintWidth_percent="0.459"
app:layout_constraintHeight_percent="0.346386"/>
<!-- 添加封面图 end -->
<androidx.constraintlayout.widget.Guideline
......
app/src/main/res/layout/fragment_other.xml
......@@ -7,13 +7,15 @@
tools:context=".ui.page.OtherFragment">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="250dp"
android:layout_height="40dp"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="4dp"
android:layout_marginTop="20dp"
android:background="@drawable/markdown_button_area"
app:layout_constraintStart_toStartOf="@id/other_fragment_left_guide_line"
app:layout_constraintTop_toTopOf="parent">
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_percent="0.587"
app:layout_constraintHeight_percent="0.125">
<ImageButton
android:id="@+id/button_align_left"
......@@ -54,12 +56,14 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="120dp"
android:layout_height="40dp"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="20dp"
android:background="@drawable/markdown_button_area"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="@id/other_fragment_right_guide_line">
app:layout_constraintEnd_toEndOf="@id/other_fragment_right_guide_line"
app:layout_constraintWidth_percent="0.32"
app:layout_constraintHeight_percent="0.125">
<ImageButton
android:id="@+id/button_ordered_list"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment