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

Enhance color scheme for dark and light modes to match Scribe iOS #53

Merged
merged 1 commit into from
Aug 5, 2024
Merged

Enhance color scheme for dark and light modes to match Scribe iOS #53

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
1 change: 1 addition & 0 deletions app/src/main/kotlin/be/scri/activities/AboutActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ class AboutActivity : BaseSimpleActivity(), GestureDetector.OnGestureListener{
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_about)
gestureDetector = GestureDetector(this)
setupRecyclerViews()
appName = intent.getStringExtra(APP_NAME) ?: ""
val textColor = getProperTextColor()
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/drawable/counter_clockwise_icon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
android:strokeLineJoin="round"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="@color/icon_color"
android:strokeColor="@color/menu_option_color"
android:strokeLineCap="round"/>
<path
android:pathData="m8.931,7.813 l-5.04,0.907 -0.891,-5.13"
android:strokeLineJoin="round"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="@color/icon_color"
android:strokeColor="@color/menu_option_color"
android:strokeLineCap="round"/>
</vector>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/external_link.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
android:viewportWidth="64"
android:viewportHeight="64">
<path
android:fillColor="@color/icon_color"
android:fillColor="@color/menu_option_color"
android:pathData="M40,10C38.896,10 38,10.896 38,12C38,13.104 38.896,14 40,14L47.172,14L30.586,30.586C29.805,31.367 29.805,32.633 30.586,33.414C30.977,33.805 31.488,34 32,34C32.512,34 33.023,33.805 33.414,33.414L50,16.828L50,24C50,25.104 50.896,26 52,26C53.104,26 54,25.104 54,24L54,12C54,10.896 53.104,10 52,10L40,10zM18,12C14.691,12 12,14.691 12,18L12,46C12,49.309 14.691,52 18,52L46,52C49.309,52 52,49.309 52,46L52,34C52,32.896 51.104,32 50,32C48.896,32 48,32.896 48,34L48,46C48,47.103 47.103,48 46,48L18,48C16.897,48 16,47.103 16,46L16,18C16,16.897 16.897,16 18,16L30,16C31.104,16 32,15.104 32,14C32,12.896 31.104,12 30,12L18,12z"/>
</vector>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/right_arrow.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
android:viewportHeight="960">
<path
android:pathData="m321,880 l-71,-71 329,-329 -329,-329 71,-71 400,400L321,880Z"
android:fillColor="@color/icon_color"/>
android:fillColor="@color/menu_option_color"/>
</vector>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/rounded_bottom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/you_background_color" />
<solid android:color="@color/card_view_color" />
<corners android:bottomLeftRadius="10dp" android:bottomRightRadius="10dp"/>

</shape>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/rounded_middle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/you_background_color" />
<solid android:color="@color/card_view_color" />
<corners android:radius="0dp"/>
</shape>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/rounded_top.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/you_background_color" />
<solid android:color="@color/card_view_color" />
<corners android:topLeftRadius="10dp" android:topRightRadius="10dp"/>

</shape>
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_about.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/about_scrollview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background_color">
android:background="@color/you_background_color">

<TextView
android:id="@+id/tvTitle"
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/layout/card_view_design.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
android:layout_height="50dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
app:cardBackgroundColor="@color/card_view_color"
app:cardCornerRadius="5dp"
app:cardElevation="1dp">

Expand Down
7 changes: 4 additions & 3 deletions app/src/main/res/values-night-v31/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<resources>
<color name="you_keyboard_background_color">@android:color/system_neutral1_900</color>
<color name="you_keyboard_toolbar_color">@color/you_background_color</color>
<color name="app_text_color">#FFFFFFFF</color>
<color name="app_text_color">@color/dark_text_color</color>
<color name="nav_bar_color">#000</color>">
<color name="nav_bar_focus_color">#FFF</color>
<color name="nav_bar_selected_color">@color/dark_scribe_blue</color>
Expand All @@ -11,12 +11,13 @@
<color name="text_color">#FFF</color>
<color name="icon_color">#FFF</color>
<color name = "card_view_color">#000</color>
<color name = "menu_option_color">#878472</color>
<!-- Commons colors -->
<color name="you_status_bar_color">@android:color/system_accent2_800</color>
<color name="you_contextual_status_bar_color">@android:color/system_accent1_700</color>
<color name="you_background_color">@android:color/system_neutral1_900</color>
<color name="you_background_color">@color/dark_scribe_color</color>
<color name="you_neutral_text_color">@android:color/system_neutral1_50</color>
<color name="you_primary_color">@android:color/system_accent1_400</color>
<color name="you_primary_color">@color/dark_scribe_color</color>
<color name="you_primary_dark_color">@android:color/system_accent1_600</color>
<color name="you_dialog_background_color">@android:color/system_accent2_800</color>
</resources>
8 changes: 5 additions & 3 deletions app/src/main/res/values-v31/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<resources>
<color name="you_keyboard_background_color">#99FFFFFF</color>
<color name="you_keyboard_toolbar_color">@color/you_background_color</color>
<color name="app_text_color">#95000000</color>
<color name="app_text_color">@color/light_text_color</color>
<color name="nav_bar_color">#FFFFFFFF</color>">
<color name="nav_bar_focus_color">#000</color>
<color name="nav_bar_selected_color">@color/light_scribe_blue</color>
Expand All @@ -11,12 +11,14 @@
<color name="text_color">#000</color>
<color name="icon_color">#000</color>
<color name = "card_view_color">#FFF</color>
<color name = "menu_option_color">#878472</color>

<!-- Commons colors -->
<color name="you_status_bar_color">@android:color/system_accent2_50</color>
<color name="you_contextual_status_bar_color">@android:color/system_accent1_400</color>
<color name="you_background_color">@android:color/system_neutral1_10</color>
<color name="you_background_color">@color/light_scribe_color</color>
<color name="you_neutral_text_color">@android:color/system_neutral1_50</color>
<color name="you_primary_color">@android:color/system_accent1_400</color>
<color name="you_primary_color">@color/light_scribe_color</color>
<color name="you_primary_dark_color">@android:color/system_accent1_600</color>
<color name="you_dialog_background_color">@android:color/system_accent2_50</color>
</resources>
9 changes: 9 additions & 0 deletions app/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name = "dark_scribe_color">#235270</color>
<color name = "light_scribe_color">#5EB5E8</color>
<color name = "dark_text_color">#FFF</color>
<color name ="light_text_color">#000</color>
<color name = "light_tutorial_button_color">#FDAD0D</color>
<color name = "dark_tutorial_button_color">#D17B0F</color>
<color name = "dark_icon_color">#fff</color>
<color name = "light_icon_color">#000"</color>
<color name="light_scribe_blue">#FF75CEFA</color>
<color name="dark_scribe_blue">#FF4CADE6</color>


<!-- Light theme -->
<color name="light_key_color">#FFFFFFFF</color>
<color name="light_special_key_color">#FFAEB3BE</color>
Expand Down
Loading