-
Notifications
You must be signed in to change notification settings - Fork 56
Improve dark mode for profiles screen #137
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
Open
Sickjuicy
wants to merge
24
commits into
netbirdio:main
Choose a base branch
from
Sickjuicy:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
87dcd88
Add theme selection feature in advanced settings and WIP Darkmode
Sickjuicy 7d7e7f6
Add new XML resources for themes, colors, and shapes
Sickjuicy d134a71
Add new XML resources for themes, colors, and shapes
Sickjuicy 408eed4
Merge branch 'netbirdio:main' into main
Sickjuicy 91e6d68
Add new color resources and update layouts for improved theming
Sickjuicy 7384e8a
Merge remote-tracking branch 'origin/main'
Sickjuicy 95eba4c
Add dark mode support for button animations and update UI colors
Sickjuicy ece11d3
Merge branch 'netbirdio:main' into main
Sickjuicy 5bbaa57
Merge branch 'netbirdio:main' into main
Sickjuicy 8d6bb94
Merge branch 'netbirdio:main' into main
Sickjuicy 67976bd
Refactor UI colors and styles for improved consistency and accessibility
Sickjuicy a659c1c
Refactor UI colors and styles for improved consistency and accessibility
Sickjuicy 513e829
Changed Color
Sickjuicy 11cceff
Added color variable
Sickjuicy 0cacfd6
Update tab background color reference in fragment_bottom_dialog.xml
Sickjuicy 1cbe974
Merge remote-tracking branch 'origin/main'
Sickjuicy 5e4f1a5
Add colorSurface and nbTabBackground to themes.xml for button styling
Sickjuicy 4913cb6
Update colorSurface to use white for button background in themes.xml
Sickjuicy 8299be0
Revert "Refactor UI colors and styles for improved consistency and ac…
Sickjuicy 0963bcf
reverted submodule commit
Sickjuicy eb2b4d6
Update netbird submodule to v0.54.1
Sickjuicy 991f2f1
Merge branch 'netbirdio:main' into main
Sickjuicy 642dc3e
Merge branch 'netbirdio:main' into main
Sickjuicy 00f3321
feat(ui): Improve dark mode for profiles screen
Sickjuicy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,6 +5,8 @@ | |
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_margin="8dp" | ||
| android:theme="@style/Theme.NetBird.Card" | ||
| app:cardBackgroundColor="@color/profile_card_background" | ||
| app:cardCornerRadius="8dp" | ||
| app:cardElevation="2dp"> | ||
|
|
||
|
|
@@ -17,10 +19,10 @@ | |
| android:id="@+id/icon_profile" | ||
| android:layout_width="40dp" | ||
| android:layout_height="40dp" | ||
| android:src="@drawable/ic_menu_profile" | ||
| android:contentDescription="@string/menu_profiles" | ||
| app:layout_constraintTop_toTopOf="parent" | ||
| android:src="@drawable/ic_menu_profile" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toTopOf="parent" | ||
| app:tint="@color/nb_txt" /> | ||
|
|
||
| <TextView | ||
|
|
@@ -29,18 +31,18 @@ | |
| android:layout_height="wrap_content" | ||
| android:layout_marginStart="16dp" | ||
| android:layout_marginEnd="8dp" | ||
| android:textSize="18sp" | ||
| android:textStyle="bold" | ||
| android:textColor="@color/nb_txt" | ||
| android:ellipsize="end" | ||
| android:maxLines="1" | ||
| tools:text="default" | ||
| app:layout_constraintTop_toTopOf="@id/icon_profile" | ||
| app:layout_constraintBottom_toBottomOf="@id/icon_profile" | ||
| app:layout_constraintStart_toEndOf="@id/icon_profile" | ||
| android:textColor="@color/nb_txt" | ||
| android:textSize="18sp" | ||
| android:textStyle="bold" | ||
| app:layout_constraintBottom_toBottomOf="@+id/icon_profile" | ||
| app:layout_constraintEnd_toStartOf="@id/badge_active" | ||
| app:layout_constraintHorizontal_bias="0" | ||
| app:layout_constraintHorizontal_chainStyle="packed" /> | ||
| app:layout_constraintHorizontal_chainStyle="packed" | ||
| app:layout_constraintStart_toEndOf="@id/icon_profile" | ||
| app:layout_constraintTop_toTopOf="@+id/icon_profile" | ||
|
Comment on lines
+39
to
+44
|
||
| tools:text="default" /> | ||
|
|
||
| <TextView | ||
| android:id="@+id/badge_active" | ||
|
|
@@ -55,62 +57,62 @@ | |
| android:textColor="@android:color/white" | ||
| android:textSize="12sp" | ||
| android:visibility="gone" | ||
| tools:visibility="visible" | ||
| app:layout_constraintTop_toTopOf="@id/icon_profile" | ||
| app:layout_constraintBottom_toBottomOf="@id/icon_profile" | ||
| app:layout_constraintStart_toEndOf="@id/text_profile_name" | ||
| app:layout_constraintBottom_toBottomOf="@+id/icon_profile" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintHorizontal_bias="0" /> | ||
| app:layout_constraintHorizontal_bias="0" | ||
| app:layout_constraintStart_toEndOf="@id/text_profile_name" | ||
| app:layout_constraintTop_toTopOf="@+id/icon_profile" | ||
|
Comment on lines
+60
to
+64
|
||
| tools:visibility="visible" /> | ||
|
|
||
| <Button | ||
| android:id="@+id/btn_switch" | ||
| style="@style/Widget.MaterialComponents.Button.OutlinedButton" | ||
| android:layout_width="0dp" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginTop="12dp" | ||
| android:layout_marginEnd="4dp" | ||
| android:text="@string/profiles_switch" | ||
| android:textSize="11sp" | ||
| android:paddingStart="8dp" | ||
| android:paddingEnd="8dp" | ||
| style="@style/Widget.MaterialComponents.Button.OutlinedButton" | ||
| app:layout_constraintTop_toBottomOf="@id/icon_profile" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| android:text="@string/profiles_switch" | ||
| android:textSize="11sp" | ||
| app:layout_constraintEnd_toStartOf="@id/btn_logout" | ||
| app:layout_constraintHorizontal_weight="1" /> | ||
| app:layout_constraintHorizontal_weight="1" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toBottomOf="@id/icon_profile" /> | ||
|
|
||
| <Button | ||
| android:id="@+id/btn_logout" | ||
| style="@style/Widget.MaterialComponents.Button.TextButton" | ||
| android:layout_width="0dp" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginTop="12dp" | ||
| android:layout_marginStart="4dp" | ||
| android:layout_marginTop="12dp" | ||
| android:layout_marginEnd="4dp" | ||
| android:text="@string/profiles_logout" | ||
| android:textSize="11sp" | ||
| android:paddingStart="8dp" | ||
| android:paddingEnd="8dp" | ||
| style="@style/Widget.MaterialComponents.Button.TextButton" | ||
| app:layout_constraintTop_toBottomOf="@id/icon_profile" | ||
| app:layout_constraintStart_toEndOf="@id/btn_switch" | ||
| android:text="@string/profiles_logout" | ||
| android:textSize="11sp" | ||
| app:layout_constraintEnd_toStartOf="@id/btn_remove" | ||
| app:layout_constraintHorizontal_weight="1" /> | ||
| app:layout_constraintHorizontal_weight="1" | ||
| app:layout_constraintStart_toEndOf="@id/btn_switch" | ||
| app:layout_constraintTop_toBottomOf="@id/icon_profile" /> | ||
|
|
||
| <Button | ||
| android:id="@+id/btn_remove" | ||
| style="@style/Widget.MaterialComponents.Button.TextButton" | ||
| android:layout_width="0dp" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginTop="12dp" | ||
| android:layout_marginStart="4dp" | ||
| android:text="@string/profiles_remove" | ||
| android:textSize="11sp" | ||
| android:layout_marginTop="12dp" | ||
| android:paddingStart="8dp" | ||
| android:paddingEnd="8dp" | ||
| style="@style/Widget.MaterialComponents.Button.TextButton" | ||
| app:layout_constraintTop_toBottomOf="@id/icon_profile" | ||
| app:layout_constraintStart_toEndOf="@id/btn_logout" | ||
| android:text="@string/profiles_remove" | ||
| android:textSize="11sp" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintHorizontal_weight="1" /> | ||
| app:layout_constraintHorizontal_weight="1" | ||
| app:layout_constraintStart_toEndOf="@id/btn_logout" | ||
| app:layout_constraintTop_toBottomOf="@id/icon_profile" /> | ||
|
|
||
| </androidx.constraintlayout.widget.ConstraintLayout> | ||
|
|
||
| </com.google.android.material.card.MaterialCardView> | ||
| </com.google.android.material.card.MaterialCardView> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
android:themereferences@style/Theme.NetBird.Card, but that style is only defined invalues-night/themes.xml. In light mode this style won't resolve at runtime (and can also break resource linking), causing the profile list item to fail to inflate. Add a non-night definition ofTheme.NetBird.Cardinapp/src/main/res/values/themes.xml(likely using a light/neutral ThemeOverlay), keeping the dark parent only in thevalues-nightvariant.