Skip to content

Commit ebe6ba3

Browse files
sharpdevelopsharpdevelop
committed
Merge pull request MiCode#10 from zhaohad/master
Add reminder function
2 parents bd1c0da + 23e54bc commit ebe6ba3

11 files changed

Lines changed: 626 additions & 16 deletions

File tree

‎AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
<activity
5353
android:name=".ui.NoteEditActivity"
54-
android:configChanges="keyboardHidden|orientation"
54+
android:configChanges="keyboardHidden|orientation|screenSize"
5555
android:launchMode="singleTop"
5656
android:theme="@style/NoteTheme" >
5757

‎res/layout/datetime_picker.xml‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
4+
android:orientation="horizontal"
5+
android:layout_gravity="center_horizontal"
6+
android:layout_width="wrap_content"
7+
android:layout_height="wrap_content">
8+
9+
<NumberPicker
10+
android:id="@+id/date"
11+
android:layout_width="120dip"
12+
android:layout_height="wrap_content"
13+
android:focusable="true"
14+
android:focusableInTouchMode="true"
15+
/>
16+
17+
<NumberPicker
18+
android:id="@+id/hour"
19+
android:layout_width="50dip"
20+
android:layout_height="wrap_content"
21+
android:layout_marginLeft="5dip"
22+
android:focusable="true"
23+
android:focusableInTouchMode="true"
24+
/>
25+
26+
<NumberPicker
27+
android:id="@+id/minute"
28+
android:layout_width="50dip"
29+
android:layout_height="wrap_content"
30+
android:layout_marginLeft="5dip"
31+
android:focusable="true"
32+
android:focusableInTouchMode="true"
33+
/>
34+
35+
<NumberPicker
36+
android:id="@+id/amPm"
37+
android:layout_width="50dip"
38+
android:layout_height="wrap_content"
39+
android:layout_marginLeft="5dip"
40+
android:focusable="true"
41+
android:focusableInTouchMode="true"
42+
/>
43+
</LinearLayout>

‎res/menu/call_note_edit.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,12 @@
3737
<item
3838
android:id="@+id/menu_send_to_desktop"
3939
android:title="@string/menu_send_to_desktop"/>
40-
<!--
40+
4141
<item
4242
android:id="@+id/menu_alert"
43-
android:title="@string/menu_alert" /> -->
43+
android:title="@string/menu_alert" />
4444

45-
<!--
4645
<item
4746
android:id="@+id/menu_delete_remind"
48-
android:title="@string/menu_remove_remind" /> -->
47+
android:title="@string/menu_remove_remind" />
4948
</menu>

‎res/menu/note_edit.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,11 @@
4242
android:id="@+id/menu_send_to_desktop"
4343
android:title="@string/menu_send_to_desktop"/>
4444

45-
<!--
4645
<item
4746
android:id="@+id/menu_alert"
48-
android:title="@string/menu_alert" /> -->
49-
<!--
47+
android:title="@string/menu_alert" />
48+
5049
<item
5150
android:id="@+id/menu_delete_remind"
52-
android:title="@string/menu_remove_remind" /> -->
51+
android:title="@string/menu_remove_remind" />
5352
</menu>

‎res/values-zh-rCN/strings.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<string name="notelist_string_info">...</string>
2626
<string name="notelist_menu_new">新建便签</string>
2727
<string name="delete_remind_time_message">成功删除提醒</string>
28+
<string name="set_remind_time_message">创建提醒</string>
2829
<string name="note_alert_expired">已过期</string>
2930
<string name="format_date_ymd">yyyyMMdd</string>
3031
<string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
@@ -116,6 +117,8 @@
116117
<string name="search_hint">搜索便签</string>
117118
<string name="search_setting_description">便签中的文字</string>
118119
<string name="search">便签</string>
120+
<string name="datetime_dialog_ok">设置</string>
121+
<string name="datetime_dialog_cancel">取消</string>
119122
<plurals name="search_results_title">
120123
<item quantity="other"><xliff:g id="NUMBER">%1$s</xliff:g> 条符合“<xliff:g id="SEARCH">%2$s</xliff:g>”的搜索结果</item>
121124
</plurals>

‎res/values-zh-rTW/strings.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<string name="notelist_string_info">...</string>
2626
<string name="notelist_menu_new">新建便簽</string>
2727
<string name="delete_remind_time_message">成功刪除提醒</string>
28+
<string name="set_remind_time_message">創建提醒</string>
2829
<string name="note_alert_expired">已過期</string>
2930
<string name="format_date_ymd">yyyyMMdd</string>
3031
<string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
@@ -117,6 +118,8 @@
117118
<string name="search_hint">搜索便籤</string>
118119
<string name="search_setting_description">便籤中的文字</string>
119120
<string name="search">便籤</string>
121+
<string name="datetime_dialog_ok">設置</string>
122+
<string name="datetime_dialog_cancel">取消</string>
120123
<plurals name="search_results_title">
121124
<item quantity="other"><xliff:g id="NUMBER">%1$s</xliff:g> 條符合”<xliff:g id="SEARCH">%2$s</xliff:g>“的搜尋結果</item>
122125
</plurals>

‎res/values/strings.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<string name="notelist_string_info">...</string>
2626
<string name="notelist_menu_new">Add note</string>
2727
<string name="delete_remind_time_message">Delete reminder successfully</string>
28+
<string name="set_remind_time_message">Set reminder</string>
2829
<string name="note_alert_expired">Expired</string>
2930
<string name="format_date_ymd">yyyyMMdd</string>
3031
<string name="format_datetime_mdhm">MMMd kk:mm</string>
@@ -123,6 +124,8 @@
123124
<string name="search_hint">Search notes</string>
124125
<string name="search_setting_description">Text in your notes</string>
125126
<string name="search">Notes</string>
127+
<string name="datetime_dialog_ok">set</string>
128+
<string name="datetime_dialog_cancel">cancel</string>
126129
<plurals name="search_results_title">
127130
<item quantity="one"><xliff:g id="number" example="1">%1$s</xliff:g> result for \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
128131
<!-- Case of 0 or 2 or more results. -->

0 commit comments

Comments
 (0)