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

Jump to bottom

Dark Mode for Risk Page #400

Merged
merged 4 commits into from Oct 11, 2020
Merged

Dark Mode for Risk Page #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
649f719
Merge pull request #1 from WildAid/main
ashwinpilgaonkar Oct 9, 2020
bcc8d0e
Merge pull request #2 from WildAid/main
ashwinpilgaonkar Oct 10, 2020
66b3914
Added Dark mode - Risk page
ashwinpilgaonkar Oct 10, 2020
bd8bb8b
Merge branch 'main' of https://github.com/ashwinpilgaonkar/o-fish-and…
ashwinpilgaonkar Oct 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions app/src/main/res/color-night/button_selector_text_amber.xml
View file
Open in desktop
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/black_1" android:state_pressed="true" />
<item android:color="@color/black_1" android:state_focused="true" />
<item android:color="@color/black_1" android:state_selected="true" />
<item android:color="@color/amber" />
</selector>
7 changes: 7 additions & 0 deletions app/src/main/res/color-night/button_selector_text_green.xml
View file
Open in desktop
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/black_1" android:state_pressed="true" />
<item android:color="@color/black_1" android:state_focused="true" />
<item android:color="@color/black_1" android:state_selected="true" />
<item android:color="@color/green" />
</selector>
7 changes: 7 additions & 0 deletions app/src/main/res/color-night/button_selector_text_red.xml
View file
Open in desktop
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/black_1" android:state_pressed="true" />
<item android:color="@color/black_1" android:state_focused="true" />
<item android:color="@color/black_1" android:state_selected="true" />
<item android:color="@color/red" />
</selector>
18 changes: 18 additions & 0 deletions app/src/main/res/drawable-night/selector_button_amber.xml
View file
Open in desktop
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/amber">
<item android:state_selected="true">
<shape android:shape="rectangle">
<corners android:radius="20dp" />
<solid android:color="@color/amber" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<corners android:radius="20dp" />
<solid android:color="@color/black_2" />
<stroke
android:width="1dp"
android:color="@color/amber" />
</shape>
</item>
</selector>
18 changes: 18 additions & 0 deletions app/src/main/res/drawable-night/selector_button_green.xml
View file
Open in desktop
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/green">
<item android:state_selected="true">
<shape android:shape="rectangle">
<corners android:radius="20dp" />
<solid android:color="@color/green" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<corners android:radius="20dp" />
<solid android:color="@color/black_2" />
<stroke
android:width="1dp"
android:color="@color/green" />
</shape>
</item>
</selector>
18 changes: 18 additions & 0 deletions app/src/main/res/drawable-night/selector_button_red.xml
View file
Open in desktop
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true">
<shape android:shape="rectangle">
<corners android:radius="20dp" />
<solid android:color="@color/red" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<corners android:radius="20dp" />
<solid android:color="@color/black_2" />
<stroke
android:width="1dp"
android:color="@color/red" />
</shape>
</item>
</selector>
3 changes: 2 additions & 1 deletion app/src/main/res/layout/fragment_risk.xml
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:background="@color/background_card"
android:paddingStart="18dp"
android:paddingTop="18dp"
android:paddingEnd="18dp"
Expand All @@ -36,6 +36,7 @@
android:layout_width="0dp"
android:layout_height="36sp"
android:text="@string/risk"
android:textColor="@color/header_color"
app:layout_constraintEnd_toStartOf="@id/risk_action_icon"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/values-night/colors.xml
View file
Open in desktop
Expand Up @@ -16,15 +16,15 @@
<color name="medium_grey">#B9B9B9</color>
<color name="tab_inactive">#979797</color>
<color name="white">#FFFFFF</color>
<color name="green">#008537</color>
<color name="green">#52D287</color>
<color name="light_green">#ECF4EF</color>
<color name="green_background">#DEEFE5</color>
<color name="green_text">#006128</color>
<color name="amber">#FFBF22</color>
<color name="amber">#FFD575</color>
<color name="light_amber">#4CFFECBC</color>
<color name="amber_text">#614500</color>
<color name="amber_background">#FFECBC</color>
<color name="red">#CF2222</color>
<color name="red">#FF6666</color>
<color name="light_red">#4CF6D4D4</color>
<color name="red_text">#960B0B</color>
<color name="red_text_2">#891515</color>
Expand Down