-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #45 from Teamwork/android/restore-deleted-files
Android: Restore erroneuosly deleted files
- Loading branch information
Showing
5 changed files
with
133 additions
and
29 deletions.
There are no files selected for viewing
16 changes: 0 additions & 16 deletions
16
android/styledictionary/app/src/main/res/values-night/themes.xml
This file was deleted.
Oops, something went wrong.
16 changes: 3 additions & 13 deletions
16
android/styledictionary/app/src/main/res/values/themes.xml
This file contains 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 |
|---|---|---|
| @@ -1,16 +1,6 @@ | ||
| <resources xmlns:tools="http://schemas.android.com/tools"> | ||
|
|
||
| <!-- Base application theme. --> | ||
| <style name="Theme.Teamwork" parent="Theme.MaterialComponents.DayNight.DarkActionBar"> | ||
| <!-- Primary brand color. --> | ||
| <item name="colorPrimary">@color/purple_500</item> | ||
| <item name="colorPrimaryVariant">@color/purple_700</item> | ||
| <item name="colorOnPrimary">@color/white</item> | ||
| <!-- Secondary brand color. --> | ||
| <item name="colorSecondary">@color/teal_200</item> | ||
| <item name="colorSecondaryVariant">@color/teal_700</item> | ||
| <item name="colorOnSecondary">@color/black</item> | ||
| <!-- Status bar color. --> | ||
| <item name="android:statusBarColor">?attr/colorPrimaryVariant</item> | ||
| <!-- Customize your theme here. --> | ||
| </style> | ||
| <style name="Theme.Teamwork" parent="TeamworkM3Theme" /> | ||
|
|
||
| </resources> |
33 changes: 33 additions & 0 deletions
33
android/styledictionary/teamwork-design-system/src/main/res/values-night/themes.xml
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <resources> | ||
| <style name="TeamworkM3Theme" parent="Theme.Material3.Dark.NoActionBar"> | ||
| <item name="colorPrimary">@color/md_theme_dark_primary</item> | ||
| <item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item> | ||
| <item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item> | ||
| <item name="colorOnPrimaryContainer">@color/md_theme_dark_onPrimaryContainer</item> | ||
| <item name="colorSecondary">@color/md_theme_dark_secondary</item> | ||
| <item name="colorOnSecondary">@color/md_theme_dark_onSecondary</item> | ||
| <item name="colorSecondaryContainer">@color/md_theme_dark_secondaryContainer</item> | ||
| <item name="colorOnSecondaryContainer">@color/md_theme_dark_onSecondaryContainer</item> | ||
| <item name="colorTertiary">@color/md_theme_dark_tertiary</item> | ||
| <item name="colorOnTertiary">@color/md_theme_dark_onTertiary</item> | ||
| <item name="colorTertiaryContainer">@color/md_theme_dark_tertiaryContainer</item> | ||
| <item name="colorOnTertiaryContainer">@color/md_theme_dark_onTertiaryContainer</item> | ||
| <item name="colorError">@color/md_theme_dark_error</item> | ||
| <item name="colorErrorContainer">@color/md_theme_dark_errorContainer</item> | ||
| <item name="colorOnError">@color/md_theme_dark_onError</item> | ||
| <item name="colorOnErrorContainer">@color/md_theme_dark_onErrorContainer</item> | ||
| <item name="android:colorBackground">@color/md_theme_dark_background</item> | ||
| <item name="colorOnBackground">@color/md_theme_dark_onBackground</item> | ||
| <item name="colorSurface">@color/md_theme_dark_surface</item> | ||
| <item name="colorOnSurface">@color/md_theme_dark_onSurface</item> | ||
| <item name="colorSurfaceVariant">@color/md_theme_dark_surfaceVariant</item> | ||
| <item name="colorOnSurfaceVariant">@color/md_theme_dark_onSurfaceVariant</item> | ||
| <item name="colorOutline">@color/md_theme_dark_outline</item> | ||
| <item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item> | ||
| <item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item> | ||
| <item name="elevationOverlayColor">@color/md_theme_dark_surfaceTint</item> | ||
| <item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item> | ||
| </style> | ||
| </resources> |
64 changes: 64 additions & 0 deletions
64
android/styledictionary/teamwork-design-system/src/main/res/values/m3_colors.xml
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- These colours are generated by the Material Theme Builder. Don't edit. --> | ||
| <resources> | ||
| <color name="seed">#4461D7</color> | ||
| <color name="md_theme_light_primary">#3553C9</color> | ||
| <color name="md_theme_light_onPrimary">#FFFFFF</color> | ||
| <color name="md_theme_light_primaryContainer">#DDE1FF</color> | ||
| <color name="md_theme_light_onPrimaryContainer">#001355</color> | ||
| <color name="md_theme_light_secondary">#5A5D72</color> | ||
| <color name="md_theme_light_onSecondary">#FFFFFF</color> | ||
| <color name="md_theme_light_secondaryContainer">#DFE1F9</color> | ||
| <color name="md_theme_light_onSecondaryContainer">#171B2C</color> | ||
| <color name="md_theme_light_tertiary">#6B3CD7</color> | ||
| <color name="md_theme_light_onTertiary">#FFFFFF</color> | ||
| <color name="md_theme_light_tertiaryContainer">#E8DDFF</color> | ||
| <color name="md_theme_light_onTertiaryContainer">#22005D</color> | ||
| <color name="md_theme_light_error">#BA1A1A</color> | ||
| <color name="md_theme_light_errorContainer">#FFDAD6</color> | ||
| <color name="md_theme_light_onError">#FFFFFF</color> | ||
| <color name="md_theme_light_onErrorContainer">#410002</color> | ||
| <color name="md_theme_light_background">#FEFBFF</color> | ||
| <color name="md_theme_light_onBackground">#1B1B1F</color> | ||
| <color name="md_theme_light_surface">#FEFBFF</color> | ||
| <color name="md_theme_light_onSurface">#1B1B1F</color> | ||
| <color name="md_theme_light_surfaceVariant">#E2E1EC</color> | ||
| <color name="md_theme_light_onSurfaceVariant">#45464F</color> | ||
| <color name="md_theme_light_outline">#767680</color> | ||
| <color name="md_theme_light_inverseOnSurface">#F2F0F4</color> | ||
| <color name="md_theme_light_inverseSurface">#303034</color> | ||
| <color name="md_theme_light_inversePrimary">#B8C3FF</color> | ||
| <color name="md_theme_light_shadow">#000000</color> | ||
| <color name="md_theme_light_surfaceTint">#3553C9</color> | ||
| <color name="md_theme_light_surfaceTintColor">#3553C9</color> | ||
| <color name="md_theme_dark_primary">#B8C3FF</color> | ||
| <color name="md_theme_dark_onPrimary">#002487</color> | ||
| <color name="md_theme_dark_primaryContainer">#1439B1</color> | ||
| <color name="md_theme_dark_onPrimaryContainer">#DDE1FF</color> | ||
| <color name="md_theme_dark_secondary">#C3C5DD</color> | ||
| <color name="md_theme_dark_onSecondary">#2C2F42</color> | ||
| <color name="md_theme_dark_secondaryContainer">#424659</color> | ||
| <color name="md_theme_dark_onSecondaryContainer">#DFE1F9</color> | ||
| <color name="md_theme_dark_tertiary">#CFBDFF</color> | ||
| <color name="md_theme_dark_onTertiary">#3A0093</color> | ||
| <color name="md_theme_dark_tertiaryContainer">#5219BF</color> | ||
| <color name="md_theme_dark_onTertiaryContainer">#E8DDFF</color> | ||
| <color name="md_theme_dark_error">#FFB4AB</color> | ||
| <color name="md_theme_dark_errorContainer">#93000A</color> | ||
| <color name="md_theme_dark_onError">#690005</color> | ||
| <color name="md_theme_dark_onErrorContainer">#FFDAD6</color> | ||
| <color name="md_theme_dark_background">#1B1B1F</color> | ||
| <color name="md_theme_dark_onBackground">#E4E1E6</color> | ||
| <color name="md_theme_dark_surface">#1B1B1F</color> | ||
| <color name="md_theme_dark_onSurface">#E4E1E6</color> | ||
| <color name="md_theme_dark_surfaceVariant">#45464F</color> | ||
| <color name="md_theme_dark_onSurfaceVariant">#C6C5D0</color> | ||
| <color name="md_theme_dark_outline">#90909A</color> | ||
| <color name="md_theme_dark_inverseOnSurface">#1B1B1F</color> | ||
| <color name="md_theme_dark_inverseSurface">#E4E1E6</color> | ||
| <color name="md_theme_dark_inversePrimary">#3553C9</color> | ||
| <color name="md_theme_dark_shadow">#000000</color> | ||
| <color name="md_theme_dark_surfaceTint">#B8C3FF</color> | ||
| <color name="md_theme_dark_surfaceTintColor">#B8C3FF</color> | ||
| </resources> |
33 changes: 33 additions & 0 deletions
33
android/styledictionary/teamwork-design-system/src/main/res/values/themes.xml
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <resources> | ||
| <style name="TeamworkM3Theme" parent="Theme.Material3.Light.NoActionBar"> | ||
| <item name="colorPrimary">@color/md_theme_light_primary</item> | ||
| <item name="colorOnPrimary">@color/md_theme_light_onPrimary</item> | ||
| <item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item> | ||
| <item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item> | ||
| <item name="colorSecondary">@color/md_theme_light_secondary</item> | ||
| <item name="colorOnSecondary">@color/md_theme_light_onSecondary</item> | ||
| <item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item> | ||
| <item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item> | ||
| <item name="colorTertiary">@color/md_theme_light_tertiary</item> | ||
| <item name="colorOnTertiary">@color/md_theme_light_onTertiary</item> | ||
| <item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item> | ||
| <item name="colorOnTertiaryContainer">@color/md_theme_light_onTertiaryContainer</item> | ||
| <item name="colorError">@color/md_theme_light_error</item> | ||
| <item name="colorErrorContainer">@color/md_theme_light_errorContainer</item> | ||
| <item name="colorOnError">@color/md_theme_light_onError</item> | ||
| <item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item> | ||
| <item name="android:colorBackground">@color/md_theme_light_background</item> | ||
| <item name="colorOnBackground">@color/md_theme_light_onBackground</item> | ||
| <item name="colorSurface">@color/md_theme_light_surface</item> | ||
| <item name="colorOnSurface">@color/md_theme_light_onSurface</item> | ||
| <item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item> | ||
| <item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item> | ||
| <item name="colorOutline">@color/md_theme_light_outline</item> | ||
| <item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item> | ||
| <item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item> | ||
| <item name="elevationOverlayColor">@color/md_theme_light_surfaceTint</item> | ||
| <item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item> | ||
| </style> | ||
| </resources> |