Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some pastel love #4

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Some pastel love #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fbd098c
Create README.md
boun Feb 21, 2013
a3a3787
Initial MIUI Love
boun Feb 21, 2013
e038c3f
Storing a resource ID is probably not a good idea ;)
boun Feb 25, 2013
a047838
Wrap Note in a ScrollView, vastly improve perceived performance
boun Feb 25, 2013
6b3b5d5
I devote this commit to Eclipse.
boun Feb 25, 2013
536469a
Was needed by my froyo device
boun Feb 27, 2013
03a54b6
Brown Paperbag ;)
boun Feb 27, 2013
e483301
Remove README
boun Feb 27, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion NotePad/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@

<application android:icon="@drawable/ic_launcher_notepad"
android:label="@string/app_name"
android:theme="@style/MyActionBar"
><!-- android:debuggable="true" -->
<!-- aTrackDog metadata -->
<meta-data android:name="com.a0soft.gphone.aTrackDog.testVersion"
Expand Down Expand Up @@ -105,7 +106,7 @@
</activity>

<activity android:name="NoteEditor"
android:theme="@android:style/Theme.Light"
android:theme="@style/MyActionBar"
android:label="@string/title_note"
android:windowSoftInputMode="stateHidden"
>
Expand Down
16 changes: 16 additions & 0 deletions NotePad/res/drawable/header_bg_brown.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<gradient
android:startColor="@color/lightBrown"
android:endColor="@color/darkBrown"
android:angle="270" />
<stroke
android:width="2dp"
android:color="@color/darkBrown" />
</shape>
</item>

</selector>
30 changes: 30 additions & 0 deletions NotePad/res/drawable/note_item_bg_blue.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" >
<shape>
<gradient
android:startColor="@color/darkBabyBlue"
android:endColor="@color/darkestBabyBlue"
android:angle="270" />
<stroke
android:width="2dp"
android:color="@color/darkBabyBlue" />
<corners
android:radius="3dp" />
</shape>
</item>
<item>
<shape>
<gradient
android:startColor="@color/lightBabyBlue"
android:endColor="@color/darkBabyBlue"
android:angle="270" />
<stroke
android:width="2dp"
android:color="@color/darkBabyBlue" />
<corners
android:radius="3dp" />
</shape>
</item>
</selector>
30 changes: 30 additions & 0 deletions NotePad/res/drawable/note_item_bg_green.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" >
<shape>
<gradient
android:startColor="@color/darkGreen"
android:endColor="@color/darkestGreen"
android:angle="270" />
<stroke
android:width="2dp"
android:color="@color/darkGreen" />
<corners
android:radius="3dp" />
</shape>
</item>
<item>
<shape>
<gradient
android:startColor="@color/lightGreen"
android:endColor="@color/darkGreen"
android:angle="270" />
<stroke
android:width="2dp"
android:color="@color/darkGreen" />
<corners
android:radius="3dp" />
</shape>
</item>
</selector>
30 changes: 30 additions & 0 deletions NotePad/res/drawable/note_item_bg_grey.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" >
<shape>
<gradient
android:startColor="@color/darkGray1"
android:endColor="@color/darkGray2"
android:angle="270" />
<stroke
android:width="2dp"
android:color="@color/darkGray1" />
<corners
android:radius="3dp" />
</shape>
</item>
<item>
<shape>
<gradient
android:startColor="@color/lightGray"
android:endColor="@color/darkGray1"
android:angle="270" />
<stroke
android:width="2dp"
android:color="@color/darkGray1" />
<corners
android:radius="3dp" />
</shape>
</item>
</selector>
30 changes: 30 additions & 0 deletions NotePad/res/drawable/note_item_bg_pink.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" >
<shape>
<gradient
android:startColor="@color/darkPink"
android:endColor="@color/darkestPink"
android:angle="270" />
<stroke
android:width="2dp"
android:color="@color/darkPink" />
<corners
android:radius="3dp" />
</shape>
</item>
<item>
<shape>
<gradient
android:startColor="@color/lightPink"
android:endColor="@color/darkPink"
android:angle="270" />
<stroke
android:width="2dp"
android:color="@color/darkPink" />
<corners
android:radius="3dp" />
</shape>
</item>
</selector>
30 changes: 30 additions & 0 deletions NotePad/res/drawable/note_item_bg_yellow.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" >
<shape>
<gradient
android:startColor="@color/darkYellow"
android:endColor="@color/darkestYellow"
android:angle="270" />
<stroke
android:width="2dp"
android:color="@color/darkYellow" />
<corners
android:radius="3dp" />
</shape>
</item>
<item>
<shape>
<gradient
android:startColor="@color/lightYellow"
android:endColor="@color/darkYellow"
android:angle="270" />
<stroke
android:width="2dp"
android:color="@color/darkYellow" />
<corners
android:radius="3dp" />
</shape>
</item>
</selector>
Binary file added NotePad/res/drawable/notes_background.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added NotePad/res/drawable/notes_btn_changecolors.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added NotePad/res/drawable/transparent72.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added NotePad/res/drawable/zhengwen_xuanyanse.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
70 changes: 59 additions & 11 deletions NotePad/res/layout/note_editor.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,63 @@
* limitations under the License.
-->

<view xmlns:android="http://schemas.android.com/apk/res/android"
class="org.openintents.notepad.NoteEditor$LinedEditText"
android:id="@+id/note"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:background="@android:color/white"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@android:color/transparent"
android:padding="5dip"
android:scrollbars="vertical"
android:fadingEdge="vertical"
android:gravity="top"
android:capitalize="sentences"
/>
android:layout_height="match_parent">

<ScrollView
android:id="@+id/scroll"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:fillViewport="true"
android:fadingEdge="none">
<view android:id="@+id/note"
class="org.openintents.notepad.NoteEditor$LinedEditText"
android:singleLine="false"
android:inputType="textMultiLine"
android:padding="5dip"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@color/darkPink"
android:fadingEdge="none"
android:scrollbars="vertical|horizontal"
android:gravity="top"
android:autoText="false"
android:capitalize="none"
/>
</ScrollView>

<LinearLayout android:id="@+id/editor_color"
android:clickable="true"
android:orientation="horizontal"
android:layout_width="290.0dp" android:layout_height="wrap_content"
android:layout_gravity="top|center" android:gravity="center"
android:layout_marginTop="70.0dp"
android:background="@drawable/zhengwen_xuanyanse"
android:visibility="gone">
<ImageView android:id="@+id/editor_color_yellow"
android:layout_weight="1.0" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:scaleType="center"
android:background="@drawable/transparent72" />
<ImageView android:id="@+id/editor_color_pink"
android:layout_weight="1.0" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:scaleType="center"
android:background="@drawable/transparent72" />
<ImageView android:id="@+id/editor_color_blue"
android:layout_weight="1.0" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:scaleType="center"
android:background="@drawable/transparent72" />
<ImageView android:id="@+id/editor_color_green"
android:layout_weight="1.0" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:scaleType="center"
android:background="@drawable/transparent72" />
<ImageView android:id="@+id/editor_color_gray"
android:layout_weight="1.0" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:scaleType="center"
android:background="@drawable/transparent72" />
</LinearLayout>

</FrameLayout>
15 changes: 1 addition & 14 deletions NotePad/res/layout/noteslist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,9 @@

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:background="@drawable/notes_background"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<!--
<LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content">

<Button android:id="@+id/add"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/menu_insert"
android:layout_gravity="center" />

</LinearLayout>
-->
<Spinner
android:id="@+id/tagselection"
android:layout_width="fill_parent"
Expand Down
24 changes: 11 additions & 13 deletions NotePad/res/layout/noteslist_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,37 +16,36 @@
* limitations under the License.
*/
-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="8dip" android:layout_marginRight="12dip"
android:minHeight="?android:attr/listPreferredItemHeight"
><!-- android:layout_marginTop="8dip" android:layout_marginBottom="8dip"
-->
<LinearLayout
>
<LinearLayout
android:orientation="vertical"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:layout_marginLeft="5dip"
><!-- android:layout_alignParentLeft="true"
-->
>
<org.openintents.notepad.noteslist.MarqueeTextView
android:id="@+id/title"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:drawablePadding="1dp"
android:textAppearance="?android:attr/textAppearanceLarge"
android:singleLine="true"
android:singleLine="true"
android:background="@drawable/note_item_bg_yellow"
android:ellipsize="end"
android:scrollHorizontally="true"
android:textColor="#ff4b4b4b"
android:padding="20dp"
/>
<!-- CheckedTextView: android:checkMark="?android:attr/listChoiceIndicatorMultiple"
-->
<TextView
android:id="@+id/info"
android:id="@+id/info"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:visibility="gone"
Expand All @@ -62,7 +61,6 @@
android:layout_gravity="center_vertical"
/>


</LinearLayout>

<!--
Expand Down
27 changes: 27 additions & 0 deletions NotePad/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Note colors -->
<color name="lightYellow">#faffd1</color>
<color name="darkYellow">#eef3c1</color>
<color name="darkestYellow">#cdd0a4</color>

<color name="gray">#CCCCCC</color>
<color name="lightGray">#EFEFEF</color>
<color name="darkGray1">#848484</color>
<color name="darkGray2">#2D2D2D</color>

<color name="lightBrown">#825f3f</color>
<color name="darkBrown">#5b371d</color>

<color name="lightBabyBlue">#ddf2ff</color>
<color name="darkBabyBlue">#ddf2ff</color>
<color name="darkestBabyBlue">#acd6f1</color>

<color name="lightPink">#ffeded</color>
<color name="darkPink">#ffeded</color>
<color name="darkestPink">#d1c2c2</color>

<color name="lightGreen">#eafecf</color>
<color name="darkGreen">#cfe08a</color>
<color name="darkestGreen">#b3c665</color>
</resources>
2 changes: 2 additions & 0 deletions NotePad/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@
<!-- <string name="no_notes">Note list is empty.</string> -->

<string name="menu_share">Share</string>
<string name="menu_color">Color</string>

<string name="empty_note">Empty note</string>
<string name="share_not_available">No application available for sharing.</string>

Expand Down
Loading