Skip to content

Commit

Permalink
Merge pull request #35 from dimagi/nav_bar
Browse files Browse the repository at this point in the history
Navigation Bar
  • Loading branch information
orangejenny committed Oct 3, 2014
2 parents 53c15bb + d3dec61 commit 76c717a
Show file tree
Hide file tree
Showing 27 changed files with 1,005 additions and 132 deletions.
2 changes: 1 addition & 1 deletion AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

<uses-sdk
android:minSdkVersion="4"></uses-sdk>
android:minSdkVersion="5"></uses-sdk>
<supports-screens
android:resizeable="true"
android:smallScreens="true"
Expand Down
34 changes: 34 additions & 0 deletions res/drawable/badge_background.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2008 The Android Open Source Project
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.
-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:top="@dimen/nav_border_depth" android:left="@dimen/nav_border_depth" android:bottom="@dimen/nav_border_depth" android:right="@dimen/nav_border_depth">
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">

<solid
android:color="#BF3D3D"/>

<!--Note that the following don't really matter, since the
drawable fills its container when it's set as a background -->
<size
android:width="@dimen/badge_circum_outer"
android:height="@dimen/badge_circum_outer"/>
</shape>
</item>
</layer-list>

34 changes: 34 additions & 0 deletions res/drawable/badge_background_complete.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2008 The Android Open Source Project
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.
-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:top="@dimen/nav_border_depth" android:left="@dimen/nav_border_depth" android:bottom="@dimen/nav_border_depth" android:right="@dimen/nav_border_depth">
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">

<solid
android:color="#2C9746"/>

<!--Note that the following don't really matter, since the
drawable fills its container when it's set as a background -->
<size
android:width="@dimen/badge_circum_outer"
android:height="@dimen/badge_circum_outer"/>
</shape>
</item>
</layer-list>

32 changes: 32 additions & 0 deletions res/drawable/badge_border.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2008 The Android Open Source Project
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.
-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:top="1dp" android:bottom="1dp" android:left="1dp" android:right="1dp">
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">

<solid
android:color="@color/dark_grey"/>

<size
android:width="@dimen/badge_circum_border"
android:height="@dimen/badge_circum_border"/>
</shape>
</item>
</layer-list>

Binary file added res/drawable/icon_back.png
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 res/drawable/icon_done.png
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 res/drawable/icon_exit.png
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 res/drawable/icon_new.png
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 res/drawable/icon_next.png
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 res/drawable/icon_pressed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions res/drawable/label_floating_bad.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >

<item>
<shape android:shape="rectangle">
<solid android:color="@color/solid_dark_red"/>
</shape>
</item>

</layer-list>
10 changes: 10 additions & 0 deletions res/drawable/label_floating_caution.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >

<item>
<shape android:shape="rectangle">
<solid android:color="@color/solid_dark_orange"/>
</shape>
</item>

</layer-list>
10 changes: 10 additions & 0 deletions res/drawable/label_floating_good.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >

<item>
<shape android:shape="rectangle">
<solid android:color="@color/bright_green_grad_end"/>
</shape>
</item>

</layer-list>
43 changes: 43 additions & 0 deletions res/drawable/progressbar_full.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2008 The Android Open Source Project
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.
-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/background">
<shape>
<gradient
android:startColor="@color/grey_grad_start"
android:endColor="@color/grey_grad_end"
android:angle="270"

/>
<corners android:radius="10dp" />
</shape>
</item>
<item android:id="@android:id/progress">
<clip>
<shape>
<gradient
android:startColor="@color/bright_green_grad_start"
android:endColor="@color/bright_green_grad_end"
android:angle="270"
/>
<corners android:radius="10dp" />
</shape>
</clip>
</item>

</layer-list>

17 changes: 17 additions & 0 deletions res/drawable/selector_button_press.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_enabled="false"
android:drawable="@android:color/transparent" />
<item
android:state_pressed="true"
android:state_enabled="true"
android:drawable="@drawable/icon_pressed" />
<item
android:state_focused="true"
android:state_enabled="true"
android:drawable="@android:color/transparent" />
<item
android:state_enabled="true"
android:drawable="@android:color/transparent" />
</selector>
12 changes: 12 additions & 0 deletions res/drawable/top_border_black.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >

<!-- "shadow" -->
<item android:left="-2dp" android:bottom="-2dp" android:right="-2dp">
<shape android:shape="rectangle" >
<solid android:color="@android:color/transparent"/>
<stroke android:width="2dp" android:color="@color/dark_grey"/>
</shape>
</item>

</layer-list>
11 changes: 11 additions & 0 deletions res/layout/component_floating_label.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/FloatingLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingBottom="1dp"
android:paddingTop="1dp"
android:text="" >

</TextView>
54 changes: 54 additions & 0 deletions res/layout/component_repeat_new_dialog.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="0dp"
android:divider="?android:attr/listDivider"
android:dividerPadding="12dp"
android:showDividers="middle"
android:weightSum="3" >

<Button
android:id="@+id/component_repeat_back"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@android:drawable/list_selector_background"
android:drawablePadding="5dp"
android:drawableTop="@drawable/icon_back"
android:paddingBottom="4dp"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:paddingTop="15dp"
android:text="Go Back" />

<Button
android:id="@+id/component_repeat_new"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@android:drawable/list_selector_background"
android:drawablePadding="5dp"
android:drawableTop="@drawable/icon_new"
android:paddingBottom="4dp"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:paddingTop="15dp"
android:text="Add Group" />

<Button
android:id="@+id/component_repeat_skip"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@android:drawable/list_selector_background"
android:drawablePadding="5dp"
android:drawableTop="@drawable/icon_next"
android:paddingBottom="4dp"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:paddingTop="15dp"
android:text="Do Not Add" />

</LinearLayout>
Loading

0 comments on commit 76c717a

Please sign in to comment.