psq5hzxpo
/
git-test
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Labels Milestones
New Pull Request

更改修改背景颜色，插入图片，提取图片文字的ui图标，修改富文本编辑的加粗，斜体，下划线，字体颜色，字体背景颜色ui图标 #26

Merged
psq5hzxpo merged 2 commits from luhaozhe_branch into master 4 weeks ago
Conversation 0 Commits 2 Files Changed 13
13 changed files with 110 additions and 90 deletions
Show Stats Download Patch File Download Diff File

47
src/main/res/drawable/bg_btn_extract_image.xml
Unescape View File

@ -0,0 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<layer-list>
<item>
<shape android:shape="rectangle">
<solid android:color="#F5F5F5" />
<corners android:radius="4dp" />
<stroke android:width="1dp" android:color="#BDBDBD" />
</shape>
</item>
<item android:gravity="center">
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#F57C00"
android:pathData="M7,4L5,4L5,6L7,6L7,4ZM19,4L17,4L17,6L19,6L19,4ZM6,5L6,7L4,7L4,5L6,5ZM18,5L18,7L20,7L20,5L18,5ZM4,8L6,8L6,16L4,16L4,8ZM20,8L18,8L18,16L20,16L20,8ZM7,18L5,18L5,20L7,20L7,18ZM19,18L17,18L17,20L19,20L19,18ZM12,8L8,12L12,16L16,12L12,8ZM12,10L14,12L12,14L10,12L12,10Z"/>
</vector>
</item>
</layer-list>
</item>
<item>
<layer-list>
<item>
<shape android:shape="rectangle">
<solid android:color="#FFFFFF" />
<corners android:radius="4dp" />
<stroke android:width="1dp" android:color="#E0E0E0" />
</shape>
</item>
<item android:gravity="center">
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF9800"
android:pathData="M7,4L5,4L5,6L7,6L7,4ZM19,4L17,4L17,6L19,6L19,4ZM6,5L6,7L4,7L4,5L6,5ZM18,5L18,7L20,7L20,5L18,5ZM4,8L6,8L6,16L4,16L4,8ZM20,8L18,8L18,16L20,16L20,8ZM7,18L5,18L5,20L7,20L7,18ZM19,18L17,18L17,20L19,20L19,18ZM12,8L8,12L12,16L16,12L12,8ZM12,10L14,12L12,14L10,12L12,10Z"/>
</vector>
</item>
</layer-list>
</item>
</selector>

BIN
src/main/res/drawable/bn_btn_extract_image.jpg
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.6 KiB

3
src/main/res/drawable/ic_format_bold.xml
Unescape View File

@ -1,3 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:fillColor="#000000" android:pathData="M6,5v14h2V5H6zm5,0v14h2V5h-2zm5,0v14h2V5h-2z"/>
</vector>

BIN
src/main/res/drawable/ic_format_color_bold.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 733 B

BIN
src/main/res/drawable/ic_format_color_fill.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 848 B

4
src/main/res/drawable/ic_format_color_fill.xml
Unescape View File

@ -1,4 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:fillColor="#FFFF00" android:pathData="M6,5h12v14H6V5z"/>
<path android:fillColor="#000000" android:pathData="M8,7h8v10H8V7z"/>
</vector>

BIN
src/main/res/drawable/ic_format_color_text.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 726 B

4
src/main/res/drawable/ic_format_color_text.xml
Unescape View File

@ -1,4 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:fillColor="#000000" android:pathData="M6,5v14h2V5H6zm5,0v14h2V5h-2zm5,0v14h2V5h-2z"/>
<path android:fillColor="#FF0000" android:pathData="M12,3v2h8V3H12zm0,18h8v-2h-8v2z"/>
</vector>

BIN
src/main/res/drawable/ic_format_italic.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 614 B

3
src/main/res/drawable/ic_format_italic.xml
Unescape View File

@ -1,3 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:fillColor="#000000" android:pathData="M10,5v14l-5-7l5-7z"/>
</vector>

BIN
src/main/res/drawable/ic_format_underlined.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 597 B

3
src/main/res/drawable/ic_format_underlined.xml
Unescape View File

@ -1,3 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:fillColor="#000000" android:pathData="M6,5h12v2H6V5zm0,10h12v2H6V15z"/>
</vector>

136
src/main/res/layout/note_edit.xml
Unescape View File

@ -33,7 +33,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/surface"
android:padding="8dp"
android:padding="1dp"
android:elevation="4dp"
android:gravity="center_vertical">
@ -43,7 +43,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="left|center_vertical"
android:layout_marginRight="8dip"
android:layout_marginRight="4dip"
android:textAppearance="@style/TextAppearanceSecondaryItem" />
<ImageView
@ -59,67 +59,62 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="2dip"
android:layout_marginRight="8dip"
android:layout_marginRight="4dip"
android:textAppearance="@style/TextAppearanceSecondaryItem" />
<ImageButton
android:id="@+id/btn_undo"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_width="28dp"
android:layout_height="28dp"
android:layout_gravity="center"
android:background="@android:color/transparent"
android:padding="8dp"
android:padding="3dp"
android:contentDescription="@string/menu_undo"
android:src="@drawable/ic_undo"
android:tint="@color/onSurface"
android:alpha="0.8" />
<ImageButton
android:id="@+id/btn_redo"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_width="28dp"
android:layout_height="28dp"
android:layout_gravity="center"
android:layout_marginLeft="8dp"
android:layout_marginLeft="4dp"
android:background="@android:color/transparent"
android:padding="8dp"
android:padding="3dp"
android:contentDescription="@string/menu_redo"
android:src="@drawable/ic_redo"
android:tint="@color/onSurface"
android:alpha="0.8" />
<ImageButton
android:id="@+id/btn_set_bg_color"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_width="28dp"
android:layout_height="28dp"
android:layout_gravity="center"
android:layout_marginLeft="8dp"
android:background="@android:color/transparent"
android:padding="8dp"
android:layout_marginLeft="4dp"
android:background="@drawable/bg_btn_set_color"
android:padding="3dp"
android:contentDescription="设置背景颜色"
android:src="@drawable/ic_format_color_fill"
android:tint="@color/primary" />
android:alpha="0.8" />
<ImageButton
android:id="@+id/add_img_btn"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_width="28dp"
android:layout_height="28dp"
android:layout_gravity="center"
android:layout_marginLeft="8dp"
android:background="@android:color/transparent"
android:padding="8dp"
android:layout_marginLeft="4dp"
android:background="@drawable/bg_btn_insert_image"
android:padding="3dp"
android:contentDescription="@string/menu_insert_image"
android:src="@android:drawable/ic_menu_camera"
android:tint="@color/onSurface"
android:alpha="0.8" />
<ImageButton
android:id="@+id/extract_img_btn"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_width="28dp"
android:layout_height="28dp"
android:layout_gravity="center"
android:layout_marginLeft="8dp"
android:layout_marginRight="4dp"
android:background="@android:color/transparent"
android:padding="8dp"
android:layout_marginLeft="4dp"
android:layout_marginRight="1dp"
android:background="@drawable/bn_btn_extract_image"
android:padding="3dp"
android:contentDescription="提取图片内容"
android:src="@android:drawable/ic_menu_camera"
android:tint="@color/onSurface"
android:alpha="0.8" />
</LinearLayout>
@ -129,13 +124,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="16dp"
android:padding="12dp"
android:background="@color/surface">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="4dp">
android:padding="2dp">
<EditText
android:id="@+id/et_title"
android:layout_width="0dip"
@ -143,10 +138,10 @@
android:layout_weight="1"
android:hint="@string/note_title_placeholder"
android:maxLength="50"
android:textSize="20sp"
android:textSize="18sp"
android:textColor="@color/onSurface"
android:background="@null"
android:padding="8dp"
android:padding="6dp"
android:singleLine="true"
android:fontFamily="sans-serif-medium" />
<TextView
@ -154,10 +149,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0/50"
android:textSize="14sp"
android:textSize="12sp"
android:textColor="@color/onSurface"
android:alpha="0.6"
android:layout_marginLeft="8dp"
android:layout_marginLeft="6dp"
android:gravity="center_vertical" />
</LinearLayout>
<View
@ -172,73 +167,68 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="8dp"
android:padding="2dp"
android:background="@color/surface"
android:elevation="2dp">
<!-- 加粗按钮 -->
<ImageButton
android:id="@+id/btn_bold"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_gravity="center"
android:background="@android:color/transparent"
android:padding="12dp"
android:background="@drawable/ic_format_color_bold"
android:padding="3dp"
android:contentDescription="@string/menu_bold"
android:src="@drawable/ic_format_bold"
android:tint="@color/onSurface" />
android:alpha="0.8" />
<!-- 斜体按钮 -->
<ImageButton
android:id="@+id/btn_italic"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_gravity="center"
android:layout_marginLeft="8dp"
android:background="@android:color/transparent"
android:padding="12dp"
android:layout_marginLeft="4dp"
android:background="@drawable/ic_format_italic"
android:padding="3dp"
android:contentDescription="@string/menu_italic"
android:src="@drawable/ic_format_italic"
android:tint="@color/onSurface" />
android:alpha="0.8" />
<!-- 下划线按钮 -->
<ImageButton
android:id="@+id/btn_underline"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_gravity="center"
android:layout_marginLeft="8dp"
android:background="@android:color/transparent"
android:padding="12dp"
android:layout_marginLeft="4dp"
android:background="@drawable/ic_format_underlined"
android:padding="3dp"
android:contentDescription="@string/menu_underline"
android:src="@drawable/ic_format_underlined"
android:tint="@color/onSurface" />
android:alpha="0.8" />
<!-- 文本颜色按钮 -->
<ImageButton
android:id="@+id/btn_text_color"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_gravity="center"
android:layout_marginLeft="8dp"
android:background="@android:color/transparent"
android:padding="12dp"
android:layout_marginLeft="4dp"
android:background="@drawable/ic_format_color_text"
android:padding="3dp"
android:contentDescription="@string/menu_text_color"
android:src="@drawable/ic_format_color_text"
android:tint="@color/onSurface" />
android:alpha="0.8" />
<!-- 高亮按钮 -->
<ImageButton
android:id="@+id/btn_highlight"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_gravity="center"
android:layout_marginLeft="8dp"
android:background="@android:color/transparent"
android:padding="12dp"
android:layout_marginLeft="4dp"
android:background="@drawable/ic_format_color_fill"
android:padding="3dp"
android:contentDescription="@string/menu_highlight"
android:src="@drawable/ic_format_color_fill"
android:tint="@color/onSurface" />
android:alpha="0.8" />
</LinearLayout>
<LinearLayout

Write Preview
Loading…
Cancel
Save