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

Fixed Dark Mode #8

Open
wants to merge 1 commit into
base: main
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
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/home_bg.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">

<solid android:color="@color/white"/>
<solid android:color="?attr/colorOnBackground"/>
<corners android:topRightRadius="32dp"
android:topLeftRadius="24dp"/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
android:layout_marginTop="40dp"
android:layout_marginEnd="24dp"
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="32sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand Down Expand Up @@ -118,7 +117,6 @@ last name of Hitler?" />
android:layout_height="wrap_content"
android:layout_marginTop="60dp"
android:layout_marginBottom="60dp"
android:textColor="@color/black"
android:textSize="26sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/btnNextQuestionLiteratureAndGeography"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_history.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/arrow"
app:tint="@color/black" />
app:tint="?attr/tint" />

<TextView
android:id="@+id/textView"
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/res/layout/activity_login.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
android:layout_height="wrap_content"
android:layout_marginTop="160dp"
android:text="@string/welcome_back"
android:textColor="@color/black"
android:textSize="28sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
Expand All @@ -26,7 +25,6 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/login_to_continue"
android:textColor="@color/black"
android:textSize="18sp"
app:layout_constraintEnd_toEndOf="@+id/tvSignUp2"
app:layout_constraintStart_toStartOf="@+id/tvSignUp2"
Expand Down Expand Up @@ -76,6 +74,7 @@
style="@style/btnStyle"
android:layout_width="0dp"
android:layout_marginTop="32dp"
android:textColor="@color/white"
android:text="@string/login"
app:layout_constraintEnd_toEndOf="@+id/textInputLayout2"
app:layout_constraintHorizontal_bias="0.464"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_main.xml
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/peach"
android:background="?attr/backgroundColor"
tools:context=".MainActivity">


Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/layout/activity_math_quiz.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
android:layout_marginTop="80dp"
android:layout_marginEnd="24dp"
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="32sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand Down Expand Up @@ -86,7 +85,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:textColor="@color/black"
android:textSize="26sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/btnNextQuestionMath"
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/layout/slide_rules.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
android:layout_marginEnd="24dp"
android:textSize="24sp"
android:textAlignment="center"
android:textColor="@color/black"
android:text="@string/rules1_description"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/values-night/themes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
<item name="colorOnSecondary">@color/black</item>
<!-- Status bar color. -->
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
<item name="android:textColor">@color/white</item>
<item name="backgroundColor">@color/teal_200</item>
<item name="colorOnBackground">@color/black</item>
<!-- Customize your theme here. -->
</style>

Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/values/themes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@
<!-- Status bar color. -->
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
<!-- Customize your theme here. -->

<item name="android:textColor">@color/black</item>
<item name="textInputStyle">@style/editTextLayoutStyle</item>
<item name="backgroundColor">@color/peach</item>
<item name="colorOnBackground">@color/white</item>
</style>

<style name="splashScreenTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
Expand Down Expand Up @@ -53,7 +55,6 @@

<style name="titleTextStyle">
<item name="android:textSize">28sp</item>
<item name="android:textColor">@color/black</item>
<item name="android:textStyle">bold</item>
</style>

Expand Down Expand Up @@ -83,7 +84,6 @@

<style name="text_radio_button_answer">
<item name="android:textSize">20sp</item>
<item name="android:textColor">@color/black</item>
<item name="buttonTint">@color/peach</item>
</style>

Expand Down
15 changes: 8 additions & 7 deletions local.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
## This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
sdk.dir=C\:\\Users\\sagar\\AppData\\Local\\Android\\Sdk
## This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Tue Oct 19 19:43:23 BDT 2021
sdk.dir=/home/istiak/Android/Sdk