Skip to content

Theme night and light #3

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

Merged
chuthientuan merged 1 commit into from
Feb 18, 2025
Merged

Theme night and light #3

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
7 changes: 4 additions & 3 deletions app/src/main/res/drawable/background_miscellaneous.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">

<solid android:color="@color/colorMiscellaneousBackground"/>
<corners android:topLeftRadius="@dimen/_15sdp"
android:topRightRadius="@dimen/_15sdp"/>
<solid android:color="@color/colorMiscellaneousBackgroundDark" />
<corners
android:topLeftRadius="@dimen/_15sdp"
android:topRightRadius="@dimen/_15sdp" />
</shape>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/background_note_color_1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
android:right="@dimen/_3sdp">
<shape android:shape="oval">
<stroke android:width="@dimen/_6sdp"
android:color="@color/colorMiscellaneousBackground"/>
android:color="@color/colorMiscellaneousBackgroundDark"/>
</shape>
</item>

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/background_note_color_2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
android:right="@dimen/_3sdp">
<shape android:shape="oval">
<stroke android:width="@dimen/_6sdp"
android:color="@color/colorMiscellaneousBackground"/>
android:color="@color/colorMiscellaneousBackgroundDark"/>
</shape>
</item>

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/background_note_color_3.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
android:right="@dimen/_3sdp">
<shape android:shape="oval">
<stroke android:width="@dimen/_6sdp"
android:color="@color/colorMiscellaneousBackground"/>
android:color="@color/colorMiscellaneousBackgroundDark"/>
</shape>
</item>

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/background_note_color_4.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
android:right="@dimen/_3sdp">
<shape android:shape="oval">
<stroke android:width="@dimen/_6sdp"
android:color="@color/colorMiscellaneousBackground"/>
android:color="@color/colorMiscellaneousBackgroundDark"/>
</shape>
</item>

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/background_note_color_5.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
android:right="@dimen/_3sdp">
<shape android:shape="oval">
<stroke android:width="@dimen/_6sdp"
android:color="@color/colorMiscellaneousBackground"/>
android:color="@color/colorMiscellaneousBackgroundDark"/>
</shape>
</item>

Expand Down
4 changes: 3 additions & 1 deletion app/src/main/res/drawable/background_search.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:shape="rectangle">
<solid android:color="@color/colorSearchBackground"/>
<solid android:color="?attr/colorContainer"
tools:ignore="PrivateResource" />
<corners android:radius="@dimen/_8sdp"/>
</shape>
15 changes: 11 additions & 4 deletions app/src/main/res/drawable/ic_add.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">

<path android:fillColor="@android:color/white" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>

<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#000000"
android:viewportWidth="24"
android:viewportHeight="24">

<path
android:fillColor="@android:color/white"
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />

</vector>
Binary file removed app/src/main/res/drawable/notes_icon_crop.jpg
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions app/src/main/res/layout/activity_create_note.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorPrimary"
android:background="?attr/backgroundColor"
tools:context=".activities.CreateNoteActivity">

<ScrollView
Expand Down Expand Up @@ -60,7 +60,7 @@
android:importantForAutofill="no"
android:includeFontPadding="false"
android:inputType="text"
android:textColor="@color/white"
android:textColor="?attr/colorOnPrimary"
android:textColorHint="@color/colorTextHint"
android:textSize="@dimen/_16ssp"
app:layout_constraintTop_toBottomOf="@id/iconBack" />
Expand Down Expand Up @@ -89,7 +89,7 @@
android:includeFontPadding="false"
android:inputType="textMultiLine"
android:paddingTop="@dimen/_8sdp"
android:textColor="@color/colorTextSubtitle"
android:textColor="?attr/colorOnPrimary"
android:textColorHint="@color/colorTextHint"
android:textSize="@dimen/_13ssp"
app:layout_constraintEnd_toEndOf="parent"
Expand Down Expand Up @@ -179,7 +179,7 @@
android:includeFontPadding="false"
android:inputType="textMultiLine"
android:minHeight="@dimen/_100sdp"
android:textColor="@color/white"
android:textColor="?attr/colorOnPrimary"
android:textColorHint="@color/colorTextHint"
android:textSize="@dimen/_13ssp"
app:layout_constraintBottom_toBottomOf="parent"
Expand Down
16 changes: 8 additions & 8 deletions app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorPrimary"
android:background="?attr/backgroundColor"
tools:context=".activities.MainActivity">

<TextView
Expand All @@ -17,7 +17,7 @@
android:layout_marginEnd="@dimen/_12sdp"
android:includeFontPadding="false"
android:text="@string/my_notes"
android:textColor="@color/white"
android:textColor="?attr/colorOnPrimary"
android:textSize="@dimen/_20ssp"
android:textStyle="bold"
app:layout_constraintTop_toTopOf="parent" />
Expand All @@ -41,7 +41,7 @@
android:layout_height="@dimen/_20sdp"
android:contentDescription="@string/app_name"
android:src="@drawable/ic_search"
app:tint="@color/colorSearchIcon" />
app:tint="@color/colorTextHint" />

<EditText
android:id="@+id/inputSearch"
Expand Down Expand Up @@ -74,7 +74,7 @@
android:id="@+id/layoutQuickAction"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorQuickActionBackground"
android:background="?attr/color"
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="@dimen/_15sdp"
Expand All @@ -86,7 +86,7 @@
android:layout_height="@dimen/_23sdp"
android:contentDescription="@string/app_name"
android:src="@drawable/ic_add_outline"
app:tint="@color/colorIcons" />
app:tint="@color/colorTextHint" />

<ImageView
android:id="@+id/imgAddImg"
Expand All @@ -95,7 +95,7 @@
android:layout_marginStart="@dimen/_15sdp"
android:contentDescription="@string/app_name"
android:src="@drawable/ic_image"
app:tint="@color/colorIcons" />
app:tint="@color/colorTextHint" />

<ImageView
android:id="@+id/imgAddWebLink"
Expand All @@ -104,7 +104,7 @@
android:layout_marginStart="@dimen/_15sdp"
android:contentDescription="@string/app_name"
android:src="@drawable/ic_web_link"
app:tint="@color/colorIcons" />
app:tint="@color/colorTextHint" />
</LinearLayout>

<ImageView
Expand All @@ -119,6 +119,6 @@
app:layout_constraintBottom_toTopOf="@id/layoutQuickAction"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/layoutQuickAction"
app:tint="@color/colorPrimary" />
app:tint="@color/colorPrimaryLight" />

</androidx.constraintlayout.widget.ConstraintLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_splash.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_centerInParent="true"
android:src="@drawable/notes_icon_crop"
android:src="@mipmap/ic_launcher_foreground"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/layout_miscellaneous.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
android:id="@+id/layoutMiscellaneous"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/background_miscellaneous"
android:background="?attr/colorAccent"
android:orientation="vertical"
app:behavior_peekHeight="@dimen/_40sdp"
app:layout_behavior="@string/bottom_sheet_behavior">
Expand All @@ -17,7 +17,7 @@
android:gravity="center"
android:includeFontPadding="false"
android:text="@string/miscellaneous"
android:textColor="@color/white"
android:textColor="?attr/colorOnPrimary"
android:textSize="@dimen/_13ssp" />

<LinearLayout
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/res/values-night/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,11 @@
<style name="Base.Theme.NoteApp" parent="Theme.Material3.DayNight.NoActionBar">
<!-- Customize your dark theme here. -->
<!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
<item name="backgroundColor">@color/colorBackgroundDark</item>
<item name="colorPrimary">@color/colorPrimaryDark</item>
<item name="colorOnPrimary">@color/white</item>
<item name="colorAccent">@color/colorMiscellaneousBackgroundDark</item>
<item name="color">@color/colorQuickActionBackgroundDark</item>
<item name="colorContainer">@color/colorSearchBackgroundDark</item>
</style>
</resources>
29 changes: 24 additions & 5 deletions app/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,39 @@
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
<color name="colorPrimary">#292929</color>
<color name="colorPrimaryDark">#292929</color>
<color name="colorAccent">#FDBE3B</color>
<color name="colorSearchIcon">#DBDBDB</color>
<color name="colorTextHint">#7B7B7B</color>
<color name="colorQuickActionBackground">#2F2D2E</color>
<color name="colorIcons">#A4A4A4</color>
<color name="colorTextSubtitle">#CECECE</color>
<color name="colorDefaultNoteColor">#333333</color>
<color name="colorNoteSubtitleText">#FAFAFA</color>
<color name="colorMiscellaneousBackground">#1F1F1F</color>
<color name="colorDelete">#FF4842</color>

<color name="colorSearchBackground">#333333</color>
<color name="colorNoteColor2">#FDBE3B</color>
<color name="colorNoteColor3">#FF4842</color>
<color name="colorNoteColor4">#3A52Fc</color>
<color name="colorNoteColor5">#000000</color>

<!-- Màu giao diện tối -->
<color name="colorPrimaryDark">#292929</color>
<color name="colorAccentDark">#FDBE3B</color>
<color name="colorBackgroundDark">#292929</color>
<color name="colorTextDark">#E0E0E0</color>
<color name="colorMiscellaneousBackgroundDark">#1F1F1F</color>
<color name="colorSearchBackgroundDark">#333333</color>
<color name="colorQuickActionBackgroundDark">#2F2D2E</color>

<!-- Màu giao diện sáng -->
<color name="colorPrimaryLight">#FFFFCC</color>
<color name="colorAccentLight">#FFA500</color>
<color name="colorBackgroundLight">#FAFAFA</color>
<color name="colorMiscellaneousBackgroundLight">#CCFFCC</color>
<color name="colorTextLight">#212121</color>
<color name="colorSearchBackgroundLight">#DDDDDD</color>
<color name="colorQuickActionBackgroundLight">#EEEEEE</color>

<!-- Màu chung -->

<color name="colorIcons">#A4A4A4</color>
<color name="colorDelete">#FF4842</color>
</resources>
6 changes: 6 additions & 0 deletions app/src/main/res/values/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
<style name="Base.Theme.NoteApp" parent="Theme.Material3.DayNight.NoActionBar">
<!-- Customize your light theme here. -->
<!-- <item name="colorPrimary">@color/my_light_primary</item> -->
<item name="backgroundColor">@color/colorBackgroundLight</item>
<item name="colorPrimary">@color/colorPrimaryLight</item>
<item name="colorOnPrimary">@color/black</item>
<item name="colorAccent">@color/colorMiscellaneousBackgroundLight</item>
<item name="color">@color/colorQuickActionBackgroundLight</item>
<item name="colorContainer">@color/colorSearchBackgroundLight</item>
</style>

<style name="Theme.NoteApp" parent="Base.Theme.NoteApp" />
Expand Down