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

UI界面优化

Browse Source
pull/24/head
whale 4 weeks ago
parent fd4af0874c
commit f03343434e
9 changed files with 450 additions and 411 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/net/micode/notes/ui/NoteEditActivity.java
Unescape View File

@ -123,7 +123,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
public ImageView ibSetBgColor; // 设置背景色按钮
public ImageButton ibInsertImage; // 插入图片按钮
public ImageButton ibExtractImage; // 提取图片内容按钮
public TextView tvTitleHint; // 标题提示文字
public EditText etTitle; // 标题输入框
public TextView tvTitleCount; // 字符数提示
public View titleArea; // 标题区域
@ -600,7 +599,6 @@ public class NoteEditActivity extends Activity implements OnClickListener,
mNoteHeaderHolder.ibInsertImage.setOnClickListener(this);
mNoteHeaderHolder.ibExtractImage = (ImageButton) findViewById(R.id.extract_img_btn);
mNoteHeaderHolder.ibExtractImage.setOnClickListener(this);
mNoteHeaderHolder.tvTitleHint = (TextView) findViewById(R.id.tv_title_hint);
mNoteHeaderHolder.etTitle = (EditText) findViewById(R.id.et_title);
mNoteHeaderHolder.etTitle.addTextChangedListener(new TextWatcher() {
@Override

106
src/main/java/net/micode/notes/ui/NotesListActivity.java
Unescape View File

@ -1049,12 +1049,14 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
} else {
mState = ListEditState.SUB_FOLDER;
}
if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {
mTitleBar.setText(R.string.call_record_folder_name);
} else {
mTitleBar.setText(data.getSnippet());
if (mTitleBar != null) {
if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {
mTitleBar.setText(R.string.call_record_folder_name);
} else {
mTitleBar.setText(data.getSnippet());
}
mTitleBar.setVisibility(View.VISIBLE);
}
mTitleBar.setVisibility(View.VISIBLE);
}
public void onClick(View v) {
@ -1074,15 +1076,23 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
private void updatePrivacySpaceUI() {
if (!TextUtils.isEmpty(mCurrentPrivacySpaceId)) {
// 在隐私空间中，显示隐私空间名称
mTitleBar.setText("隐私空间");
mTitleBar.setVisibility(View.VISIBLE);
if (mTitleBar != null) {
mTitleBar.setText("隐私空间");
mTitleBar.setVisibility(View.VISIBLE);
}
// 显示隐私空间返回按钮
mPrivacyBackButton.setVisibility(View.VISIBLE);
if (mPrivacyBackButton != null) {
mPrivacyBackButton.setVisibility(View.VISIBLE);
}
} else {
// 不在隐私空间中，隐藏标题栏或显示默认标题
mTitleBar.setVisibility(View.GONE);
if (mTitleBar != null) {
mTitleBar.setVisibility(View.GONE);
}
// 隐藏隐私空间返回按钮
mPrivacyBackButton.setVisibility(View.GONE);
if (mPrivacyBackButton != null) {
mPrivacyBackButton.setVisibility(View.GONE);
}
}
}
@ -1189,33 +1199,61 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
switch (mState) {
case SUB_FOLDER:
// 查询当前文件夹的父文件夹ID
Cursor cursor = mContentResolver.query(
Notes.CONTENT_NOTE_URI,
new String[] { NoteColumns.PARENT_ID, NoteColumns.SNIPPET },
NoteColumns.ID + "=?",
new String[] { String.valueOf(mCurrentFolderId) },
null
);
if (cursor != null && cursor.moveToFirst()) {
long parentId = cursor.getLong(0);
String folderName = cursor.getString(1);
cursor.close();
Cursor cursor = null;
try {
cursor = mContentResolver.query(
Notes.CONTENT_NOTE_URI,
new String[] { NoteColumns.PARENT_ID, NoteColumns.SNIPPET },
NoteColumns.ID + "=?",
new String[] { String.valueOf(mCurrentFolderId) },
null
);
if (parentId == Notes.ID_ROOT_FOLDER) {
// 返回到根文件夹
if (cursor != null && cursor.moveToFirst()) {
long parentId = cursor.getLong(0);
String folderName = cursor.getString(1);
if (parentId == Notes.ID_ROOT_FOLDER) {
// 返回到根文件夹
mCurrentFolderId = Notes.ID_ROOT_FOLDER;
mState = ListEditState.NOTE_LIST;
if (mTitleBar != null) {
mTitleBar.setVisibility(View.GONE);
}
} else {
// 返回到上一级文件夹
mCurrentFolderId = parentId;
mState = ListEditState.SUB_FOLDER;
if (mTitleBar != null) {
mTitleBar.setText(folderName);
mTitleBar.setVisibility(View.VISIBLE);
}
}
} else {
// 如果查询失败，默认返回到根文件夹
mCurrentFolderId = Notes.ID_ROOT_FOLDER;
mState = ListEditState.NOTE_LIST;
if (mTitleBar != null) {
mTitleBar.setVisibility(View.GONE);
}
}
} catch (Exception e) {
// 捕获异常，防止崩溃
e.printStackTrace();
// 发生异常时，默认返回到根文件夹
mCurrentFolderId = Notes.ID_ROOT_FOLDER;
mState = ListEditState.NOTE_LIST;
if (mTitleBar != null) {
mTitleBar.setVisibility(View.GONE);
} else {
// 返回到上一级文件夹
mCurrentFolderId = parentId;
mState = ListEditState.SUB_FOLDER;
mTitleBar.setText(folderName);
mTitleBar.setVisibility(View.VISIBLE);
}
} else if (cursor != null) {
cursor.close();
} finally {
if (cursor != null) {
try {
cursor.close();
} catch (Exception e) {
e.printStackTrace();
}
}
}
startAsyncNotesListQuery();
@ -1224,7 +1262,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
mCurrentFolderId = Notes.ID_ROOT_FOLDER;
mState = ListEditState.NOTE_LIST;
mAddNewNote.setVisibility(View.VISIBLE);
mTitleBar.setVisibility(View.GONE);
if (mTitleBar != null) {
mTitleBar.setVisibility(View.GONE);
}
startAsyncNotesListQuery();
break;
case NOTE_LIST:

17
src/main/res/anim/btn_add_note_elevation.xml
Unescape View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<objectAnimator
android:duration="100"
android:propertyName="elevation"
android:valueTo="4dp"
android:valueType="floatType" />
</item>
<item android:state_enabled="true">
<objectAnimator
android:duration="100"
android:propertyName="elevation"
android:valueTo="8dp"
android:valueType="floatType" />
</item>
</selector>

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

@ -16,22 +16,26 @@
-->
<FrameLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@drawable/list_background"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background"
android:fitsSystemWindows="true"
android:paddingTop="24dp"
xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<!-- 顶部工具栏 -->
<LinearLayout
android:id="@+id/note_title"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/surface"
android:padding="8dp"
android:elevation="4dp"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_modified_date"
@ -60,72 +64,78 @@
<ImageButton
android:id="@+id/btn_undo"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center"
android:background="@drawable/bg_btn_set_color"
android:padding="12dp"
android:background="@android:color/transparent"
android:padding="8dp"
android:contentDescription="@string/menu_undo"
android:src="@drawable/ic_undo" />
android:src="@drawable/ic_undo"
android:tint="@color/onSurface"
android:alpha="0.8" />
<ImageButton
android:id="@+id/btn_redo"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center"
android:layout_marginLeft="8dp"
android:background="@drawable/bg_btn_set_color"
android:padding="12dp"
android:background="@android:color/transparent"
android:padding="8dp"
android:contentDescription="@string/menu_redo"
android:src="@drawable/ic_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="48dp"
android:layout_height="48dp"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center"
android:layout_marginLeft="8dp"
android:background="@drawable/bg_btn_set_color"
android:padding="12dp" />
android:background="@android:color/transparent"
android:padding="8dp"
android:contentDescription="设置背景颜色"
android:src="@drawable/ic_format_color_fill"
android:tint="@color/primary" />
<ImageButton
android:id="@+id/add_img_btn"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center"
android:layout_marginLeft="8dp"
android:background="@drawable/bg_btn_insert_image"
android:background="@android:color/transparent"
android:padding="8dp"
android:contentDescription="@string/menu_insert_image"
android:padding="12dp" />
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="48dp"
android:layout_height="48dp"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center"
android:layout_marginLeft="8dp"
android:background="@drawable/bg_btn_insert_image"
android:layout_marginRight="4dp"
android:background="@android:color/transparent"
android:padding="8dp"
android:contentDescription="提取图片内容"
android:padding="12dp"
android:src="@drawable/ic_insert_image" />
android:src="@android:drawable/ic_menu_camera"
android:tint="@color/onSurface"
android:alpha="0.8" />
</LinearLayout>
<!-- 标题编辑区域 -->
<LinearLayout
android:id="@+id/note_title_area"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="8dp"
android:background="@android:color/transparent">
android:padding="16dp"
android:background="@color/surface">
<LinearLayout
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="4dp">
<TextView
android:id="@+id/tv_title_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/note_title_hint"
android:textSize="12sp"
android:textColor="#999999"
android:layout_marginRight="8dp" />
<EditText
android:id="@+id/et_title"
android:layout_width="0dip"
@ -133,34 +143,38 @@
android:layout_weight="1"
android:hint="@string/note_title_placeholder"
android:maxLength="50"
android:textSize="18sp"
android:textColor="#333333"
android:textSize="20sp"
android:textColor="@color/onSurface"
android:background="@null"
android:padding="8dp"
android:singleLine="true" />
android:singleLine="true"
android:fontFamily="sans-serif-medium" />
<TextView
android:id="@+id/tv_title_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0/50"
android:textSize="12sp"
android:textColor="#999999"
android:layout_marginLeft="8dp" />
android:textSize="14sp"
android:textColor="@color/onSurface"
android:alpha="0.6"
android:layout_marginLeft="8dp"
android:gravity="center_vertical" />
</LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#E0E0E0" />
android:background="@color/divider_color" />
</LinearLayout>
<!-- 富文本格式化工具栏 -->
<LinearLayout
android:id="@+id/rich_text_toolbar"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="4dp"
android:background="#F5F5F5">
android:padding="8dp"
android:background="@color/surface"
android:elevation="2dp">
<!-- 加粗按钮 -->
<ImageButton
@ -168,10 +182,11 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_gravity="center"
android:background="@drawable/bg_btn_set_color"
android:background="@android:color/transparent"
android:padding="12dp"
android:contentDescription="@string/menu_bold"
android:src="@drawable/ic_format_bold" />
android:src="@drawable/ic_format_bold"
android:tint="@color/onSurface" />
<!-- 斜体按钮 -->
<ImageButton
@ -180,10 +195,11 @@
android:layout_height="48dp"
android:layout_gravity="center"
android:layout_marginLeft="8dp"
android:background="@drawable/bg_btn_set_color"
android:background="@android:color/transparent"
android:padding="12dp"
android:contentDescription="@string/menu_italic"
android:src="@drawable/ic_format_italic" />
android:src="@drawable/ic_format_italic"
android:tint="@color/onSurface" />
<!-- 下划线按钮 -->
<ImageButton
@ -192,10 +208,11 @@
android:layout_height="48dp"
android:layout_gravity="center"
android:layout_marginLeft="8dp"
android:background="@drawable/bg_btn_set_color"
android:background="@android:color/transparent"
android:padding="12dp"
android:contentDescription="@string/menu_underline"
android:src="@drawable/ic_format_underlined" />
android:src="@drawable/ic_format_underlined"
android:tint="@color/onSurface" />
<!-- 文本颜色按钮 -->
<ImageButton
@ -204,10 +221,11 @@
android:layout_height="48dp"
android:layout_gravity="center"
android:layout_marginLeft="8dp"
android:background="@drawable/bg_btn_set_color"
android:background="@android:color/transparent"
android:padding="12dp"
android:contentDescription="@string/menu_text_color"
android:src="@drawable/ic_format_color_text" />
android:src="@drawable/ic_format_color_text"
android:tint="@color/onSurface" />
<!-- 高亮按钮 -->
<ImageButton
@ -216,199 +234,214 @@
android:layout_height="48dp"
android:layout_gravity="center"
android:layout_marginLeft="8dp"
android:background="@drawable/bg_btn_set_color"
android:background="@android:color/transparent"
android:padding="12dp"
android:contentDescription="@string/menu_highlight"
android:src="@drawable/ic_format_color_fill" />
android:src="@drawable/ic_format_color_fill"
android:tint="@color/onSurface" />
</LinearLayout>
<LinearLayout
android:id="@+id/sv_note_edit"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
<ImageView
android:layout_width="fill_parent"
android:layout_height="7dip"
android:background="@drawable/bg_color_btn_mask" />
<ScrollView
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:scrollbars="none"
android:overScrollMode="never"
android:layout_gravity="left|top"
android:fadingEdgeLength="0dip">
android:layout_gravity="left|top">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@color/surface"
android:layout_margin="16dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:padding="24dp"
android:elevation="4dp"
android:radius="12dp">
<net.micode.notes.ui.NoteEditText
android:id="@+id/note_edit_view"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="left|top"
android:background="@null"
android:autoLink="all"
android:linksClickable="false"
android:minLines="12"
android:minLines="16"
android:textAppearance="@style/TextAppearancePrimaryItem"
android:lineSpacingMultiplier="1.2" />
android:lineSpacingMultiplier="1.3"
android:textSize="16sp" />
<LinearLayout
android:id="@+id/note_edit_list"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginLeft="-10dip"
android:visibility="gone" />
</LinearLayout>
</ScrollView>
<ImageView
android:layout_width="fill_parent"
android:layout_height="7dip"
android:background="@drawable/bg_color_btn_mask" />
</LinearLayout>
</LinearLayout>
<ImageView
android:id="@+id/btn_set_bg_color"
android:layout_height="43dip"
android:layout_width="wrap_content"
android:background="@drawable/bg_color_btn_mask"
android:layout_gravity="top|right" />
<!-- 背景颜色选择器 -->
<LinearLayout
android:id="@+id/note_bg_color_selector"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/note_edit_color_selector_panel"
android:layout_marginTop="30dip"
android:layout_marginRight="8dip"
android:background="@color/surface"
android:layout_marginTop="80dip"
android:layout_marginRight="16dip"
android:layout_gravity="top|right"
android:visibility="gone">
android:visibility="gone"
android:elevation="8dp"
android:padding="8dp"
android:radius="12dp">
<FrameLayout
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1">
android:layout_width="48dp"
android:layout_height="48dp"
android:padding="4dp">
<ImageView
android:id="@+id/iv_bg_yellow"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
android:background="@color/note_bg_yellow"
android:radius="8dp" />
<ImageView
android:id="@+id/iv_bg_yellow_select"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="bottom|right"
android:layout_marginRight="5dip"
android:focusable="false"
android:visibility="gone"
android:src="@drawable/selected" />
android:src="@drawable/ic_done_circle"
android:tint="@color/primary" />
</FrameLayout>
<FrameLayout
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1">
android:layout_width="48dp"
android:layout_height="48dp"
android:padding="4dp">
<ImageView
android:id="@+id/iv_bg_blue"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
android:background="@color/note_bg_blue"
android:radius="8dp" />
<ImageView
android:id="@+id/iv_bg_blue_select"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="bottom|right"
android:focusable="false"
android:visibility="gone"
android:layout_marginRight="3dip"
android:src="@drawable/selected" />
android:src="@drawable/ic_done_circle"
android:tint="@color/primary" />
</FrameLayout>
<FrameLayout
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1">
android:layout_width="48dp"
android:layout_height="48dp"
android:padding="4dp">
<ImageView
android:id="@+id/iv_bg_white"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
android:background="@color/note_bg_white"
android:radius="8dp"
android:elevation="1dp" />
<ImageView
android:id="@+id/iv_bg_white_select"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="bottom|right"
android:focusable="false"
android:visibility="gone"
android:layout_marginRight="2dip"
android:src="@drawable/selected" />
android:src="@drawable/ic_done_circle"
android:tint="@color/primary" />
</FrameLayout>
<FrameLayout
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1">
android:layout_width="48dp"
android:layout_height="48dp"
android:padding="4dp">
<ImageView
android:id="@+id/iv_bg_green"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
android:background="@color/note_bg_green"
android:radius="8dp" />
<ImageView
android:id="@+id/iv_bg_green_select"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="bottom|right"
android:focusable="false"
android:visibility="gone"
android:src="@drawable/selected" />
android:src="@drawable/ic_done_circle"
android:tint="@color/primary" />
</FrameLayout>
<FrameLayout
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1">
android:layout_width="48dp"
android:layout_height="48dp"
android:padding="4dp">
<ImageView
android:id="@+id/iv_bg_red"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
android:background="@color/note_bg_red"
android:radius="8dp" />
<ImageView
android:id="@+id/iv_bg_red_select"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="bottom|right"
android:focusable="false"
android:visibility="gone"
android:src="@drawable/selected" />
android:src="@drawable/ic_done_circle"
android:tint="@color/primary" />
</FrameLayout>
</LinearLayout>
<!-- 字体大小选择器 -->
<LinearLayout
android:id="@+id/font_size_selector"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/font_size_selector_bg"
android:background="@color/surface"
android:layout_gravity="bottom"
android:visibility="gone">
android:visibility="gone"
android:elevation="8dp"
android:padding="16dp"
android:radius="16dp"
android:layout_margin="16dp">
<FrameLayout
android:id="@+id/ll_font_small"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1">
android:layout_weight="1"
android:padding="8dp">
<LinearLayout
android:layout_width="wrap_content"
@ -417,36 +450,41 @@
android:layout_gravity="center"
android:gravity="center">
<ImageView
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/font_small"
android:layout_marginBottom="5dip" />
android:text="Aa"
android:textSize="14sp"
android:textColor="@color/onSurface"
android:layout_marginBottom="8dp"
android:fontFamily="sans-serif-medium" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/menu_font_small"
android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
android:text="小"
android:textSize="14sp"
android:textColor="@color/onSurface"
android:alpha="0.8" />
</LinearLayout>
<ImageView
android:id="@+id/iv_small_select"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="bottom|right"
android:layout_marginRight="6dip"
android:layout_marginBottom="-7dip"
android:focusable="false"
android:visibility="gone"
android:src="@drawable/selected" />
android:src="@drawable/ic_done_circle"
android:tint="@color/primary" />
</FrameLayout>
<FrameLayout
android:id="@+id/ll_font_normal"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1">
android:layout_weight="1"
android:padding="8dp">
<LinearLayout
android:layout_width="wrap_content"
@ -455,36 +493,41 @@
android:layout_gravity="center"
android:gravity="center">
<ImageView
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/font_normal"
android:layout_marginBottom="5dip" />
android:text="Aa"
android:textSize="16sp"
android:textColor="@color/onSurface"
android:layout_marginBottom="8dp"
android:fontFamily="sans-serif-medium" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/menu_font_normal"
android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
android:text="标准"
android:textSize="14sp"
android:textColor="@color/onSurface"
android:alpha="0.8" />
</LinearLayout>
<ImageView
android:id="@+id/iv_medium_select"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="bottom|right"
android:focusable="false"
android:visibility="gone"
android:layout_marginRight="6dip"
android:layout_marginBottom="-7dip"
android:src="@drawable/selected" />
android:src="@drawable/ic_done_circle"
android:tint="@color/primary" />
</FrameLayout>
<FrameLayout
android:id="@+id/ll_font_large"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1">
android:layout_weight="1"
android:padding="8dp">
<LinearLayout
android:layout_width="wrap_content"
@ -493,36 +536,41 @@
android:layout_gravity="center"
android:gravity="center">
<ImageView
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/font_large"
android:layout_marginBottom="5dip" />
android:text="Aa"
android:textSize="18sp"
android:textColor="@color/onSurface"
android:layout_marginBottom="8dp"
android:fontFamily="sans-serif-medium" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/menu_font_large"
android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
android:text="大"
android:textSize="14sp"
android:textColor="@color/onSurface"
android:alpha="0.8" />
</LinearLayout>
<ImageView
android:id="@+id/iv_large_select"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="bottom|right"
android:focusable="false"
android:visibility="gone"
android:layout_marginRight="6dip"
android:layout_marginBottom="-7dip"
android:src="@drawable/selected" />
android:src="@drawable/ic_done_circle"
android:tint="@color/primary" />
</FrameLayout>
<FrameLayout
android:id="@+id/ll_font_super"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1">
android:layout_weight="1"
android:padding="8dp">
<LinearLayout
android:layout_width="wrap_content"
@ -531,32 +579,37 @@
android:layout_gravity="center"
android:gravity="center">
<ImageView
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/font_super"
android:layout_marginBottom="5dip" />
android:text="Aa"
android:textSize="20sp"
android:textColor="@color/onSurface"
android:layout_marginBottom="8dp"
android:fontFamily="sans-serif-medium" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/menu_font_super"
android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
android:text="超大"
android:textSize="14sp"
android:textColor="@color/onSurface"
android:alpha="0.8" />
</LinearLayout>
<ImageView
android:id="@+id/iv_super_select"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="bottom|right"
android:focusable="false"
android:visibility="gone"
android:layout_marginRight="6dip"
android:layout_marginBottom="-7dip"
android:src="@drawable/selected" />
android:src="@drawable/ic_done_circle"
android:tint="@color/primary" />
</FrameLayout>
</LinearLayout>
<!-- 字数统计 -->
<LinearLayout
android:id="@+id/word_count_area"
android:layout_width="wrap_content"
@ -568,14 +621,18 @@
android:paddingBottom="8dp"
android:layout_gravity="bottom|right"
android:layout_marginBottom="16dp"
android:layout_marginRight="8dp"
android:background="@drawable/bg_word_count_panel">
android:layout_marginRight="16dp"
android:background="@color/surface"
android:elevation="4dp"
android:radius="20dp">
<TextView
android:id="@+id/tv_word_count_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/word_count_label"
android:textSize="20sp"
android:textSize="14sp"
android:textColor="@color/onSurface"
android:alpha="0.8"
android:layout_marginRight="8dp"
android:gravity="center_vertical" />
<TextView
@ -583,7 +640,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textSize="20sp"
android:gravity="center_vertical" />
android:textSize="14sp"
android:textColor="@color/primary"
android:gravity="center_vertical"
android:fontFamily="sans-serif-medium" />
</LinearLayout>
</FrameLayout>
</FrameLayout>

104
src/main/res/layout/note_list.xml
Unescape View File

@ -18,46 +18,40 @@
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/note_list_root"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@drawable/list_background"
android:fitsSystemWindows="true"
android:paddingTop="24dp">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background"
android:fitsSystemWindows="true">
<LinearLayout
android:id="@+id/main_content"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:layout_above="@+id/view_switcher">
<TextView
android:id="@+id/tv_title_bar"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@drawable/title_bar_bg"
android:visibility="visible"
android:gravity="center_vertical"
android:singleLine="true"
android:textColor="#FFEAD1AE"
android:textSize="@dimen/text_font_size_medium" />
<!-- 搜索栏 -->
<LinearLayout
android:id="@+id/search_bar"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#FFFFFF"
android:padding="8dp"
android:background="@color/surface"
android:padding="16dp"
android:orientation="horizontal"
android:gravity="center_vertical">
android:gravity="center_vertical"
android:layout_margin="16dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="8dp"
android:elevation="4dp"
android:radius="12dp">
<ImageView
android:id="@+id/search_icon"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@android:drawable/ic_menu_search"
android:tint="#808080"
android:layout_marginRight="8dp" />
android:tint="@color/onSurface"
android:alpha="0.6"
android:layout_marginRight="12dp" />
<EditText
android:id="@+id/search_edit_text"
android:layout_width="0dp"
@ -69,14 +63,16 @@
android:singleLine="true"
android:imeOptions="actionSearch"
android:inputType="text"
android:textColorHint="#808080"
android:textColor="#000000" />
android:textColorHint="@color/onSurface"
android:alpha="0.6"
android:textColor="@color/onSurface" />
<ImageView
android:id="@+id/search_clear"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@android:drawable/ic_menu_close_clear_cancel"
android:tint="#808080"
android:tint="@color/onSurface"
android:alpha="0.6"
android:visibility="gone" />
<!-- 标签选择按钮 -->
<ImageView
@ -84,8 +80,9 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@android:drawable/ic_menu_more"
android:tint="#808080"
android:layout_marginLeft="8dp"
android:tint="@color/onSurface"
android:alpha="0.6"
android:layout_marginLeft="12dp"
android:clickable="true"
android:focusable="true"
android:contentDescription="标签" />
@ -94,8 +91,8 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@android:drawable/ic_menu_search"
android:tint="#808080"
android:layout_marginLeft="8dp"
android:tint="@color/primary"
android:layout_marginLeft="12dp"
android:clickable="true"
android:focusable="true"
android:contentDescription="搜索" />
@ -103,12 +100,14 @@
<ListView
android:id="@+id/notes_list"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:cacheColorHint="@null"
android:listSelector="@android:color/transparent"
android:divider="@null"
android:dividerHeight="8dp"
android:padding="8dp"
android:fadingEdge="@null" />
</LinearLayout>
@ -116,13 +115,14 @@
<!-- 界面切换栏 -->
<LinearLayout
android:id="@+id/view_switcher"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#FFFFFF"
android:background="@color/surface"
android:orientation="horizontal"
android:gravity="center_horizontal"
android:padding="8dp"
android:layout_alignParentBottom="true">
android:layout_alignParentBottom="true"
android:elevation="8dp">
<TextView
android:id="@+id/notes_tab"
android:layout_width="0dp"
@ -130,12 +130,13 @@
android:layout_weight="1"
android:text="便签"
android:textSize="16sp"
android:textColor="#007AFF"
android:textColor="@color/primary"
android:gravity="center"
android:padding="12dp"
android:padding="16dp"
android:background="@drawable/selected_tab_bg"
android:clickable="true"
android:focusable="true" />
android:focusable="true"
android:fontFamily="sans-serif-medium" />
<TextView
android:id="@+id/todo_tab"
android:layout_width="0dp"
@ -143,12 +144,14 @@
android:layout_weight="1"
android:text="代办"
android:textSize="16sp"
android:textColor="#808080"
android:textColor="@color/onSurface"
android:alpha="0.6"
android:gravity="center"
android:padding="12dp"
android:padding="16dp"
android:background="@drawable/unselected_tab_bg"
android:clickable="true"
android:focusable="true" />
android:focusable="true"
android:fontFamily="sans-serif-medium" />
</LinearLayout>
<!-- 圆形加号按钮 -->
@ -160,8 +163,10 @@
android:focusable="false"
android:layout_alignParentRight="true"
android:layout_above="@+id/view_switcher"
android:layout_marginRight="16dp"
android:layout_marginBottom="16dp" />
android:layout_marginRight="24dp"
android:layout_marginBottom="24dp"
android:elevation="8dp"
android:stateListAnimator="@anim/btn_add_note_elevation" />
<!-- 隐私空间返回按钮 -->
<Button
@ -170,12 +175,15 @@
android:layout_height="48dp"
android:layout_alignParentLeft="true"
android:layout_above="@+id/view_switcher"
android:layout_marginLeft="16dp"
android:layout_marginBottom="16dp"
android:background="#808080"
android:layout_marginLeft="24dp"
android:layout_marginBottom="24dp"
android:background="@color/surface"
android:elevation="4dp"
android:radius="24dp"
android:text="返回主界面"
android:textColor="#FFFFFF"
android:textColor="@color/primary"
android:textSize="16sp"
android:gravity="center"
android:visibility="gone" />
android:visibility="gone"
android:fontFamily="sans-serif-medium" />
</RelativeLayout>

137
src/main/res/layout/todo_list.xml
Unescape View File

@ -1,137 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@drawable/list_background"
android:fitsSystemWindows="true"
android:paddingTop="24dp">
<LinearLayout
android:id="@+id/main_content"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical"
android:layout_above="@+id/view_switcher">
<!-- 未完成代办事项区域 -->
<LinearLayout
android:id="@+id/todo_incomplete_section"
android:layout_width="fill_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:orientation="vertical">
<!-- 无代办提示 -->
<TextView
android:id="@+id/todo_empty_hint"
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="无代办"
android:textSize="18sp"
android:textColor="#808080"
android:visibility="visible" />
<!-- 未完成代办事项列表 -->
<ListView
android:id="@+id/todo_incomplete_list"
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:cacheColorHint="@null"
android:listSelector="@android:color/transparent"
android:divider="@null"
android:fadingEdge="@null"
android:visibility="gone" />
</LinearLayout>
<!-- 分隔线 -->
<View
android:id="@+id/todo_divider"
android:layout_width="fill_parent"
android:layout_height="1dp"
android:background="#E0E0E0"
android:visibility="gone" />
<!-- 已完成代办事项区域 -->
<LinearLayout
android:id="@+id/todo_complete_section"
android:layout_width="fill_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:orientation="vertical"
android:visibility="gone">
<!-- 已完成标题 -->
<TextView
android:id="@+id/todo_complete_title"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:text="已完成"
android:textSize="16sp"
android:textColor="#808080"
android:background="#F5F5F5" />
<!-- 已完成代办事项列表 -->
<ListView
android:id="@+id/todo_complete_list"
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:cacheColorHint="@null"
android:listSelector="@android:color/transparent"
android:divider="@null"
android:fadingEdge="@null" />
</LinearLayout>
</LinearLayout>
<!-- 界面切换栏 -->
<LinearLayout
android:id="@+id/view_switcher"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="#FFFFFF"
android:orientation="horizontal"
android:gravity="center_horizontal"
android:padding="8dp"
android:layout_alignParentBottom="true">
<TextView
android:id="@+id/notes_tab"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="便签"
android:textSize="16sp"
android:textColor="#808080"
android:gravity="center"
android:padding="12dp"
android:background="@drawable/unselected_tab_bg"
android:clickable="true"
android:focusable="true" />
<TextView
android:id="@+id/todo_tab"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="代办"
android:textSize="16sp"
android:textColor="#007AFF"
android:gravity="center"
android:padding="12dp"
android:background="@drawable/selected_tab_bg"
android:clickable="true"
android:focusable="true" />
</LinearLayout>
<!-- 添加代办事项按钮 -->
<Button
android:id="@+id/btn_add_todo"
android:layout_width="64dp"
android:layout_height="64dp"
android:background="@drawable/ic_add_circle"
android:layout_alignParentRight="true"
android:layout_above="@+id/view_switcher"
android:layout_marginRight="16dp"
android:layout_marginBottom="16dp"
android:focusable="false" />
</RelativeLayout>

17
src/main/res/values-night/themes.xml
Unescape View File

@ -2,6 +2,21 @@
<!-- Base application theme. -->
<style name="Base.Theme.Notesmaster" parent="Theme.Material3.DayNight.NoActionBar">
<!-- Customize your dark theme here. -->
<!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
<item name="colorPrimary">#FFB74D</item>
<item name="colorPrimaryVariant">#FF9800</item>
<item name="colorSecondary">#81C784</item>
<item name="colorSecondaryVariant">#4CAF50</item>
<item name="android:colorBackground">#121212</item>
<item name="colorSurface">#1E1E1E</item>
<item name="colorError">#EF5350</item>
<item name="colorOnPrimary">#000000</item>
<item name="colorOnSecondary">#000000</item>
<item name="colorOnBackground">#FFFFFF</item>
<item name="colorOnSurface">#FFFFFF</item>
<item name="colorOnError">#000000</item>
<item name="android:windowBackground">#121212</item>
<item name="android:statusBarColor">#000000</item>
<item name="android:navigationBarColor">#121212</item>
<item name="android:windowLightNavigationBar">false</item>
</style>
</resources>

30
src/main/res/values/colors.xml
Unescape View File

@ -16,9 +16,26 @@
-->
<resources>
<color name="user_query_highlight">#335b5b5b</color>
<color name="warning_text">#FF5252</color>
<color name="alert_text">#FF9800</color>
<!-- Material Design 3 Color System -->
<color name="primary">#FF9800</color>
<color name="primaryVariant">#F57C00</color>
<color name="secondary">#4CAF50</color>
<color name="secondaryVariant">#388E3C</color>
<color name="background">#F5F5F5</color>
<color name="surface">#FFFFFF</color>
<color name="error">#F44336</color>
<color name="onPrimary">#FFFFFF</color>
<color name="onSecondary">#FFFFFF</color>
<color name="onBackground">#212121</color>
<color name="onSurface">#212121</color>
<color name="onError">#FFFFFF</color>
<!-- Note background colors -->
<color name="note_bg_yellow">#FFF9C4</color>
<color name="note_bg_blue">#BBDEFB</color>
<color name="note_bg_white">#FFFFFF</color>
<color name="note_bg_green">#C8E6C9</color>
<color name="note_bg_red">#FFCDD2</color>
<!-- Note text colors for different backgrounds -->
<color name="note_text_yellow">#5D4037</color>
@ -26,4 +43,11 @@
<color name="note_text_white">#424242</color>
<color name="note_text_green">#2E7D32</color>
<color name="note_text_red">#C62828</color>
<!-- Other colors -->
<color name="user_query_highlight">#335b5b5b</color>
<color name="warning_text">#F44336</color>
<color name="alert_text">#FF9800</color>
<color name="divider_color">#E0E0E0</color>
<color name="disabled_color">#BDBDBD</color>
</resources>

17
src/main/res/values/themes.xml
Unescape View File

@ -2,7 +2,22 @@
<!-- Base application theme. -->
<style name="Base.Theme.Notesmaster" parent="Theme.Material3.DayNight.NoActionBar">
<!-- Customize your light theme here. -->
<!-- <item name="colorPrimary">@color/my_light_primary</item> -->
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryVariant">@color/primaryVariant</item>
<item name="colorSecondary">@color/secondary</item>
<item name="colorSecondaryVariant">@color/secondaryVariant</item>
<item name="android:colorBackground">@color/background</item>
<item name="colorSurface">@color/surface</item>
<item name="colorError">@color/error</item>
<item name="colorOnPrimary">@color/onPrimary</item>
<item name="colorOnSecondary">@color/onSecondary</item>
<item name="colorOnBackground">@color/onBackground</item>
<item name="colorOnSurface">@color/onSurface</item>
<item name="colorOnError">@color/onError</item>
<item name="android:windowBackground">@color/background</item>
<item name="android:statusBarColor">@color/primaryVariant</item>
<item name="android:navigationBarColor">@color/surface</item>
<item name="android:windowLightNavigationBar">true</item>
</style>
<style name="Theme.Notesmaster" parent="Base.Theme.Notesmaster" />

Write Preview
Loading…
Cancel
Save