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

Added dark theme #95

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added dark theme #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions .idea/deploymentTargetDropDown.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/other.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/src/main/java/dev/marcosfarias/pokedex/ui/newsdetail/NewsDetailFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ class NewsDetailFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
activity?.window?.statusBarColor =
PokemonColorUtil(view.context).convertColor(R.color.white)
PokemonColorUtil(view.context).convertColor(R.color.backgroundLight)
}
}
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/background_item_pokemon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<item android:id="@android:id/mask">
<shape>
<!-- Color doesn't matter -->
<solid android:color="@android:color/white" />
<solid android:color="@color/background" />
<corners android:radius="15dp" />
</shape>
</item>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/background_search_bar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<item>
<shape>
<solid
android:color="@color/white" />
android:color="@color/background" />
<corners android:radius="32dp" />
</shape>
</item>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/drawable/rounded_bottom_border.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="@color/backgroundLight" />
<solid android:color="@color/background" />
</shape>
</item>

<item>
<shape>
<solid android:color="@color/white" />
<solid android:color="@color/backgroundLight" />

<corners
android:bottomLeftRadius="32dp"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/rounded_bottom_border_red.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="@color/white" />
<solid android:color="@color/background" />
</shape>
</item>

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/rounded_top_border.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="@color/backgroundLight" />
<solid android:color="@color/background" />
<corners
android:bottomLeftRadius="0dp"
android:bottomRightRadius="0dp"
Expand Down
20 changes: 10 additions & 10 deletions app/src/main/res/layout/fragment_about.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/backgroundLight"
android:background="@color/background"
android:fillViewport="true"
android:paddingStart="16dp"
android:paddingEnd="16dp">
Expand Down Expand Up @@ -53,7 +53,7 @@
android:id="@+id/textViewHeight"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textColor="@color/textColor"
android:textSize="16sp"
tools:text="2,3.5 (0.70 cm)" />

Expand All @@ -77,7 +77,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="15.2 lbs (6.9kg)"
android:textColor="@color/black"
android:textColor="@color/textColor"
android:textSize="16sp" />

</LinearLayout>
Expand All @@ -90,7 +90,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="Breeding"
android:textColor="@color/black"
android:textColor="@color/textColor"
android:textSize="18sp"
android:textStyle="bold" />

Expand All @@ -114,7 +114,7 @@
android:layout_height="wrap_content"
android:layout_weight="2"
android:text="\u2641 87.5% \u2640 12.5%"
android:textColor="@color/black"
android:textColor="@color/textColor"
android:textSize="16sp" />

</LinearLayout>
Expand All @@ -138,7 +138,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:textColor="@color/black"
android:textColor="@color/textColor"
android:textSize="16sp"
tools:text="\u2641 87.5% \u2640 12.5%" />

Expand All @@ -163,7 +163,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:textColor="@color/black"
android:textColor="@color/textColor"
android:textSize="16sp"
tools:text="\u2640 87.5% \u2642 12.5%" />

Expand All @@ -174,7 +174,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="Location"
android:textColor="@color/black"
android:textColor="@color/textColor"
android:textSize="18sp"
android:textStyle="bold" />

Expand All @@ -191,7 +191,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="Training"
android:textColor="@color/black"
android:textColor="@color/textColor"
android:textSize="18sp"
android:textStyle="bold" />

Expand All @@ -215,7 +215,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:textColor="@color/black"
android:textColor="@color/textColor"
android:textSize="16sp"
tools:text="65" />

Expand Down
8 changes: 4 additions & 4 deletions app/src/main/res/layout/fragment_dashboard.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@
android:layout_height="?attr/actionBarSize"
app:tabGravity="fill"
app:tabMode="fixed"
app:tabSelectedTextColor="@color/red"
app:tabTextAppearance="@android:style/TextAppearance.Widget.TabWidget"
app:tabTextColor="@color/black">
app:tabTextColor="@color/textColor"
app:tabSelectedTextColor="?attr/colorAccent"
app:tabTextAppearance="@android:style/TextAppearance.Widget.TabWidget">

<com.google.android.material.tabs.TabItem
android:layout_width="wrap_content"
Expand Down Expand Up @@ -179,7 +179,7 @@
android:id="@+id/viewPager"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/backgroundLight" />
android:background="@color/background" />
</androidx.core.widget.NestedScrollView>


Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/fragment_generation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/generation"
android:textColor="@color/black"
android:textColor="@color/textColor"
android:textSize="22sp"
android:textStyle="bold" />

Expand All @@ -37,7 +37,7 @@
android:overScrollMode="never"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:background="@color/backgroundLight"
android:background="@color/background"
app:layoutManager="GridLayoutManager"
tools:itemCount="8"
tools:listitem="@layout/item_generation"
Expand Down
16 changes: 8 additions & 8 deletions app/src/main/res/layout/fragment_home.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/red"
android:background="@color/background"
android:fitsSystemWindows="true">

<RelativeLayout
Expand All @@ -24,15 +24,15 @@
android:layout_marginEnd="-90dp"
android:adjustViewBounds="true"
android:alpha="0.10"
android:background="@drawable/pokeball"
android:tint="@color/white" />
android:src="@drawable/pokeball"
android:tint="@color/grey" />

<View
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:background="@color/white" />
android:background="@color/background" />

</RelativeLayout>

Expand Down Expand Up @@ -114,7 +114,7 @@
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@color/background"
android:overScrollMode="never"
app:layout_behavior="@string/appbar_scrolling_view_behavior">

Expand Down Expand Up @@ -142,15 +142,15 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/backgroundLight"
android:background="@color/background"
android:padding="16dp">

<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/pokemon_news"
android:textColor="@color/black"
android:textColor="@color/textColor"
android:textSize="22sp"
android:textStyle="bold" />

Expand All @@ -166,7 +166,7 @@
android:id="@+id/recyclerViewNews"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/backgroundLight"
android:background="@color/background"
android:overScrollMode="never"
app:layoutManager="GridLayoutManager"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/layout/fragment_news_detail.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/backgroundLight"
android:background="@color/background"
android:fitsSystemWindows="false">

<com.google.android.material.appbar.AppBarLayout
Expand Down Expand Up @@ -40,7 +40,7 @@
android:layout_marginEnd="16dp"
android:adjustViewBounds="true"
android:background="@drawable/news1"
android:tint="@color/white" />
android:tint="@color/background" />

<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
Expand All @@ -57,7 +57,7 @@
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:text="@string/news_title"
android:textColor="@color/black"
android:textColor="@color/textColor"
android:textSize="28sp"
android:textStyle="bold" />

Expand Down
9 changes: 4 additions & 5 deletions app/src/main/res/layout/fragment_pokedex.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@color/background"
android:fitsSystemWindows="true">

<ImageView
Expand All @@ -17,8 +17,8 @@
android:layout_marginEnd="-80dp"
android:adjustViewBounds="true"
android:alpha="0.10"
android:background="@drawable/pokeball"
android:tint="@color/white" />
android:src="@drawable/pokeball"
android:tint="@color/red" />

<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
Expand Down Expand Up @@ -47,7 +47,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/app_name"
android:textColor="@color/black"
android:textSize="22sp"
android:textStyle="bold" />

Expand All @@ -63,7 +62,7 @@
android:layout_height="match_parent"
android:overScrollMode="never"
android:paddingStart="8dp"
android:background="@color/white"
android:background="@color/background"
android:paddingEnd="8dp"
app:layoutManager="GridLayoutManager"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/fragment_search.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:textSize="16sp"
android:textColor="@color/textColor"
android:text="@string/main_search" />

</LinearLayout>
Expand Down
Loading