Author: Adam <git@apiote.xyz>
Material You theme with system colours
app/src/main/AndroidManifest.xml | 16 ++-- app/src/main/res/values-night-v31/themes.xml | 65 ++++++++++++++++++++ app/src/main/res/values-v31/themes.xml | 69 ++++++++++++++++++++++
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 55a2f5220bd858e19613245ad39b19cd4ed555ce..ded17a255910aa0caf84906254325b27dd95be8d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -8,7 +8,7 @@<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <application - android:name="xyz.apiote.bimba.czwek.Bimba" + android:name=".Bimba" android:allowBackup="true" android:dataExtractionRules="@xml/data_extraction_rules" android:enableOnBackInvokedCallback="true" @@ -20,18 +20,18 @@ android:supportsRtl="true" android:theme="@style/Theme.Bimba.Style" tool:targetApi="33"> <activity - android:name="xyz.apiote.bimba.czwek.settings.ServerChooserActivity" + android:name=".settings.ServerChooserActivity" android:exported="false"> <meta-data android:name="android.app.lib_name" android:value="" /> </activity> - <activity android:name="xyz.apiote.bimba.czwek.onboarding.OnboardingActivity" /> + <activity android:name=".onboarding.OnboardingActivity" /> <activity - android:name="xyz.apiote.bimba.czwek.settings.feeds.FeedChooserActivity" + android:name=".settings.feeds.FeedChooserActivity" android:exported="false" /> <activity - android:name="xyz.apiote.bimba.czwek.onboarding.FirstRunActivity" + android:name=".onboarding.FirstRunActivity" android:exported="true" android:theme="@style/Theme.Bimba.Splash"> <intent-filter> @@ -41,7 +41,7 @@ </intent-filter> </activity> <activity - android:name="xyz.apiote.bimba.czwek.departures.DeparturesActivity" + android:name=".departures.DeparturesActivity" android:exported="true"> <intent-filter> <action android:name="android.intent.action.VIEW" /> @@ -56,11 +56,11 @@ </intent-filter> </activity> <activity - android:name="xyz.apiote.bimba.czwek.search.ResultsActivity" + android:name=".search.ResultsActivity" android:exported="false" android:label="@string/title_activity_results" /> <activity - android:name="xyz.apiote.bimba.czwek.dashboard.MainActivity" + android:name=".dashboard.MainActivity" android:exported="false" android:windowSoftInputMode="adjustPan" /> </application> diff --git a/app/src/main/res/values-night-v31/themes.xml b/app/src/main/res/values-night-v31/themes.xml new file mode 100644 index 0000000000000000000000000000000000000000..380366918a7f79c50f17ef7209a60b9909af3747 --- /dev/null +++ b/app/src/main/res/values-night-v31/themes.xml @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <style name="Theme.Bimba" parent="Theme.Material3.Dark.NoActionBar"> + <item name="android:fontFamily">@font/yellowcircle8</item> + <item name="colorPrimary">@android:color/system_accent1_300</item> + <item name="colorOnPrimary">@android:color/system_accent1_800</item> + <item name="colorPrimaryContainer">@android:color/system_accent1_600</item> + <item name="colorOnPrimaryContainer">@android:color/system_accent1_50</item> + <item name="colorSecondary">@android:color/system_accent3_100</item> + <item name="colorOnSecondary">@android:color/system_accent3_800</item> + <item name="colorSecondaryContainer">@android:color/system_accent3_700</item> + <item name="colorOutline">@android:color/system_neutral1_400</item> + <item name="colorOnSecondaryContainer">@android:color/system_accent3_50</item> + <item name="colorPrimaryInverse">@android:color/system_accent1_600</item> + + <item name="android:colorBackground">@android:color/system_neutral1_900</item> + <item name="colorOnBackground">@android:color/system_neutral1_50</item> + + <item name="colorSurface">@android:color/system_neutral1_900</item> + <item name="colorOnSurface">@android:color/system_neutral1_50</item> + <item name="colorSurfaceVariant">@android:color/system_neutral2_600</item> + <item name="colorOnSurfaceVariant">@android:color/system_neutral2_100</item> + <item name="colorSurfaceInverse">@android:color/system_neutral1_50</item> + <item name="colorOnSurfaceInverse">@android:color/system_neutral1_900</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="statusBarBackground">@android:color/transparent</item> + <item name="android:statusBarColor">@android:color/transparent</item> + <item name="android:enforceStatusBarContrast">false</item> + <item name="lightStatusBar">false</item> + </style> + + <declare-styleable name="Theme.Bimba"> + <attr name="lightStatusBar" format="boolean" /> + </declare-styleable> + + <style name="Theme.Bimba.SearchBar" parent="MaterialSearchBarLight"> + <item name="mt_searchBarColor">@android:color/system_neutral2_600</item> + <item name="mt_textColor">@android:color/system_neutral2_100</item> + <item name="mt_placeholderColor">@android:color/system_neutral2_100</item> <!-- todo(ui) grey out --> + <item name="mt_backIconTint">@android:color/system_neutral2_100</item> + <item name="mt_navIconTint">@android:color/system_neutral2_100</item> + <item name="mt_searchIconTint">@android:color/system_neutral2_100</item> + <item name="mt_menuIconTint">@android:color/system_neutral2_100</item> + <item name="mt_clearIconTint">@android:color/system_neutral2_100</item> + </style> + + <style name="Theme.Bimba.SearchResult.Title" parent="Theme.Bimba"> + <item name="android:textColor">@android:color/system_neutral2_100</item> + <item name="android:textSize">16sp</item> + </style> + + <style name="Theme.Bimba.SearchResult.Description" parent="Theme.Bimba"> + <item name="android:textColor">@android:color/system_neutral2_100</item> <!-- todo(ui) grey out --> + <item name="android:textSize">9sp</item> + </style> +</resources> \ No newline at end of file diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml new file mode 100644 index 0000000000000000000000000000000000000000..8407d13464594bea8dcd026c209a63136d51283f --- /dev/null +++ b/app/src/main/res/values-v31/themes.xml @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <style name="Theme.Bimba" parent="Theme.Material3.Light.NoActionBar"> + <item name="android:fontFamily">@font/yellowcircle8</item> + <item name="colorPrimary">@android:color/system_accent1_600</item> + <item name="colorOnPrimary">@android:color/system_accent1_0</item> + <item name="colorPrimaryContainer">@android:color/system_accent1_200</item> + <item name="colorOnPrimaryContainer">@android:color/system_accent1_900</item> + <item name="colorPrimaryInverse">@android:color/system_accent1_300</item> + <item name="colorSecondary">@android:color/system_accent3_600</item> + <item name="colorOnSecondary">@android:color/system_accent3_0</item> + <item name="colorSecondaryContainer">@android:color/system_accent3_200</item> + <item name="colorOnSecondaryContainer">@android:color/system_accent3_800</item> + + <item name="android:colorBackground">@android:color/system_neutral1_10</item> + <item name="colorOnBackground">@android:color/system_neutral1_900</item> + + <item name="colorSurface">@android:color/system_neutral1_10</item> + <item name="colorOnSurface">@android:color/system_neutral1_900</item> + <item name="colorSurfaceVariant">@android:color/system_neutral2_100</item> + <item name="colorOnSurfaceVariant">@android:color/system_neutral2_700</item> + <item name="colorOutline">@android:color/system_neutral2_500</item> + <item name="colorSurfaceInverse">@android:color/system_neutral1_900</item> + <item name="colorOnSurfaceInverse">@android:color/system_neutral1_100</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="statusBarBackground">@android:color/transparent</item> + <item name="android:statusBarColor">@android:color/transparent</item> + <item name="android:enforceStatusBarContrast">false</item> + <item name="lightStatusBar">true</item> + </style> + + <style name="Theme.Bimba.SearchBar" parent="MaterialSearchBarLight"> + <item name="mt_searchBarColor">@android:color/system_neutral2_100</item> + <item name="mt_textColor">@android:color/system_neutral2_700</item> + <item name="mt_placeholderColor">@android:color/system_neutral2_700 + </item> <!-- todo(ui) grey out --> + <item name="mt_backIconTint">@android:color/system_neutral2_700</item> + <item name="mt_navIconTint">@android:color/system_neutral2_700</item> + <item name="mt_searchIconTint">@android:color/system_neutral2_700</item> + <item name="mt_menuIconTint">@android:color/system_neutral2_700</item> + <item name="mt_clearIconTint">@android:color/system_neutral2_700</item> + </style> + + <style name="Theme.Bimba.SearchResult.Title" parent="Theme.Bimba"> + <item name="android:textColor">@android:color/system_neutral2_700</item> + <item name="android:textSize">16sp</item> + </style> + + <style name="Theme.Bimba.SearchResult.Description" parent="Theme.Bimba"> + <item name="android:textColor">@android:color/system_neutral2_700 + </item> <!-- todo(ui) grey out --> + <item name="android:textSize">9sp</item> + </style> + + <style name="Theme.Bimba.Splash" parent="Theme.SplashScreen"> + <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item> + <item name="windowSplashScreenIconBackgroundColor">@color/ic_launcher_background</item> + <item name="postSplashScreenTheme">@style/Theme.Bimba</item> + </style> +</resources> \ No newline at end of file