Skip to content

Commit

Permalink
Changed purple brand color to mint
Browse files Browse the repository at this point in the history
  • Loading branch information
litrik committed Jan 5, 2023
1 parent bc9d566 commit 48255ed
Show file tree
Hide file tree
Showing 22 changed files with 20 additions and 13 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

An open source multi-platform app for digital signage

![Feature graphic](docs/graphics/feature-graphic.png "Feature graphic")

* [Introduction](#introduction)
* [Screenshots](#screenshots)
* [Build and run](#build-and-run)
Expand Down Expand Up @@ -48,8 +50,8 @@ Displayer is being used successfully in the clubhouse of [korfbalclub KCBJ](http

## Screenshots

![Screenshot](docs/screenshots/screenshot_1.png "Screenshot")
![Screenshot](docs/screenshots/screenshot_2.png "Screenshot")
![Screenshot](docs/screenshots/screenshot-1.png "Screenshot")
![Screenshot](docs/screenshots/screenshot-2.png "Screenshot")

[![Watch screen recording](https://img.youtube.com/vi/r9NUL9Qbw-c/0.jpg)](https://www.youtube.com/watch?v=r9NUL9Qbw-c "Watch screen recording")

Expand Down
Binary file modified android/src/main/ic_launcher-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/src/main/res/drawable-xhdpi/banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions android/src/main/res/drawable/ic_launcher_foreground.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
android:height="108dp"
android:viewportWidth="24"
android:viewportHeight="24">
<group android:scaleX="0.5"
android:scaleY="0.5"
android:translateX="6"
android:translateY="6">
<group android:scaleX="0.47"
android:scaleY="0.47"
android:translateX="6.36"
android:translateY="6.36">
<path
android:pathData="m21,4h-18c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h5v2h8v-2h5c1.1,0 1.99,-0.9 1.99,-2l0.01,-12c0,-1.1 -0.9,-2 -2,-2zM21,18h-18v-12h18zM4,15v2h2c0,-1.11 -0.89,-2 -2,-2zM4,12v1.43c1.97,0 3.57,1.6 3.57,3.57h1.43c0,-2.76 -2.24,-5 -5,-5zM4,9v1.45c3.61,0 6.55,2.93 6.55,6.55h1.45c0,-4.42 -3.59,-8 -8,-8z"
android:fillColor="#ffffff"/>
Expand Down
Binary file modified android/src/main/res/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/src/main/res/mipmap-hdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/src/main/res/mipmap-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/src/main/res/mipmap-mdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/src/main/res/mipmap-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/src/main/res/mipmap-xxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion android/src/main/res/values/ic_launcher_background.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#9C27B0</color>
<color name="ic_launcher_background">#1E9991</color>
</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import com.displayer.display.DisplayState
import com.displayer.platform.formatTime
import com.displayer.platform.getIcon
import com.displayer.toSp
import com.displayer.ui.DisplayerPurple
import com.displayer.ui.DisplayerColor
import com.displayer.ui.Icon
import com.displayer.ui.LocalDimensions
import com.displayer.ui.LocalLocale
Expand All @@ -38,7 +38,7 @@ fun AdminPanel(state: AppState) {
.background(Color.Black),
) {
Row(
modifier = Modifier.fillMaxWidth().background(DisplayerPurple).padding(LocalDimensions.current.baseUnit),
modifier = Modifier.fillMaxWidth().background(DisplayerColor).padding(LocalDimensions.current.baseUnit),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = spacedBy(LocalDimensions.current.baseUnit)
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,18 @@ import com.displayer.display.parser.ClockDto
import com.displayer.display.parser.ColumnDto
import com.displayer.display.parser.DisplayFile
import com.displayer.display.parser.ImageDto
import com.displayer.display.parser.ParametersDto
import com.displayer.display.parser.RowDto
import com.displayer.display.parser.ScaleDto
import com.displayer.display.parser.StackDto
import com.displayer.display.parser.StyleDto
import com.displayer.display.parser.TextDto

val defaultDisplayFile = DisplayFile(
parameters = ParametersDto(
language = "en",
country = "BE",
),
styleId = "light",
center = StackDto(
items = listOf(
Expand Down Expand Up @@ -42,8 +47,8 @@ val defaultDisplayFile = DisplayFile(
divider = TextDto(""),
),
styles = listOf(
StyleDto(id = "light", backgroundColor = "#ffffff", contentColor = "#9C27B0"),
StyleDto(id = "dark", backgroundColor = "#9C27B0", contentColor = "#ffffff"),
StyleDto(id = "darker", backgroundColor = "#4d1358", contentColor = "#ffffff"),
StyleDto(id = "light", backgroundColor = "#ffffff", contentColor = "#1E9991"),
StyleDto(id = "dark", backgroundColor = "#1E9991", contentColor = "#ffffff"),
StyleDto(id = "darker", backgroundColor = "#17756F", contentColor = "#ffffff"),
)
)
2 changes: 1 addition & 1 deletion common/src/commonMain/kotlin/com/displayer/ui/Styling.kt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import androidx.compose.ui.unit.dp
import com.displayer.display.Style
import com.displayer.display.defaultStyle

val DisplayerPurple = Color(156, 39, 176)
val DisplayerColor = Color(30, 153, 145)

val LocalTextAlign = compositionLocalOf { TextAlign.Left }
val LocalStyle = compositionLocalOf { defaultStyle }
Expand Down
Binary file modified desktop/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/graphics/feature-graphic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes

0 comments on commit 48255ed

Please sign in to comment.