BUG修复,置顶隐私图标替换

b_branch
Qiu 8 months ago
parent 0b27c30817
commit a2a426d4f8

@ -1,4 +1,4 @@
#Mon Jan 06 15:29:56 CST 2025 #Tue Jan 07 20:04:10 CST 2025
net.micode.notes.app-main-10\:/drawable-hdpi/menu_top.png=E\:\\xiaomi\\c_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_top.png.flat net.micode.notes.app-main-10\:/drawable-hdpi/menu_top.png=E\:\\xiaomi\\c_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_top.png.flat
net.micode.notes.app-mergeDebugResources-7\:/layout/note_list.xml=E\:\\xiaomi\\c_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat net.micode.notes.app-mergeDebugResources-7\:/layout/note_list.xml=E\:\\xiaomi\\c_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
net.micode.notes.app-main-10\:/drawable-hdpi/list_green_down.9.png=E\:\\xiaomi\\c_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat net.micode.notes.app-main-10\:/drawable-hdpi/list_green_down.9.png=E\:\\xiaomi\\c_branch\\xiaomi\\src\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat

@ -1,428 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<FrameLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@drawable/list_background"
xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
<!-- 标题栏 -->
<LinearLayout
android:id="@+id/note_title"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<ImageButton
android:id="@+id/add_img_button"
android:layout_width="45dp"
android:layout_height="match_parent"
android:src="@android:drawable/ic_menu_gallery" />
<Button
android:id="@+id/translate"
android:layout_width="25dp"
android:layout_height="match_parent"
android:layout_gravity="bottom"
android:layout_margin="7dp"
android:background="@drawable/translate" />
<TextView
android:id="@+id/text_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|center_vertical"
android:layout_marginRight="8dip"
/>
<TextView
android:id="@+id/tv_modified_date"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="left|center_vertical"
android:layout_marginRight="8dip"
android:textAppearance="@style/TextAppearanceSecondaryItem" />
<ImageView
android:id="@+id/iv_alert_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@drawable/title_alert" />
<TextView
android:id="@+id/tv_alert_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="2dip"
android:layout_marginRight="8dip"
android:textAppearance="@style/TextAppearanceSecondaryItem" />
<TextView
android:id="@+id/tv_top_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="5dip"
android:layout_marginRight="5dip"
android:textAppearance="@style/TextAppearanceSecondaryItem" />
<ImageButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/bg_btn_set_color" />
</LinearLayout>
<!-- 编辑区域 -->
<LinearLayout
android:id="@+id/sv_note_edit"
android:layout_width="fill_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_height="0dip"
android:layout_weight="1"
android:scrollbars="none"
android:overScrollMode="never"
android:layout_gravity="left|top"
android:fadingEdgeLength="0dip">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<net.micode.notes.ui.NoteEditText
android:id="@+id/note_edit_view"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="left|top"
android:background="@null"
android:autoLink="all"
android:linksClickable="false"
android:minLines="12"
android:textAppearance="@style/TextAppearancePrimaryItem"
android:lineSpacingMultiplier="1.2" />
<LinearLayout
android:id="@+id/note_edit_list"
android:layout_width="fill_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:layout_gravity="top|right"
android:visibility="gone">
<FrameLayout
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1">
<ImageView
android:id="@+id/iv_bg_yellow"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<ImageView
android:id="@+id/iv_bg_yellow_select"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|right"
android:layout_marginRight="5dip"
android:focusable="false"
android:visibility="gone"
android:src="@drawable/selected" />
</FrameLayout>
<FrameLayout
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1">
<ImageView
android:id="@+id/iv_bg_blue"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<ImageView
android:id="@+id/iv_bg_blue_select"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|right"
android:focusable="false"
android:visibility="gone"
android:layout_marginRight="3dip"
android:src="@drawable/selected" />
</FrameLayout>
<FrameLayout
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1">
<ImageView
android:id="@+id/iv_bg_white"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<ImageView
android:id="@+id/iv_bg_white_select"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|right"
android:focusable="false"
android:visibility="gone"
android:layout_marginRight="2dip"
android:src="@drawable/selected" />
</FrameLayout>
<FrameLayout
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1">
<ImageView
android:id="@+id/iv_bg_green"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<ImageView
android:id="@+id/iv_bg_green_select"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|right"
android:focusable="false"
android:visibility="gone"
android:src="@drawable/selected" />
</FrameLayout>
<FrameLayout
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1">
<ImageView
android:id="@+id/iv_bg_red"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<ImageView
android:id="@+id/iv_bg_red_select"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|right"
android:focusable="false"
android:visibility="gone"
android:src="@drawable/selected" />
</FrameLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/font_size_selector"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@drawable/font_size_selector_bg"
android:layout_gravity="bottom"
android:visibility="gone">
<FrameLayout
android:id="@+id/ll_font_small"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_gravity="center"
android:gravity="center">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/font_small"
android:layout_marginBottom="5dip" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/menu_font_small"
android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
</LinearLayout>
<ImageView
android:id="@+id/iv_small_select"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|right"
android:layout_marginRight="6dip"
android:layout_marginBottom="-7dip"
android:focusable="false"
android:visibility="gone"
android:src="@drawable/selected" />
</FrameLayout>
<FrameLayout
android:id="@+id/ll_font_normal"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_gravity="center"
android:gravity="center">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/font_normal"
android:layout_marginBottom="5dip" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/menu_font_normal"
android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
</LinearLayout>
<ImageView
android:id="@+id/iv_medium_select"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|right"
android:focusable="false"
android:visibility="gone"
android:layout_marginRight="6dip"
android:layout_marginBottom="-7dip"
android:src="@drawable/selected" />
</FrameLayout>
<FrameLayout
android:id="@+id/ll_font_large"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_gravity="center"
android:gravity="center">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/font_large"
android:layout_marginBottom="5dip" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/menu_font_large"
android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
</LinearLayout>
<ImageView
android:id="@+id/iv_large_select"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|right"
android:focusable="false"
android:visibility="gone"
android:layout_marginRight="6dip"
android:layout_marginBottom="-7dip"
android:src="@drawable/selected" />
</FrameLayout>
<FrameLayout
android:id="@+id/ll_font_super"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_gravity="center"
android:gravity="center">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/font_super"
android:layout_marginBottom="5dip" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/menu_font_super"
android:textAppearance="@style/TextAppearanceUnderMenuIcon" />
</LinearLayout>
<ImageView
android:id="@+id/iv_super_select"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|right"
android:focusable="false"
android:visibility="gone"
android:layout_marginRight="6dip"
android:layout_marginBottom="-7dip"
android:src="@drawable/selected" />
</FrameLayout>
</LinearLayout>
</FrameLayout>

@ -0,0 +1,96 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
此XML文件定义了一个FrameLayout布局用于显示一个便签项。
布局中包含了一个标题、时间、复选框和一个提示图标。
Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
许可证信息: Apache License, Version 2.0
详细信息见: http://www.apache.org/licenses/LICENSE-2.0
除非法律要求或以书面形式同意, 依据该许可证分发的软件在"原样"基础上分发,
不提供任何明示或暗示的保证。详见许可证文件中特定的权限和限制条款。
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/note_item"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<!-- 主要内容区域,线性布局管理器,垂直方向排列 -->
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="center_vertical">
<!-- 内容区域,线性布局管理器,垂直方向排列 -->
<LinearLayout
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<!-- 标题,通常不可见 -->
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="0dip"
android:layout_weight="1"
android:textAppearance="@style/TextAppearancePrimaryItem"
android:visibility="gone" />
<!-- 标题和时间显示区域,线性布局管理器,水平方向排列 -->
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical">
<!-- 便签标题,单行显示 -->
<TextView
android:id="@+id/tv_title"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:singleLine="true" />
<!-- 便签时间 -->
<TextView
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearanceSecondaryItem" />
</LinearLayout>
</LinearLayout>
<!-- 复选框,通常不可见 -->
<CheckBox
android:id="@android:id/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="false"
android:clickable="false"
android:visibility="gone" />
</LinearLayout>
<!-- 提示图标,位于右上角 -->
<ImageView
android:id="@+id/iv_alert_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|right" />
<ImageView
android:id="@+id/iv_top_icon"
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginRight = "@dimen/text_font_size_medium"
android:layout_gravity="top|right"/>
<ImageView
android:id="@+id/iv_key_icon"
android:layout_width="30dp"
android:layout_height="14dp"
android:layout_gravity="top|right" />
</FrameLayout>

@ -1,4 +1,4 @@
#Mon Jan 06 15:29:58 CST 2025 #Tue Jan 07 20:25:01 CST 2025
path.4=13/classes.dex path.4=13/classes.dex
path.3=12/classes.dex path.3=12/classes.dex
path.2=11/classes.dex path.2=11/classes.dex

@ -36,12 +36,12 @@
"source": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_red_single.9.png" "source": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_red_single.9.png"
}, },
{ {
"merged": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_new_note_pressed.png.flat", "merged": "net.micode.notes.app-merged_res-8:/layout_note_item.xml.flat",
"source": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\new_note_pressed.png" "source": "net.micode.notes.app-main-10:/layout/note_item.xml"
}, },
{ {
"merged": "net.micode.notes.app-merged_res-8:/drawable-hdpi_translate.png.flat", "merged": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_new_note_pressed.png.flat",
"source": "net.micode.notes.app-main-10:/drawable-hdpi/translate.png" "source": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\new_note_pressed.png"
}, },
{ {
"merged": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_font_small.png.flat", "merged": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_font_small.png.flat",
@ -59,14 +59,14 @@
"merged": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_blue_middle.9.png.flat", "merged": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_list_blue_middle.9.png.flat",
"source": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_blue_middle.9.png" "source": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\list_blue_middle.9.png"
}, },
{
"merged": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_activity_set_loginpassword.xml.flat",
"source": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\activity_set_loginpassword.xml"
},
{ {
"merged": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\raw_introduction.flat", "merged": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\raw_introduction.flat",
"source": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-main-10:\\raw\\introduction" "source": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-main-10:\\raw\\introduction"
}, },
{
"merged": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\layout_activity_set_loginpassword.xml.flat",
"source": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\activity_set_loginpassword.xml"
},
{ {
"merged": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\color_secondary_text_dark.xml.flat", "merged": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\color_secondary_text_dark.xml.flat",
"source": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-main-10:\\color\\secondary_text_dark.xml" "source": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-main-10:\\color\\secondary_text_dark.xml"
@ -399,10 +399,6 @@
"merged": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\color_primary_text_dark.xml.flat", "merged": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\color_primary_text_dark.xml.flat",
"source": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-main-10:\\color\\primary_text_dark.xml" "source": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-main-10:\\color\\primary_text_dark.xml"
}, },
{
"merged": "net.micode.notes.app-merged_res-8:/layout_note_edit.xml.flat",
"source": "net.micode.notes.app-main-10:/layout/note_edit.xml"
},
{ {
"merged": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_4x_yellow.png.flat", "merged": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-merged_res-8:\\drawable-hdpi_widget_4x_yellow.png.flat",
"source": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_4x_yellow.png" "source": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-main-10:\\drawable-hdpi\\widget_4x_yellow.png"

@ -60,8 +60,8 @@
"source": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\widget_2x.xml" "source": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-main-10:\\layout\\widget_2x.xml"
}, },
{ {
"merged": "net.micode.notes.app-mergeDebugResources-7:/layout/note_edit.xml", "merged": "net.micode.notes.app-mergeDebugResources-7:/layout/note_item.xml",
"source": "net.micode.notes.app-main-10:/layout/note_edit.xml" "source": "net.micode.notes.app-main-10:/layout/note_item.xml"
}, },
{ {
"merged": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-7:\\layout\\dialog_pwd.xml", "merged": "D:\\Gradle_repository\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-7:\\layout\\dialog_pwd.xml",

@ -1,32 +1,34 @@
net.micode.notes:style/Base.Theme.AppCompat.Light.Dialog.MinWidth = 0x7f0f0048 net.micode.notes:style/Base.Theme.AppCompat.Light.Dialog.MinWidth = 0x7f0f0048
net.micode.notes:style/Widget.AppCompat.Light.ActionButton = 0x7f0f0140 net.micode.notes:style/Widget.AppCompat.Light.ActionButton = 0x7f0f0140
net.micode.notes:styleable/ViewStubCompat = 0x7f10002c net.micode.notes:styleable/ViewStubCompat = 0x7f10002c
net.micode.notes:string/format_datetime_mdhm = 0x7f0e0043
net.micode.notes:drawable/translate = 0x7f0700a9
net.micode.notes:style/Base.TextAppearance.Widget.AppCompat.Toolbar.Title = 0x7f0f003b net.micode.notes:style/Base.TextAppearance.Widget.AppCompat.Toolbar.Title = 0x7f0f003b
net.micode.notes:string/title_activity_splash = 0x7f0e0094 net.micode.notes:string/title_activity_splash = 0x7f0e0094
net.micode.notes:style/Widget.AppCompat.DropDownItem.Spinner = 0x7f0f0134 net.micode.notes:drawable/translate = 0x7f0700a9
net.micode.notes:styleable/RecycleListView = 0x7f100022 net.micode.notes:string/format_datetime_mdhm = 0x7f0e0043
net.micode.notes:style/TextAppearanceSuper = 0x7f0f00fc net.micode.notes:style/TextAppearanceSuper = 0x7f0f00fc
net.micode.notes:style/Widget.AppCompat.SearchView = 0x7f0f015a net.micode.notes:styleable/RecycleListView = 0x7f100022
net.micode.notes:string/note_link_tel = 0x7f0e006c net.micode.notes:style/Widget.AppCompat.DropDownItem.Spinner = 0x7f0f0134
net.micode.notes:string/abc_menu_alt_shortcut_label = 0x7f0e0014
net.micode.notes:styleable/SwitchCompat = 0x7f100027
net.micode.notes:style/Widget.AppCompat.Button.Borderless = 0x7f0f0129 net.micode.notes:style/Widget.AppCompat.Button.Borderless = 0x7f0f0129
net.micode.notes:style/Widget.AppCompat.Light.ActivityChooserView = 0x7f0f0144 net.micode.notes:style/Widget.AppCompat.Light.ActivityChooserView = 0x7f0f0144
net.micode.notes:style/Base.Widget.AppCompat.PopupMenu = 0x7f0f008f net.micode.notes:style/Base.Widget.AppCompat.PopupMenu = 0x7f0f008f
net.micode.notes:id/time = 0x7f0800ce net.micode.notes:id/time = 0x7f0800ce
net.micode.notes:style/Widget.AppCompat.CompoundButton.Switch = 0x7f0f0132 net.micode.notes:style/Widget.AppCompat.CompoundButton.Switch = 0x7f0f0132
net.micode.notes:style/Base.V21.Theme.AppCompat.Light = 0x7f0f0053 net.micode.notes:style/Base.V21.Theme.AppCompat.Light = 0x7f0f0053
net.micode.notes:style/Widget.AppCompat.SearchView = 0x7f0f015a
net.micode.notes:string/note_link_tel = 0x7f0e006c
net.micode.notes:string/abc_menu_alt_shortcut_label = 0x7f0e0014
net.micode.notes:styleable/SwitchCompat = 0x7f100027
net.micode.notes:style/Widget.Compat.NotificationActionContainer = 0x7f0f0165
net.micode.notes:style/Widget.AppCompat.ListPopupWindow = 0x7f0f014e
net.micode.notes:style/Base.TextAppearance.AppCompat.Display1 = 0x7f0f0011
net.micode.notes:style/Base.TextAppearance.AppCompat = 0x7f0f000c net.micode.notes:style/Base.TextAppearance.AppCompat = 0x7f0f000c
net.micode.notes:style/TextAppearance.AppCompat.Subhead.Inverse = 0x7f0f00d8 net.micode.notes:style/TextAppearance.AppCompat.Subhead.Inverse = 0x7f0f00d8
net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0f00fb net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0f00fb
net.micode.notes:style/Widget.AppCompat.ListPopupWindow = 0x7f0f014e
net.micode.notes:style/Base.TextAppearance.AppCompat.Display1 = 0x7f0f0011
net.micode.notes:style/TextAppearance.Widget.AppCompat.Toolbar.Title = 0x7f0f00f6 net.micode.notes:style/TextAppearance.Widget.AppCompat.Toolbar.Title = 0x7f0f00f6
net.micode.notes:style/Widget.Support.CoordinatorLayout = 0x7f0f0167 net.micode.notes:style/Widget.Support.CoordinatorLayout = 0x7f0f0167
net.micode.notes:layout/abc_popup_menu_item_layout = 0x7f0a0013 net.micode.notes:layout/abc_popup_menu_item_layout = 0x7f0a0013
net.micode.notes:styleable/Toolbar = 0x7f100029 net.micode.notes:styleable/Toolbar = 0x7f100029
net.micode.notes:styleable/ActivityChooserView = 0x7f100005
net.micode.notes:style/Widget.AppCompat.Toolbar.Button.Navigation = 0x7f0f0164 net.micode.notes:style/Widget.AppCompat.Toolbar.Button.Navigation = 0x7f0f0164
net.micode.notes:drawable/list_blue_middle = 0x7f07006f net.micode.notes:drawable/list_blue_middle = 0x7f07006f
net.micode.notes:style/Widget.AppCompat.ActionBar.Solid = 0x7f0f011e net.micode.notes:style/Widget.AppCompat.ActionBar.Solid = 0x7f0f011e
@ -34,19 +36,17 @@ net.micode.notes:string/file_path = 0x7f0e0040
net.micode.notes:xml/widget_2x_info = 0x7f110002 net.micode.notes:xml/widget_2x_info = 0x7f110002
net.micode.notes:style/Theme.AppCompat.DayNight.DialogWhenLarge = 0x7f0f0105 net.micode.notes:style/Theme.AppCompat.DayNight.DialogWhenLarge = 0x7f0f0105
net.micode.notes:styleable/AnimatedStateListDrawableItem = 0x7f100008 net.micode.notes:styleable/AnimatedStateListDrawableItem = 0x7f100008
net.micode.notes:style/Base.Widget.AppCompat.Light.PopupMenu.Overflow = 0x7f0f0089
net.micode.notes:style/Platform.ThemeOverlay.AppCompat.Dark = 0x7f0f00a7 net.micode.notes:style/Platform.ThemeOverlay.AppCompat.Dark = 0x7f0f00a7
net.micode.notes:style/Platform.V25.AppCompat.Light = 0x7f0f00ac net.micode.notes:style/Platform.V25.AppCompat.Light = 0x7f0f00ac
net.micode.notes:style/Widget.AppCompat.ActionButton.Overflow = 0x7f0f0124 net.micode.notes:style/Widget.AppCompat.ActionButton.Overflow = 0x7f0f0124
net.micode.notes:style/Widget.AppCompat.Light.DropDownItem.Spinner = 0x7f0f0146
net.micode.notes:styleable/ActivityChooserView = 0x7f100005
net.micode.notes:style/Widget.Compat.NotificationActionContainer = 0x7f0f0165
net.micode.notes:style/Base.Widget.AppCompat.ActionBar.TabText = 0x7f0f006a
net.micode.notes:style/Base.Widget.AppCompat.ProgressBar = 0x7f0f0092
net.micode.notes:style/TextAppearance.AppCompat.Large.Inverse = 0x7f0f00cb net.micode.notes:style/TextAppearance.AppCompat.Large.Inverse = 0x7f0f00cb
net.micode.notes:style/Widget.AppCompat.ActionBar.TabBar = 0x7f0f011f net.micode.notes:style/Widget.AppCompat.ActionBar.TabBar = 0x7f0f011f
net.micode.notes:string/notealert_enter = 0x7f0e006e net.micode.notes:style/Base.Widget.AppCompat.ProgressBar = 0x7f0f0092
net.micode.notes:style/Base.Widget.AppCompat.ActionBar.TabText = 0x7f0f006a
net.micode.notes:style/Widget.AppCompat.Light.DropDownItem.Spinner = 0x7f0f0146
net.micode.notes:id/src_over = 0x7f0800c0 net.micode.notes:id/src_over = 0x7f0800c0
net.micode.notes:string/notealert_enter = 0x7f0e006e
net.micode.notes:style/Base.Widget.AppCompat.Light.PopupMenu.Overflow = 0x7f0f0089
net.micode.notes:style/TextAppearance.Compat.Notification.Time = 0x7f0f00f2 net.micode.notes:style/TextAppearance.Compat.Notification.Time = 0x7f0f00f2
net.micode.notes:style/ThemeOverlay.AppCompat.Dialog = 0x7f0f0119 net.micode.notes:style/ThemeOverlay.AppCompat.Dialog = 0x7f0f0119
net.micode.notes:id/wrap_content = 0x7f0800e2 net.micode.notes:id/wrap_content = 0x7f0800e2
@ -78,15 +78,15 @@ net.micode.notes:style/TextAppearance.AppCompat.Small.Inverse = 0x7f0f00d6
net.micode.notes:style/Base.TextAppearance.AppCompat.Display4 = 0x7f0f0014 net.micode.notes:style/Base.TextAppearance.AppCompat.Display4 = 0x7f0f0014
net.micode.notes:id/menu_alert = 0x7f080072 net.micode.notes:id/menu_alert = 0x7f080072
net.micode.notes:string/abc_activitychooserview_choose_application = 0x7f0e0005 net.micode.notes:string/abc_activitychooserview_choose_application = 0x7f0e0005
net.micode.notes:layout/activity_set_loginpassword = 0x7f0a0020
net.micode.notes:style/Widget.AppCompat.PopupWindow = 0x7f0f0154 net.micode.notes:style/Widget.AppCompat.PopupWindow = 0x7f0f0154
net.micode.notes:dimen/notification_top_pad_large_text = 0x7f060069 net.micode.notes:layout/activity_set_loginpassword = 0x7f0a0020
net.micode.notes:string/abc_searchview_description_submit = 0x7f0e0022
net.micode.notes:layout/abc_screen_simple = 0x7f0a0015 net.micode.notes:layout/abc_screen_simple = 0x7f0a0015
net.micode.notes:style/TextAppearance.AppCompat.Light.SearchResult.Subtitle = 0x7f0f00cc net.micode.notes:style/TextAppearance.AppCompat.Light.SearchResult.Subtitle = 0x7f0f00cc
net.micode.notes:layout/widget_2x = 0x7f0a0038 net.micode.notes:layout/widget_2x = 0x7f0a0038
net.micode.notes:style/Widget.AppCompat.Light.ActionBar.TabView = 0x7f0f013e net.micode.notes:dimen/notification_top_pad_large_text = 0x7f060069
net.micode.notes:string/abc_searchview_description_submit = 0x7f0e0022
net.micode.notes:dimen/disabled_alpha_material_light = 0x7f060053 net.micode.notes:dimen/disabled_alpha_material_light = 0x7f060053
net.micode.notes:style/Widget.AppCompat.Light.ActionBar.TabView = 0x7f0f013e
net.micode.notes:drawable/abc_seekbar_tick_mark_material = 0x7f07003f net.micode.notes:drawable/abc_seekbar_tick_mark_material = 0x7f07003f
net.micode.notes:styleable/DrawerArrowToggle = 0x7f100014 net.micode.notes:styleable/DrawerArrowToggle = 0x7f100014
net.micode.notes:styleable/ActionMenuView = 0x7f100003 net.micode.notes:styleable/ActionMenuView = 0x7f100003

@ -828,6 +828,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
mWorkingNote.setAlertDate(0, false); mWorkingNote.setAlertDate(0, false);
break; break;
case R.id.menu_top: case R.id.menu_top:
// 设置置顶
mWorkingNote.setTop((mWorkingNote.getTopId())==1 ? "0" : "1"); mWorkingNote.setTop((mWorkingNote.getTopId())==1 ? "0" : "1");
if(mWorkingNote.getTopId()==1){ if(mWorkingNote.getTopId()==1){
Toast.makeText(this,"已置顶",Toast.LENGTH_SHORT).show(); Toast.makeText(this,"已置顶",Toast.LENGTH_SHORT).show();
@ -837,7 +838,8 @@ public class NoteEditActivity extends Activity implements OnClickListener,
showTopHeader(); showTopHeader();
break; break;
case R.id.menu_Private://设置为私密便签 case R.id.menu_Private:
//设置为私密便签
if(mNoteEditor.getText().toString().equals("")){ if(mNoteEditor.getText().toString().equals("")){
Toast.makeText(getApplicationContext(),"为空的便签不能设置密码",Toast.LENGTH_SHORT).show(); Toast.makeText(getApplicationContext(),"为空的便签不能设置密码",Toast.LENGTH_SHORT).show();
}else{ }else{
@ -1405,7 +1407,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
RespondBean respondBean = response.body(); RespondBean respondBean = response.body();
String result = respondBean.getTrans_result().get(0).getDst(); String result = respondBean.getTrans_result().get(0).getDst();
editable.setText(result); editable.setText(result);
Log.d(TAG, "中译英结果" + result); Log.d(TAG, "译中结果" + result);
} }
@Override @Override
@ -1743,9 +1745,4 @@ public class NoteEditActivity extends Activity implements OnClickListener,
return stringBuffer.toString(); return stringBuffer.toString();
} }
} }

@ -67,6 +67,7 @@ import net.micode.notes.R;
import net.micode.notes.data.Notes; import net.micode.notes.data.Notes;
import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.data.Notes.NoteColumns;
import net.micode.notes.data.NotesDatabaseHelper; import net.micode.notes.data.NotesDatabaseHelper;
import net.micode.notes.data.NotesProvider;
import net.micode.notes.gtask.remote.GTaskSyncService; import net.micode.notes.gtask.remote.GTaskSyncService;
import net.micode.notes.model.WorkingNote; import net.micode.notes.model.WorkingNote;
import net.micode.notes.tool.BackupUtils; import net.micode.notes.tool.BackupUtils;
@ -702,9 +703,14 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
Log.e(TAG, "Delete notes error, should not happens"); Log.e(TAG, "Delete notes error, should not happens");
} }
} else { } else {
HashSet<Long> ids=mNotesListAdapter.getSelectedItemIds();
for(Long id : ids){
if(NotesProvider.isPrivateNote(id)){
ids.remove(id);
}
}
// move notes to trash // move notes to trash
if (!DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter if (!DataUtils.batchMoveToFolder(mContentResolver, ids, Notes.ID_TRASH_FOLER)) {
.getSelectedItemIds(), Notes.ID_TRASH_FOLER)) {
Log.e(TAG, "Move notes to trash folder error, should not happens"); Log.e(TAG, "Move notes to trash folder error, should not happens");
} }
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 549 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

@ -91,6 +91,6 @@
<ImageView <ImageView
android:id="@+id/iv_key_icon" android:id="@+id/iv_key_icon"
android:layout_width="30dp" android:layout_width="30dp"
android:layout_height="10dp" android:layout_height="14dp"
android:layout_gravity="top|right" /> android:layout_gravity="top|right" />
</FrameLayout> </FrameLayout>

@ -63,10 +63,10 @@
android:id="@+id/menu_quit_secret" android:id="@+id/menu_quit_secret"
android:title="@string/menu_quit_secret"/> android:title="@string/menu_quit_secret"/>
<item <item
android:id="@+id/menu_daytime" android:id="@+id/menu_daytime"
android:title="@string/day_time"/> android:title="@string/day_time"/>
<item <item
android:id="@+id/menu_night_time" android:id="@+id/menu_night_time"
android:title="@string/night_time"/> android:title="@string/night_time"/>

Loading…
Cancel
Save