From f02ec5daa22dacbcf29f2ba6ea165b6c36638cae Mon Sep 17 00:00:00 2001 From: hasibprince Date: Wed, 9 Nov 2022 19:38:12 +0600 Subject: [PATCH] fixed: category icon color for dark mode --- .../java/foundation/e/apps/MainActivity.kt | 2 +- .../e/apps/api/fused/FusedAPIImpl.kt | 12 ++-- .../e/apps/api/fused/utils/CategoryUtils.kt | 43 ------------ .../res/drawable-nodpi/ic_cat_open_games.png | Bin 3520 -> 0 bytes app/src/main/res/drawable/ic_action.xml | 38 ----------- app/src/main/res/drawable/ic_adventure.xml | 40 ----------- app/src/main/res/drawable/ic_arcade.xml | 28 -------- app/src/main/res/drawable/ic_board.xml | 41 ------------ .../res/drawable/ic_books_and_reference.xml | 8 +-- app/src/main/res/drawable/ic_card.xml | 19 ------ app/src/main/res/drawable/ic_casino.xml | 22 ------- app/src/main/res/drawable/ic_casual.xml | 31 --------- .../main/res/drawable/ic_cat_connectivity.xml | 4 +- app/src/main/res/drawable/ic_cat_default.xml | 10 +-- .../main/res/drawable/ic_cat_development.xml | 6 +- app/src/main/res/drawable/ic_cat_graphics.xml | 2 +- .../drawable/ic_cat_health_and_fitness.xml | 2 +- .../res/drawable/ic_cat_house_and_home.xml | 8 +-- app/src/main/res/drawable/ic_cat_internet.xml | 2 +- .../main/res/drawable/ic_cat_open_games.xml | 32 +++++++++ app/src/main/res/drawable/ic_cat_security.xml | 4 +- app/src/main/res/drawable/ic_cat_system.xml | 4 +- app/src/main/res/drawable/ic_educational.xml | 38 ----------- app/src/main/res/drawable/ic_music.xml | 31 --------- app/src/main/res/drawable/ic_puzzle.xml | 13 ---- app/src/main/res/drawable/ic_racing.xml | 28 -------- app/src/main/res/drawable/ic_role_playing.xml | 28 -------- app/src/main/res/drawable/ic_simulation.xml | 13 ---- app/src/main/res/drawable/ic_sports.xml | 31 --------- app/src/main/res/drawable/ic_strategy.xml | 25 ------- app/src/main/res/drawable/ic_trivia.xml | 19 ------ app/src/main/res/drawable/ic_watch_apps.xml | 14 ++-- app/src/main/res/drawable/ic_watchface.xml | 8 +-- app/src/main/res/drawable/ic_word.xml | 16 ----- .../foundation/e/apps/FusedApiImplTest.kt | 62 ++++++++++++------ 35 files changed, 114 insertions(+), 570 deletions(-) delete mode 100644 app/src/main/res/drawable-nodpi/ic_cat_open_games.png delete mode 100644 app/src/main/res/drawable/ic_action.xml delete mode 100644 app/src/main/res/drawable/ic_adventure.xml delete mode 100644 app/src/main/res/drawable/ic_arcade.xml delete mode 100644 app/src/main/res/drawable/ic_board.xml delete mode 100644 app/src/main/res/drawable/ic_card.xml delete mode 100644 app/src/main/res/drawable/ic_casino.xml delete mode 100644 app/src/main/res/drawable/ic_casual.xml create mode 100644 app/src/main/res/drawable/ic_cat_open_games.xml delete mode 100644 app/src/main/res/drawable/ic_educational.xml delete mode 100644 app/src/main/res/drawable/ic_music.xml delete mode 100644 app/src/main/res/drawable/ic_puzzle.xml delete mode 100644 app/src/main/res/drawable/ic_racing.xml delete mode 100644 app/src/main/res/drawable/ic_role_playing.xml delete mode 100644 app/src/main/res/drawable/ic_simulation.xml delete mode 100644 app/src/main/res/drawable/ic_sports.xml delete mode 100644 app/src/main/res/drawable/ic_strategy.xml delete mode 100644 app/src/main/res/drawable/ic_trivia.xml delete mode 100644 app/src/main/res/drawable/ic_word.xml diff --git a/app/src/main/java/foundation/e/apps/MainActivity.kt b/app/src/main/java/foundation/e/apps/MainActivity.kt index 06c5a2b04..2b5c86955 100644 --- a/app/src/main/java/foundation/e/apps/MainActivity.kt +++ b/app/src/main/java/foundation/e/apps/MainActivity.kt @@ -73,7 +73,7 @@ class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - + binding = ActivityMainBinding.inflate(layoutInflater) setContentView(binding.root) diff --git a/app/src/main/java/foundation/e/apps/api/fused/FusedAPIImpl.kt b/app/src/main/java/foundation/e/apps/api/fused/FusedAPIImpl.kt index 564e62631..35d71d088 100644 --- a/app/src/main/java/foundation/e/apps/api/fused/FusedAPIImpl.kt +++ b/app/src/main/java/foundation/e/apps/api/fused/FusedAPIImpl.kt @@ -1042,7 +1042,7 @@ class FusedAPIImpl @Inject constructor( app: Category ) { category.drawable = - getCategoryIconResource(app.type, getCategoryIconName(category)) + getCategoryIconResource(getCategoryIconName(category)) } private fun getCategoryIconName(category: FusedCategory): String { @@ -1099,17 +1099,13 @@ class FusedAPIImpl @Inject constructor( return FusedCategory( id = category, title = getCategoryTitle(category, categories), - drawable = getCategoryIconResource(appType, category), + drawable = getCategoryIconResource(category), tag = tag ) } - private fun getCategoryIconResource(appType: Category.Type, category: String): Int { - return if (appType == Category.Type.APPLICATION) { - CategoryUtils.provideAppsCategoryIconResource(category) - } else { - CategoryUtils.provideGamesCategoryIconResource(category) - } + private fun getCategoryIconResource(category: String): Int { + return CategoryUtils.provideAppsCategoryIconResource(category) } private fun getCategoryTitle(category: String, categories: Categories): String { diff --git a/app/src/main/java/foundation/e/apps/api/fused/utils/CategoryUtils.kt b/app/src/main/java/foundation/e/apps/api/fused/utils/CategoryUtils.kt index f3dfe82af..c6048a94a 100644 --- a/app/src/main/java/foundation/e/apps/api/fused/utils/CategoryUtils.kt +++ b/app/src/main/java/foundation/e/apps/api/fused/utils/CategoryUtils.kt @@ -175,47 +175,4 @@ object CategoryUtils { R.drawable.ic_cat_default } } - - fun provideGamesCategoryIconResource(categoryId: String): Int { - return when (categoryId) { - "action" -> - R.drawable.ic_action - "adventure" -> - R.drawable.ic_adventure - "arcade" -> - R.drawable.ic_arcade - "board" -> - R.drawable.ic_board - "card" -> - R.drawable.ic_card - "casino" -> - R.drawable.ic_casino - "casual" -> - R.drawable.ic_casual - "educational" -> - R.drawable.ic_educational - "music" -> - R.drawable.ic_music - "game_open_games", "web_games" -> - R.drawable.ic_arcade - "puzzle" -> - R.drawable.ic_puzzle - "racing" -> - R.drawable.ic_racing - "role_playing" -> - R.drawable.ic_role_playing - "simulation" -> - R.drawable.ic_simulation - "sports" -> - R.drawable.ic_sports - "strategy" -> - R.drawable.ic_strategy - "trivia" -> - R.drawable.ic_trivia - "word" -> - R.drawable.ic_word - else -> - R.drawable.ic_cat_default - } - } } diff --git a/app/src/main/res/drawable-nodpi/ic_cat_open_games.png b/app/src/main/res/drawable-nodpi/ic_cat_open_games.png deleted file mode 100644 index 3796c8db67074825b51f50d0730043cb7a0831e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3520 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 QU|?YIboFyt=akR{07Af`1poj5 diff --git a/app/src/main/res/drawable/ic_action.xml b/app/src/main/res/drawable/ic_action.xml deleted file mode 100644 index 6d712298d..000000000 --- a/app/src/main/res/drawable/ic_action.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_adventure.xml b/app/src/main/res/drawable/ic_adventure.xml deleted file mode 100644 index e05194028..000000000 --- a/app/src/main/res/drawable/ic_adventure.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_arcade.xml b/app/src/main/res/drawable/ic_arcade.xml deleted file mode 100644 index 2a27b05d2..000000000 --- a/app/src/main/res/drawable/ic_arcade.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_board.xml b/app/src/main/res/drawable/ic_board.xml deleted file mode 100644 index 6cfa934fd..000000000 --- a/app/src/main/res/drawable/ic_board.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_books_and_reference.xml b/app/src/main/res/drawable/ic_books_and_reference.xml index 509e4be85..8b50add71 100644 --- a/app/src/main/res/drawable/ic_books_and_reference.xml +++ b/app/src/main/res/drawable/ic_books_and_reference.xml @@ -7,16 +7,16 @@ diff --git a/app/src/main/res/drawable/ic_card.xml b/app/src/main/res/drawable/ic_card.xml deleted file mode 100644 index 7a236aced..000000000 --- a/app/src/main/res/drawable/ic_card.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_casino.xml b/app/src/main/res/drawable/ic_casino.xml deleted file mode 100644 index d113de9ca..000000000 --- a/app/src/main/res/drawable/ic_casino.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_casual.xml b/app/src/main/res/drawable/ic_casual.xml deleted file mode 100644 index 6ae3bb93c..000000000 --- a/app/src/main/res/drawable/ic_casual.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_cat_connectivity.xml b/app/src/main/res/drawable/ic_cat_connectivity.xml index 0a777dae6..3f98643ab 100644 --- a/app/src/main/res/drawable/ic_cat_connectivity.xml +++ b/app/src/main/res/drawable/ic_cat_connectivity.xml @@ -5,8 +5,8 @@ android:viewportHeight="32"> + android:fillColor="@color/colorAccent"/> + android:fillColor="@color/colorAccent"/> diff --git a/app/src/main/res/drawable/ic_cat_default.xml b/app/src/main/res/drawable/ic_cat_default.xml index be76fbd84..9d61ffbf7 100644 --- a/app/src/main/res/drawable/ic_cat_default.xml +++ b/app/src/main/res/drawable/ic_cat_default.xml @@ -8,18 +8,18 @@ android:pathData="M4.2733,4.3286h24.5429v23.3429h-24.5429z"/> + android:fillColor="@color/colorAccent"/> + android:fillColor="@color/colorAccent"/> + android:fillColor="@color/colorAccent"/> + android:fillColor="@color/colorAccent"/> + android:fillColor="@color/colorAccent"/> diff --git a/app/src/main/res/drawable/ic_cat_development.xml b/app/src/main/res/drawable/ic_cat_development.xml index 784ba4d31..8d4241960 100644 --- a/app/src/main/res/drawable/ic_cat_development.xml +++ b/app/src/main/res/drawable/ic_cat_development.xml @@ -8,12 +8,12 @@ android:pathData="M2.6607,4.5857h28.3143v22.8286h-28.3143z"/> + android:fillColor="@color/colorAccent"/> + android:fillColor="@color/colorAccent"/> + android:fillColor="@color/colorAccent"/> diff --git a/app/src/main/res/drawable/ic_cat_graphics.xml b/app/src/main/res/drawable/ic_cat_graphics.xml index 993937466..79795ac35 100644 --- a/app/src/main/res/drawable/ic_cat_graphics.xml +++ b/app/src/main/res/drawable/ic_cat_graphics.xml @@ -5,5 +5,5 @@ android:viewportHeight="32"> + android:fillColor="@color/colorAccent"/> diff --git a/app/src/main/res/drawable/ic_cat_health_and_fitness.xml b/app/src/main/res/drawable/ic_cat_health_and_fitness.xml index 12198be03..238a4e048 100644 --- a/app/src/main/res/drawable/ic_cat_health_and_fitness.xml +++ b/app/src/main/res/drawable/ic_cat_health_and_fitness.xml @@ -5,5 +5,5 @@ android:viewportHeight="32"> + android:fillColor="@color/colorAccent"/> diff --git a/app/src/main/res/drawable/ic_cat_house_and_home.xml b/app/src/main/res/drawable/ic_cat_house_and_home.xml index 8e429cfff..f6328b46d 100644 --- a/app/src/main/res/drawable/ic_cat_house_and_home.xml +++ b/app/src/main/res/drawable/ic_cat_house_and_home.xml @@ -8,15 +8,15 @@ android:pathData="M2.0018,2.5715h29.0857v26.8571h-29.0857z"/> + android:fillColor="@color/colorAccent"/> + android:fillColor="@color/colorAccent"/> + android:fillColor="@color/colorAccent"/> + android:fillColor="@color/colorAccent"/> diff --git a/app/src/main/res/drawable/ic_cat_internet.xml b/app/src/main/res/drawable/ic_cat_internet.xml index d110f3d34..5c170f207 100644 --- a/app/src/main/res/drawable/ic_cat_internet.xml +++ b/app/src/main/res/drawable/ic_cat_internet.xml @@ -5,5 +5,5 @@ android:viewportHeight="32"> + android:fillColor="@color/colorAccent"/> diff --git a/app/src/main/res/drawable/ic_cat_open_games.xml b/app/src/main/res/drawable/ic_cat_open_games.xml new file mode 100644 index 000000000..9de037472 --- /dev/null +++ b/app/src/main/res/drawable/ic_cat_open_games.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_cat_security.xml b/app/src/main/res/drawable/ic_cat_security.xml index e17f9e6f2..67700eb06 100644 --- a/app/src/main/res/drawable/ic_cat_security.xml +++ b/app/src/main/res/drawable/ic_cat_security.xml @@ -8,8 +8,8 @@ android:strokeLineJoin="round" android:strokeWidth="2.1" android:fillColor="#00000000" - android:strokeColor="#0088ED"/> + android:strokeColor="@color/colorAccent"/> + android:fillColor="@color/colorAccent"/> diff --git a/app/src/main/res/drawable/ic_cat_system.xml b/app/src/main/res/drawable/ic_cat_system.xml index bdd9b11ae..64330895a 100644 --- a/app/src/main/res/drawable/ic_cat_system.xml +++ b/app/src/main/res/drawable/ic_cat_system.xml @@ -5,8 +5,8 @@ android:viewportHeight="32"> + android:fillColor="@color/colorAccent"/> + android:fillColor="@color/colorAccent"/> diff --git a/app/src/main/res/drawable/ic_educational.xml b/app/src/main/res/drawable/ic_educational.xml deleted file mode 100644 index a71f9aeb0..000000000 --- a/app/src/main/res/drawable/ic_educational.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_music.xml b/app/src/main/res/drawable/ic_music.xml deleted file mode 100644 index 0182d3809..000000000 --- a/app/src/main/res/drawable/ic_music.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_puzzle.xml b/app/src/main/res/drawable/ic_puzzle.xml deleted file mode 100644 index cc67464bd..000000000 --- a/app/src/main/res/drawable/ic_puzzle.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_racing.xml b/app/src/main/res/drawable/ic_racing.xml deleted file mode 100644 index 791995868..000000000 --- a/app/src/main/res/drawable/ic_racing.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_role_playing.xml b/app/src/main/res/drawable/ic_role_playing.xml deleted file mode 100644 index 665e4eea2..000000000 --- a/app/src/main/res/drawable/ic_role_playing.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_simulation.xml b/app/src/main/res/drawable/ic_simulation.xml deleted file mode 100644 index f3cafa0a7..000000000 --- a/app/src/main/res/drawable/ic_simulation.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_sports.xml b/app/src/main/res/drawable/ic_sports.xml deleted file mode 100644 index 1aaf48c00..000000000 --- a/app/src/main/res/drawable/ic_sports.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_strategy.xml b/app/src/main/res/drawable/ic_strategy.xml deleted file mode 100644 index e65de1166..000000000 --- a/app/src/main/res/drawable/ic_strategy.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_trivia.xml b/app/src/main/res/drawable/ic_trivia.xml deleted file mode 100644 index 8981888f3..000000000 --- a/app/src/main/res/drawable/ic_trivia.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_watch_apps.xml b/app/src/main/res/drawable/ic_watch_apps.xml index 9e2dcfdc4..1b3729669 100644 --- a/app/src/main/res/drawable/ic_watch_apps.xml +++ b/app/src/main/res/drawable/ic_watch_apps.xml @@ -5,23 +5,23 @@ android:viewportHeight="33"> + android:fillColor="@color/colorAccent"/> + android:fillColor="@color/colorAccent"/> + android:fillColor="@color/colorAccent"/> + android:fillColor="@color/colorAccent"/> + android:fillColor="@color/colorAccent"/> + android:fillColor="@color/colorAccent"/> + android:fillColor="@color/colorAccent"/> diff --git a/app/src/main/res/drawable/ic_watchface.xml b/app/src/main/res/drawable/ic_watchface.xml index 63d7df34f..587de7688 100644 --- a/app/src/main/res/drawable/ic_watchface.xml +++ b/app/src/main/res/drawable/ic_watchface.xml @@ -1,7 +1,7 @@ - - - - + + + + diff --git a/app/src/main/res/drawable/ic_word.xml b/app/src/main/res/drawable/ic_word.xml deleted file mode 100644 index 9730837ac..000000000 --- a/app/src/main/res/drawable/ic_word.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - diff --git a/app/src/test/java/foundation/e/apps/FusedApiImplTest.kt b/app/src/test/java/foundation/e/apps/FusedApiImplTest.kt index 2ced7456a..ac6c7281d 100644 --- a/app/src/test/java/foundation/e/apps/FusedApiImplTest.kt +++ b/app/src/test/java/foundation/e/apps/FusedApiImplTest.kt @@ -124,12 +124,14 @@ class FusedApiImplTest { status = Status.UNAVAILABLE, name = "Demo One", package_name = "foundation.e.demoone" - ), FusedApp( + ), + FusedApp( _id = "112", status = Status.INSTALLED, name = "Demo Two", package_name = "foundation.e.demotwo" - ), FusedApp( + ), + FusedApp( _id = "113", status = Status.UNAVAILABLE, name = "Demo Three", @@ -156,12 +158,14 @@ class FusedApiImplTest { status = Status.UNAVAILABLE, name = "Demo One", package_name = "foundation.e.demoone" - ), FusedApp( + ), + FusedApp( _id = "112", status = Status.INSTALLED, name = "Demo Two", package_name = "foundation.e.demotwo" - ), FusedApp( + ), + FusedApp( _id = "113", status = Status.UNAVAILABLE, name = "Demo Three", @@ -175,12 +179,14 @@ class FusedApiImplTest { status = Status.UNAVAILABLE, name = "Demo One", package_name = "foundation.e.demoone" - ), FusedApp( + ), + FusedApp( _id = "112", status = Status.UNAVAILABLE, name = "Demo Two", package_name = "foundation.e.demotwo" - ), FusedApp( + ), + FusedApp( _id = "113", status = Status.UNAVAILABLE, name = "Demo Three", @@ -201,13 +207,15 @@ class FusedApiImplTest { name = "Demo One", package_name = "foundation.e.demoone", latest_version_code = 123 - ), FusedApp( + ), + FusedApp( _id = "112", status = Status.INSTALLED, name = "Demo Two", package_name = "foundation.e.demotwo", latest_version_code = 123 - ), FusedApp( + ), + FusedApp( _id = "113", status = Status.UNAVAILABLE, name = "Demo Three", @@ -242,13 +250,15 @@ class FusedApiImplTest { name = "Demo One", package_name = "foundation.e.demoone", latest_version_code = 123 - ), FusedApp( + ), + FusedApp( _id = "112", status = Status.INSTALLED, name = "Demo Two", package_name = "foundation.e.demotwo", latest_version_code = 123 - ), FusedApp( + ), + FusedApp( _id = "113", status = Status.UNAVAILABLE, name = "Demo Three", @@ -283,13 +293,15 @@ class FusedApiImplTest { name = "Demo One", package_name = "foundation.e.demoone", latest_version_code = 123 - ), FusedApp( + ), + FusedApp( _id = "112", status = Status.INSTALLED, name = "Demo Two", package_name = "foundation.e.demotwo", latest_version_code = 123 - ), FusedApp( + ), + FusedApp( _id = "113", status = Status.UNAVAILABLE, name = "Demo Three", @@ -324,13 +336,15 @@ class FusedApiImplTest { name = "Demo One", package_name = "foundation.e.demoone", latest_version_code = 123 - ), FusedApp( + ), + FusedApp( _id = "112", status = Status.INSTALLED, name = "Demo Two", package_name = "foundation.e.demotwo", latest_version_code = 123 - ), FusedApp( + ), + FusedApp( _id = "113", status = Status.UNAVAILABLE, name = "Demo Three", @@ -346,13 +360,15 @@ class FusedApiImplTest { name = "Demo One", package_name = "foundation.e.demoone", latest_version_code = 123 - ), FusedApp( + ), + FusedApp( _id = "112", status = Status.UNAVAILABLE, name = "Demo Two", package_name = "foundation.e.demotwo", latest_version_code = 123 - ), FusedApp( + ), + FusedApp( _id = "113", status = Status.UNAVAILABLE, name = "Demo Three", @@ -608,7 +624,7 @@ class FusedApiImplTest { val categoryListResponse = fusedAPIImpl.getCategoriesList(Category.Type.APPLICATION, AUTH_DATA) - + assertEquals("getCategory", 3, categoryListResponse.first.size) } @@ -719,13 +735,15 @@ class FusedApiImplTest { name = "Demo One", package_name = "foundation.e.demoone", latest_version_code = 123 - ), FusedApp( + ), + FusedApp( _id = "112", status = Status.UNAVAILABLE, name = "Demo Two", package_name = "foundation.e.demotwo", latest_version_code = 123 - ), FusedApp( + ), + FusedApp( _id = "113", status = Status.UNAVAILABLE, name = "Demo Three", @@ -806,13 +824,15 @@ class FusedApiImplTest { name = "Demo One", package_name = "foundation.e.demoone", latest_version_code = 123 - ), FusedApp( + ), + FusedApp( _id = "112", status = Status.UNAVAILABLE, name = "Demo Two", package_name = "foundation.e.demotwo", latest_version_code = 123 - ), FusedApp( + ), + FusedApp( _id = "113", status = Status.UNAVAILABLE, name = "Demo Three", -- GitLab