mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-06-25 10:37:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move Glance Widget to seperate module (#8989)

Browse Source 
Move Widget to seperate module

- Create a core module for presentation. Widget and App will share some resources and hopefully composables
This commit is contained in:
Andreas
2023-01-26 23:53:24 +01:00
committed by GitHub
parent c892c793a8
commit 12e41b6e6f
38 changed files with 154 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
presentation-core/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/build

17
presentation-core/build.gradle.kts Normal file
View File

@ -0,0 +1,17 @@
plugins {
id("com.android.library")
id("org.jetbrains.kotlin.android")
}
android {
namespace = "tachiyomi.presentation.core"
defaultConfig {
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
}
}
dependencies {
}

0
presentation-core/consumer-rules.pro Normal file
View File

21
presentation-core/proguard-rules.pro vendored Normal file
View File

@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable
# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile

2
presentation-core/src/main/AndroidManifest.xml Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest />

73
presentation-core/src/main/res/values/colors.xml Normal file
View File

@ -0,0 +1,73 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<color name="splash">@color/accent_blue</color>
<color name="cover_placeholder">#1F888888</color>
<color name="error">#BA1B1B</color>
<color name="errorContainer">#FFDAD4</color>
<color name="onError">#FFFFFF</color>
<color name="onErrorContainer">#410001</color>
<!-- Default Theme -->
<color name="divider_default">@color/md_black_1000_12</color>
<!-- Blue Theme -->
<color name="accent_blue">#54759E</color>
<!-- AMOLED Mode -->
<color name="surface_amoled">#000001</color>
<color name="background_amoled">#000000</color>
<color name="reader_background_dark">#202125</color>
<!-- Material Design Colors -->
<color name="md_black_1000">#000000</color>
<color name="md_black_1000_87">#DE000000</color>
<color name="md_black_1000_54">#8A000000</color>
<color name="md_black_1000_38">#61000000</color>
<color name="md_black_1000_12">#1F000000</color>
<color name="md_black_1000_8">#14000000</color>
<color name="md_black_1000_6">#0F000000</color>
<color name="md_white_1000">#FFFFFFFF</color>
<color name="md_white_1000_70">#B3FFFFFF</color>
<color name="md_white_1000_54">#8AFFFFFF</color>
<color name="md_white_1000_50">#80FFFFFF</color>
<color name="md_white_1000_20">#33FFFFFF</color>
<color name="md_white_1000_12">#1FFFFFFF</color>
<color name="md_white_1000_8">#14FFFFFF</color>
<color name="md_white_1000_6">#0FFFFFFF</color>
<color name="md_grey_50">#FAFAFA</color>
<color name="md_grey_50_75">#BFFAFAFA</color>
<color name="md_grey_100">#F5F5F5</color>
<color name="md_grey_300">#E0E0E0</color>
<color name="md_grey_800">#424242</color>
<color name="md_grey_900">#212121</color>
<color name="md_grey_900_75">#BF212121</color>
<color name="md_blue_A200">#448AFF</color>
<color name="md_blue_A200_75">#BF448AFF</color>
<color name="md_blue_A200_50">#80448AFF</color>
<color name="md_blue_A400">#2979FF</color>
<color name="md_blue_A400_75">#BF2979FF</color>
<color name="md_blue_A400_38">#612979FF</color>
<color name="md_blue_A400_12">#1F2979FF</color>
<color name="md_blue_grey_900">#263238</color>
<color name="md_blue_grey_800">#37474F</color>
<!-- Navigation Overlay Colors -->
<color name="navigation_next">#CB84E296</color>
<color name="navigation_prev">#CCFF7733</color>
<color name="navigation_menu">#CC95818D</color>
<color name="navigation_right">#CCA6CFD5</color>
<color name="navigation_left">#CC7D1128</color>
<!-- ActionMode status bar color -->
<color name="abc_decor_view_status_guard" tools:override="true">@android:color/transparent</color>
<color name="abc_decor_view_status_guard_light" tools:override="true">@android:color/transparent</color>
</resources>

36
presentation-core/src/main/res/values/colors_greenapple.xml Normal file
View File

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Colors for Green Apple theme
~ Original color scheme by CarlosEsco, Jays2Kings and CrepeTF
~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
~
~ Key colors:
~ Primary #188140
~ Secondary #188140
~ Tertiary #D33131
~ Neutral #5D5F5B
-->
<resources>
<color name="greenapple_primary">#006D2F</color>
<color name="greenapple_onPrimary">#FFFFFF</color>
<color name="greenapple_primaryContainer">#96F8A9</color>
<color name="greenapple_onPrimaryContainer">#002109</color>
<color name="greenapple_secondary">#006D2F</color>
<color name="greenapple_onSecondary">#FFFFFF</color>
<color name="greenapple_secondaryContainer">#96F8A9</color>
<color name="greenapple_onSecondaryContainer">#002109</color>
<color name="greenapple_tertiary">#B91D22</color>
<color name="greenapple_onTertiary">#FFFFFF</color>
<color name="greenapple_tertiaryContainer">#FFDAD5</color>
<color name="greenapple_onTertiaryContainer">#410003</color>
<color name="greenapple_background">#FBFDF7</color>
<color name="greenapple_onBackground">#1A1C19</color>
<color name="greenapple_surface">#FBFDF7</color>
<color name="greenapple_onSurface">#1A1C19</color>
<color name="greenapple_surfaceVariant">#DDE5DA</color>
<color name="greenapple_onSurfaceVariant">#414941</color>
<color name="greenapple_outline">#717970</color>
<color name="greenapple_inverseOnSurface">#F0F2EC</color>
<color name="greenapple_inverseSurface">#2F312E</color>
<color name="greenapple_primaryInverse">#7ADB8F</color>
</resources>

37
presentation-core/src/main/res/values/colors_midnightdusk.xml Normal file
View File

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Colors for Midnight Dusk theme
~ Original color scheme by CrepeTF
~ M3 color scheme generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
~
~ Key colors:
~ Primary #F02475
~ Secondary #F02475
~ Tertiary #7A5733
~ Neutral #16151D
-->
<resources>
<color name="midnightdusk_primary">#BB0054</color>
<color name="midnightdusk_onPrimary">#FFFFFF</color>
<color name="midnightdusk_primaryContainer">#FFD9E1</color>
<color name="midnightdusk_onPrimaryContainer">#3F0017</color>
<color name="midnightdusk_secondary">#BB0054</color>
<color name="midnightdusk_onSecondary">#FFFFFF</color>
<color name="midnightdusk_secondaryContainer">#FFD9E1</color>
<color name="midnightdusk_onSecondaryContainer">#3F0017</color>
<color name="midnightdusk_tertiary">#006638</color>
<color name="midnightdusk_onTertiary">#FFFFFF</color>
<color name="midnightdusk_tertiaryContainer">#00894b</color>
<color name="midnightdusk_onTertiaryContainer">#2D1600</color>
<color name="midnightdusk_background">#FFFBFF</color>
<color name="midnightdusk_onBackground">#1C1B1F</color>
<color name="midnightdusk_surface">#FFFBFF</color>
<color name="midnightdusk_onSurface">#1C1B1F</color>
<color name="midnightdusk_surfaceVariant">#F3DDE0</color>
<color name="midnightdusk_onSurfaceVariant">#524346</color>
<color name="midnightdusk_outline">#847376</color>
<color name="midnightdusk_inverseOnSurface">#F4F0F4</color>
<color name="midnightdusk_inverseSurface">#313033</color>
<color name="midnightdusk_primaryInverse">#FFB1C4</color>
<color name="midnightdusk_elevationOverlay">@color/midnightdusk_primary</color>
</resources>

36
presentation-core/src/main/res/values/colors_strawberry.xml Normal file
View File

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Colors for Strawberry Daiquiri theme
~ Original color scheme by Soitora
~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
~
~ Key colors:
~ Primary #ED4A65
~ Secondary #ED4A65
~ Tertiary #775930
~ Neutral #655C5C
-->
<resources>
<color name="strawberry_primary">#B61E40</color>
<color name="strawberry_onPrimary">#FFFFFF</color>
<color name="strawberry_primaryContainer">#FFDADD</color>
<color name="strawberry_onPrimaryContainer">#40000D</color>
<color name="strawberry_secondary">#B61E40</color>
<color name="strawberry_onSecondary">#FFFFFF</color>
<color name="strawberry_secondaryContainer">#FFDADD</color>
<color name="strawberry_onSecondaryContainer">#40000D</color>
<color name="strawberry_tertiary">#775930</color>
<color name="strawberry_onTertiary">#FFFFFF</color>
<color name="strawberry_tertiaryContainer">#FFDDB1</color>
<color name="strawberry_onTertiaryContainer">#2A1800</color>
<color name="strawberry_background">#FCFCFC</color>
<color name="strawberry_onBackground">#201A1A</color>
<color name="strawberry_surface">#FCFCFC</color>
<color name="strawberry_onSurface">#201A1A</color>
<color name="strawberry_surfaceVariant">#F4DDDD</color>
<color name="strawberry_onSurfaceVariant">#534344</color>
<color name="strawberry_outline">#857374</color>
<color name="strawberry_inverseOnSurface">#FBEDED</color>
<color name="strawberry_inverseSurface">#362F2F</color>
<color name="strawberry_primaryInverse">#FFB2B9</color>
</resources>

35
presentation-core/src/main/res/values/colors_tachiyomi.xml Normal file
View File

@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Colors for Default theme
~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
~
~ Key colors:
~ Primary #2979FF
~ Secondary #2979FF
~ Tertiary #47A84A
~ Neutral #5E5E62
-->
<resources>
<color name="tachiyomi_primary">#0057CE</color>
<color name="tachiyomi_onPrimary">#FFFFFF</color>
<color name="tachiyomi_primaryContainer">#D8E2FF</color>
<color name="tachiyomi_onPrimaryContainer">#001947</color>
<color name="tachiyomi_secondary">#0057CE</color>
<color name="tachiyomi_onSecondary">#FFFFFF</color>
<color name="tachiyomi_secondaryContainer">#D8E2FF</color>
<color name="tachiyomi_onSecondaryContainer">#001947</color>
<color name="tachiyomi_tertiary">#006E17</color>
<color name="tachiyomi_onTertiary">#FFFFFF</color>
<color name="tachiyomi_tertiaryContainer">#95F990</color>
<color name="tachiyomi_onTertiaryContainer">#002202</color>
<color name="tachiyomi_background">#FDFBFF</color>
<color name="tachiyomi_onBackground">#1B1B1E</color>
<color name="tachiyomi_surface">#FDFBFF</color>
<color name="tachiyomi_onSurface">#1B1B1E</color>
<color name="tachiyomi_surfaceVariant">#E1E2EC</color>
<color name="tachiyomi_onSurfaceVariant">#44464E</color>
<color name="tachiyomi_outline">#757780</color>
<color name="tachiyomi_inverseOnSurface">#F2F0F4</color>
<color name="tachiyomi_inverseSurface">#303033</color>
<color name="tachiyomi_primaryInverse">#AEC6FF</color>
</resources>

37
presentation-core/src/main/res/values/colors_tako.xml Normal file
View File

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Colors for Tako theme
~ Original color scheme by ghostbear
~ M3 colors generated by yours truly
~
~ Key colors:
~ Primary #66577E
~ Secondary #66577E
~ Tertiary #F3B375
~ Neutral #F7F5FF
-->
<resources>
<color name="tako_primary">#66577E</color>
<color name="tako_onPrimary">#F3B375</color>
<color name="tako_primaryContainer">#66577E</color>
<color name="tako_onPrimaryContainer">#F3B375</color>
<color name="tako_secondary">#66577E</color>
<color name="tako_onSecondary">#F3B375</color>
<color name="tako_secondaryContainer">#66577E</color>
<color name="tako_onSecondaryContainer">#F3B375</color>
<color name="tako_tertiary">#F3B375</color>
<color name="tako_onTertiary">#574360</color>
<color name="tako_tertiaryContainer">#FDD6B0</color>
<color name="tako_onTertiaryContainer">#221437</color>
<color name="tako_background">#F7F5FF</color>
<color name="tako_onBackground">#1B1B22</color>
<color name="tako_surface">#F7F5FF</color>
<color name="tako_onSurface">#1B1B22</color>
<color name="tako_surfaceVariant">#E8E0EB</color>
<color name="tako_onSurfaceVariant">#49454E</color>
<color name="tako_outline">#7A757E</color>
<color name="tako_inverseOnSurface">#F3EFF4</color>
<color name="tako_inverseSurface">#313033</color>
<color name="tako_primaryInverse">#D6BAFF</color>
<color name="tako_elevationOverlay">@color/tako_primary</color>
</resources>

27
presentation-core/src/main/res/values/colors_tealturqoise.xml Normal file
View File

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="tealturquoise_primary">#008080</color>
<color name="tealturquoise_onPrimary">#FFFFFF</color>
<color name="tealturquoise_primaryContainer">#008080</color>
<color name="tealturquoise_onPrimaryContainer">#FFFFFF</color>
<color name="tealturquoise_secondary">#008080</color>
<color name="tealturquoise_onSecondary">#FFFFFF</color>
<color name="tealturquoise_secondaryContainer">#BFDFDF</color>
<color name="tealturquoise_onSecondaryContainer">#008080</color>
<color name="tealturquoise_tertiary">#FF7F7F</color>
<color name="tealturquoise_onTertiary">#000000</color>
<color name="tealturquoise_tertiaryContainer">#2A1616</color>
<color name="tealturquoise_onTertiaryContainer">#FF7F7F</color>
<color name="tealturquoise_background">#FAFAFA</color>
<color name="tealturquoise_onBackground">#050505</color>
<color name="tealturquoise_surface">#FAFAFA</color>
<color name="tealturquoise_onSurface">#050505</color>
<color name="tealturquoise_surfaceVariant">#DAE5E2</color>
<color name="tealturquoise_onSurfaceVariant">#050505</color>
<color name="tealturquoise_outline">#6F7977</color>
<color name="tealturquoise_inverseOnSurface">#FAFAFA</color>
<color name="tealturquoise_inverseSurface">#050505</color>
<color name="tealturquoise_primaryInverse">#40E0D0</color>
<color name="tealturquoise_elevationOverlay">#BFDFDF</color>
</resources>

36
presentation-core/src/main/res/values/colors_tidalwave.xml Normal file
View File

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Colors for Tidal Wave theme
~ Original color scheme by NahutabDevelop
~
~ Key colors:
~ Primary #006780
~ Secondary #004152
~ Tertiary #92f7bc
~ Neutral #b6b5b8
-->
<resources>
<color name="tidalwave_primary">#006780</color>
<color name="tidalwave_onPrimary">#ffffff</color>
<color name="tidalwave_primaryContainer">#B4D4DF</color>
<color name="tidalwave_onPrimaryContainer">#001f28</color>
<color name="tidalwave_secondary">#006780</color>
<color name="tidalwave_onSecondary">#ffffff</color>
<color name="tidalwave_secondaryContainer">#b8eaff</color>
<color name="tidalwave_onSecondaryContainer">#001f28</color>
<color name="tidalwave_tertiary">#92f7bc</color>
<color name="tidalwave_onTertiary">#001c3b</color>
<color name="tidalwave_tertiaryContainer">#c3fada</color>
<color name="tidalwave_onTertiaryContainer">#78ffd6</color>
<color name="tidalwave_background">#fdfbff</color>
<color name="tidalwave_onBackground">#001c3b</color>
<color name="tidalwave_surface">#fdfbff</color>
<color name="tidalwave_onSurface">#001c3b</color>
<color name="tidalwave_surfaceVariant">#dce4e8</color>
<color name="tidalwave_onSurfaceVariant">#40484c</color>
<color name="tidalwave_outline">#70787c</color>
<color name="tidalwave_inverseOnSurface">#ffe3c4</color>
<color name="tidalwave_inverseSurface">#020400</color>
<color name="tidalwave_primaryInverse">#ff987f</color>
</resources>

30
presentation-core/src/main/res/values/colors_yinyang.xml Normal file
View File

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Colors for Yin & Yang theme
~ Original color scheme by Riztard
~ M3 colors generated by yours truly + tweaked manually
-->
<resources>
<color name="yinyang_primary">#000000</color>
<color name="yinyang_onPrimary">#FFFFFF</color>
<color name="yinyang_primaryContainer">#000000</color>
<color name="yinyang_onPrimaryContainer">#FFFFFF</color>
<color name="yinyang_secondary">#000000</color>
<color name="yinyang_onSecondary">#FFFFFF</color>
<color name="yinyang_secondaryContainer">#DDDDDD</color>
<color name="yinyang_onSecondaryContainer">#0C0C0C</color>
<color name="yinyang_tertiary">#FFFFFF</color>
<color name="yinyang_onTertiary">#000000</color>
<color name="yinyang_tertiaryContainer">#D8E2FF</color>
<color name="yinyang_onTertiaryContainer">#001947</color>
<color name="yinyang_background">#FDFDFD</color>
<color name="yinyang_onBackground">#222222</color>
<color name="yinyang_surface">#FDFDFD</color>
<color name="yinyang_onSurface">#222222</color>
<color name="yinyang_surfaceVariant">#EDEDED</color>
<color name="yinyang_onSurfaceVariant">#515151</color>
<color name="yinyang_outline">#838383</color>
<color name="yinyang_inverseOnSurface">#F4F4F4</color>
<color name="yinyang_inverseSurface">#333333</color>
<color name="yinyang_primaryInverse">#A6A6A6</color>
</resources>

36
presentation-core/src/main/res/values/colors_yotsuba.xml Normal file
View File

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Colors for Yotsuba theme
~ Original color scheme by ztimms73
~ M3 colors generated by Material Theme Builder (https://goo.gle/material-theme-builder-web)
~
~ Key colors:
~ Primary #AE3200
~ Secondary #AE3200
~ Tertiary #6B5E2F
~ Neutral #655C5A
-->
<resources>
<color name="yotsuba_primary">#AE3200</color>
<color name="yotsuba_onPrimary">#FFFFFF</color>
<color name="yotsuba_primaryContainer">#FFDBCF</color>
<color name="yotsuba_onPrimaryContainer">#3B0A00</color>
<color name="yotsuba_secondary">#AE3200</color>
<color name="yotsuba_onSecondary">#FFFFFF</color>
<color name="yotsuba_secondaryContainer">#FFDBCF</color>
<color name="yotsuba_onSecondaryContainer">#3B0A00</color>
<color name="yotsuba_tertiary">#6B5E2F</color>
<color name="yotsuba_onTertiary">#FFFFFF</color>
<color name="yotsuba_tertiaryContainer">#F5E2A7</color>
<color name="yotsuba_onTertiaryContainer">#231B00</color>
<color name="yotsuba_background">#FCFCFC</color>
<color name="yotsuba_onBackground">#211A18</color>
<color name="yotsuba_surface">#FCFCFC</color>
<color name="yotsuba_onSurface">#211A18</color>
<color name="yotsuba_surfaceVariant">#F5DED8</color>
<color name="yotsuba_onSurfaceVariant">#53433F</color>
<color name="yotsuba_outline">#85736E</color>
<color name="yotsuba_inverseOnSurface">#FBEEEB</color>
<color name="yotsuba_inverseSurface">#362F2D</color>
<color name="yotsuba_primaryInverse">#FFB59D</color>
</resources>