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.

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

set the statausbarcolor according to desighn guideliness requirement #236

Open
wants to merge 2 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="36dp"
android:height="36dp"
android:viewportWidth="48"
android:viewportHeight="48"
android:tint="@color/white"
>
<path
android:fillColor="@android:color/white"
android:pathData="M8.35,40V37H14.85L14.1,36.4Q10.9,33.85 9.45,30.85Q8,27.85 8,24.15Q8,18.85 11.125,14.625Q14.25,10.4 19.35,8.8V11.9Q15.6,13.35 13.3,16.725Q11,20.1 11,24.15Q11,27.3 12.175,29.625Q13.35,31.95 15.35,33.65L16.85,34.7V28.5H19.85V40ZM28.7,39.25V36.1Q32.5,34.65 34.75,31.275Q37,27.9 37,23.85Q37,21.45 35.825,18.975Q34.65,16.5 32.75,14.6L31.3,13.3V19.5H28.3V8H39.8V11H33.25L34,11.7Q37,14.5 38.5,17.7Q40,20.9 40,23.85Q40,29.15 36.9,33.4Q33.8,37.65 28.7,39.25Z"/>
</vector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="36dp"
android:height="36dp"
android:viewportWidth="48"
android:viewportHeight="48"
android:tint="@color/white">
<path
android:fillColor="@android:color/white"
android:pathData="M12.55,40Q8.15,40 5.075,36.925Q2,33.85 2,29.45Q2,25.55 4.5,22.6Q7,19.65 10.85,19.05Q11.85,14.2 15.55,11.125Q19.25,8.05 24.1,8.05Q29.7,8.05 33.55,12.125Q37.4,16.2 37.4,21.9V23.1Q41,23 43.5,25.425Q46,27.85 46,31.55Q46,35 43.5,37.5Q41,40 37.55,40ZM12.55,37H37.55Q39.8,37 41.4,35.4Q43,33.8 43,31.55Q43,29.3 41.4,27.7Q39.8,26.1 37.55,26.1H34.4V21.9Q34.4,17.35 31.35,14.2Q28.3,11.05 23.9,11.05Q19.5,11.05 16.425,14.2Q13.35,17.35 13.35,21.9H12.4Q9.3,21.9 7.15,24.075Q5,26.25 5,29.45Q5,32.6 7.2,34.8Q9.4,37 12.55,37ZM24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Z"/>
</vector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="36dp"
android:height="36dp"
android:viewportWidth="48"
android:viewportHeight="48"
android:tint="@color/white">
<path
android:fillColor="@android:color/white"
android:pathData="M22.65,34H25.65V22H22.65ZM24,18.3Q24.7,18.3 25.175,17.85Q25.65,17.4 25.65,16.7Q25.65,16 25.175,15.5Q24.7,15 24,15Q23.3,15 22.825,15.5Q22.35,16 22.35,16.7Q22.35,17.4 22.825,17.85Q23.3,18.3 24,18.3ZM24,44Q19.9,44 16.25,42.425Q12.6,40.85 9.875,38.125Q7.15,35.4 5.575,31.75Q4,28.1 4,23.95Q4,19.85 5.575,16.2Q7.15,12.55 9.875,9.85Q12.6,7.15 16.25,5.575Q19.9,4 24.05,4Q28.15,4 31.8,5.575Q35.45,7.15 38.15,9.85Q40.85,12.55 42.425,16.2Q44,19.85 44,24Q44,28.1 42.425,31.75Q40.85,35.4 38.15,38.125Q35.45,40.85 31.8,42.425Q28.15,44 24,44ZM24.05,41Q31.1,41 36.05,36.025Q41,31.05 41,23.95Q41,16.9 36.05,11.95Q31.1,7 24,7Q16.95,7 11.975,11.95Q7,16.9 7,24Q7,31.05 11.975,36.025Q16.95,41 24.05,41ZM24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Z"/>
</vector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="36dp"
android:height="36dp"
android:viewportWidth="48"
android:viewportHeight="48"
android:tint="@color/white">
<path
android:fillColor="@android:color/white"
android:pathData="M19.4,44 L18.4,37.7Q17.45,37.35 16.4,36.75Q15.35,36.15 14.55,35.5L8.65,38.2L4,30L9.4,26.05Q9.3,25.6 9.275,25.025Q9.25,24.45 9.25,24Q9.25,23.55 9.275,22.975Q9.3,22.4 9.4,21.95L4,18L8.65,9.8L14.55,12.5Q15.35,11.85 16.4,11.25Q17.45,10.65 18.4,10.35L19.4,4H28.6L29.6,10.3Q30.55,10.65 31.625,11.225Q32.7,11.8 33.45,12.5L39.35,9.8L44,18L38.6,21.85Q38.7,22.35 38.725,22.925Q38.75,23.5 38.75,24Q38.75,24.5 38.725,25.05Q38.7,25.6 38.6,26.1L44,30L39.35,38.2L33.45,35.5Q32.65,36.15 31.625,36.775Q30.6,37.4 29.6,37.7L28.6,44ZM24,30.5Q26.7,30.5 28.6,28.6Q30.5,26.7 30.5,24Q30.5,21.3 28.6,19.4Q26.7,17.5 24,17.5Q21.3,17.5 19.4,19.4Q17.5,21.3 17.5,24Q17.5,26.7 19.4,28.6Q21.3,30.5 24,30.5ZM24,27.5Q22.55,27.5 21.525,26.475Q20.5,25.45 20.5,24Q20.5,22.55 21.525,21.525Q22.55,20.5 24,20.5Q25.45,20.5 26.475,21.525Q27.5,22.55 27.5,24Q27.5,25.45 26.475,26.475Q25.45,27.5 24,27.5ZM24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24ZM21.8,41H26.2L26.9,35.4Q28.55,35 30.025,34.15Q31.5,33.3 32.7,32.1L38,34.4L40,30.8L35.3,27.35Q35.5,26.5 35.625,25.675Q35.75,24.85 35.75,24Q35.75,23.15 35.65,22.325Q35.55,21.5 35.3,20.65L40,17.2L38,13.6L32.7,15.9Q31.55,14.6 30.1,13.725Q28.65,12.85 26.9,12.6L26.2,7H21.8L21.1,12.6Q19.4,12.95 17.925,13.8Q16.45,14.65 15.3,15.9L10,13.6L8,17.2L12.7,20.65Q12.5,21.5 12.375,22.325Q12.25,23.15 12.25,24Q12.25,24.85 12.375,25.675Q12.5,26.5 12.7,27.35L8,30.8L10,34.4L15.3,32.1Q16.5,33.3 17.975,34.15Q19.45,35 21.1,35.4Z"/>
</vector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="36dp"
android:height="36dp"
android:viewportWidth="48"
android:viewportHeight="48"
android:tint="@color/white">
<path
android:fillColor="@android:color/white"
android:pathData="M40.45,45.2 L32.65,37.4Q31.65,38.05 30.7,38.475Q29.75,38.9 28.7,39.25V36.1Q29.15,35.95 29.6,35.725Q30.05,35.5 30.5,35.25L12.8,17.55Q11.85,19.1 11.425,20.825Q11,22.55 11,24.15Q11,27.05 12.075,29.425Q13.15,31.8 15.35,33.65L16.85,34.7V28.5H19.85V40H8.35V37H14.85L14.1,36.4Q10.7,33.7 9.325,30.65Q7.95,27.6 8,24.15Q8.05,21.45 8.75,19.3Q9.45,17.15 10.65,15.4L2.85,7.6L4.9,5.55L42.5,43.15ZM36.85,33.4 L34.75,31.3Q35.8,29.65 36.4,27.8Q37,25.95 37,23.85Q37,21.55 35.875,19.075Q34.75,16.6 32.75,14.6L31.3,13.3V19.5H28.3V8H39.8V11H33.25L34,11.7Q37.2,14.7 38.6,17.9Q40,21.1 40,23.85Q40,26.55 39.225,28.9Q38.45,31.25 36.85,33.4ZM16.7,13.25 L14.65,11.2Q15.75,10.35 16.925,9.775Q18.1,9.2 19.35,8.8V11.9Q18.7,12.15 18.025,12.5Q17.35,12.85 16.7,13.25Z"/>
</vector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="36dp"
android:height="36dp"
android:viewportWidth="48"
android:viewportHeight="48"
android:tint="@color/white">
<path
android:fillColor="@android:color/white"
android:pathData="M22.6,26.5V14.05H25.6V26.5ZM24,33.9Q23.4,33.9 22.95,33.45Q22.5,33 22.5,32.4Q22.5,31.8 22.95,31.35Q23.4,30.9 24,30.9Q24.6,30.9 25.05,31.35Q25.5,31.8 25.5,32.4Q25.5,33 25.05,33.45Q24.6,33.9 24,33.9ZM30.25,8H41.4V11H35.2L35.95,11.7Q39.05,14.55 40.325,17.7Q41.6,20.85 41.6,23.85Q41.6,29.25 38.45,33.575Q35.3,37.9 30.25,39.55V36.4Q34.05,34.95 36.325,31.5Q38.6,28.05 38.6,23.85Q38.6,21.15 37.7,18.825Q36.8,16.5 34.75,14.65L33.25,13.3V19.15H30.25ZM17.75,40H6.6V37H12.75L12.05,36.3Q9.05,33.3 7.725,30.225Q6.4,27.15 6.4,24.2Q6.4,18.75 9.525,14.45Q12.65,10.15 17.75,8.5V11.6Q13.95,13.1 11.675,16.55Q9.4,20 9.4,24.2Q9.4,26.8 10.275,29.125Q11.15,31.45 13.25,33.35L14.75,34.7V28.85H17.75Z"/>
</vector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="36dp"
android:height="36dp"
android:viewportWidth="48"
android:viewportHeight="48"
android:tint="@color/white">
<path
android:fillColor="@android:color/white"
android:pathData="M21.8,30.65 L33.2,19.25 31.1,17.2 21.95,26.35 16.9,21.3 14.7,23.5ZM24,43.95Q17,42.2 12.5,35.825Q8,29.45 8,21.85V9.95L24,3.95L40,9.95V21.85Q40,29.45 35.5,35.825Q31,42.2 24,43.95ZM24,40.85Q29.75,38.95 33.375,33.675Q37,28.4 37,21.85V12.05L24,7.15L11,12.05V21.85Q11,28.4 14.625,33.675Q18.25,38.95 24,40.85ZM24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Q24,24 24,24Z"/>
</vector>
31 changes: 31 additions & 0 deletions androidlibrary_lib/src/main/res/values-night/colors.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2009 University of Washington

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.
-->
<resources>
<color name="red">#7f00</color>
<color name="white">#ffffffff</color>
<color name="black">#ff000000</color>
<color name="blue">#770000ff</color>
<color name="green">#7700ff00</color>
<color name="yellow">#77ffff00</color>

<color name="solid_red">#f00</color>
<color name="solid_blue">#0000ff</color>
<color name="solid_green">#f0f0</color>
<color name="solid_yellow">#ffffff00</color>

<color name="background_txtButton">#1d1d1d</color>

</resources>
23 changes: 23 additions & 0 deletions androidlibrary_lib/src/main/res/values-night/theme.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- ActionBar style -->
<style name="OdkActionBar"
parent="Widget.AppCompat.Light.ActionBar.Solid">
<item name="displayOptions">useLogo|showHome|showTitle</item>
<item name="background">@color/background_txtButton</item>
<item name="logo">@drawable/app_logo</item>
</style>

<style name="Opendatakit" parent="Theme.AppCompat.DayNight">
<item name="android:scrollbarThumbHorizontal">@drawable/thumb</item>
<item name="android:scrollbarThumbVertical">@drawable/thumb</item>
<item name="android:scrollbarSize">2.5mm</item>
<item name="android:scrollbarAlwaysDrawVerticalTrack">true</item>
<item name="android:scrollbarAlwaysDrawHorizontalTrack">true</item>
<item name="android:colorPrimary">@color/background_txtButton</item>
<item name="android:colorPrimaryDark">@color/background_txtButton</item>
<!-- <item name="android:windowLightStatusBar" tools:ignore="NewApi">true</item>-->
<item name="actionBarStyle">@style/OdkActionBar</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
</style>
</resources>
2 changes: 2 additions & 0 deletions androidlibrary_lib/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,6 @@ the License.
<color name="solid_green">#f0f0</color>
<color name="solid_yellow">#ffffff00</color>

<color name="background_txtButton">#fdfdfd</color>

</resources>
9 changes: 6 additions & 3 deletions androidlibrary_lib/src/main/res/values/theme.xml
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- ActionBar style -->
<style name="OdkActionBar"
parent="Widget.AppCompat.Light.ActionBar.Solid">
<item name="displayOptions">useLogo|showHome|showTitle</item>
<item name="background">@color/white</item>
<item name="background">@color/background_txtButton</item>
<item name="logo">@drawable/app_logo</item>
</style>

<style name="Opendatakit" parent="Theme.AppCompat.Light">
<style name="Opendatakit" parent="Theme.AppCompat.DayNight">
<item name="android:scrollbarThumbHorizontal">@drawable/thumb</item>
<item name="android:scrollbarThumbVertical">@drawable/thumb</item>
<item name="android:scrollbarSize">2.5mm</item>
<item name="android:scrollbarAlwaysDrawVerticalTrack">true</item>
<item name="android:scrollbarAlwaysDrawHorizontalTrack">true</item>
<item name="android:colorPrimary">@color/background_txtButton</item>
<item name="android:colorPrimaryDark">@color/background_txtButton</item>
<item name="android:windowLightStatusBar" tools:ignore="NewApi">true</item>
<item name="actionBarStyle">@style/OdkActionBar</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
</style>
Expand Down