From a75555f3464607b93d523478999b9c8a7dc224a0 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Tue, 5 Feb 2019 23:46:02 -0500 Subject: Theme (#1346) * Theme text from linked user list * Theme unlike page, resolves #1335 * Fix comment theme box text, resolves #1340 * Apply spotless --- .../frost/fragments/RecyclerFragmentBase.kt | 1 - .../com/pitchedapps/frost/views/FrostRecyclerView.kt | 2 -- app/src/main/res/xml/frost_changelog.xml | 2 ++ .../com/pitchedapps/frost/injectors/CssAssetsTest.kt | 18 +++++++++++++++++- .../com/pitchedapps/frost/injectors/JsAssetsTest.kt | 18 +++++++++++++++++- app/src/web/.idea/watcherTasks.xml | 2 +- app/src/web/assets/css/core/_colors.scss | 2 +- app/src/web/assets/css/core/_core_bg.scss | 8 ++++---- app/src/web/assets/css/core/_core_text.scss | 6 +++--- app/src/web/assets/css/core/core.css | 18 +++++++++--------- app/src/web/assets/css/themes/custom.css | 10 +++++----- app/src/web/assets/css/themes/material_amoled.css | 10 +++++----- app/src/web/assets/css/themes/material_dark.css | 10 +++++----- app/src/web/assets/css/themes/material_glass.css | 10 +++++----- app/src/web/assets/css/themes/material_light.css | 10 +++++----- 15 files changed, 79 insertions(+), 48 deletions(-) (limited to 'app') diff --git a/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragmentBase.kt b/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragmentBase.kt index 37af690b..ed6a4cf0 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragmentBase.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragmentBase.kt @@ -30,7 +30,6 @@ import com.pitchedapps.frost.utils.L import com.pitchedapps.frost.utils.frostJsoup import com.pitchedapps.frost.views.FrostRecyclerView import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.isActive import kotlinx.coroutines.withContext /** diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostRecyclerView.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostRecyclerView.kt index ce7437a7..97be8951 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostRecyclerView.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostRecyclerView.kt @@ -27,10 +27,8 @@ import com.pitchedapps.frost.contracts.FrostContentContainer import com.pitchedapps.frost.contracts.FrostContentCore import com.pitchedapps.frost.contracts.FrostContentParent import com.pitchedapps.frost.fragments.RecyclerContentContract -import com.pitchedapps.frost.utils.L import com.pitchedapps.frost.utils.Prefs import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.isActive import kotlinx.coroutines.launch /** diff --git a/app/src/main/res/xml/frost_changelog.xml b/app/src/main/res/xml/frost_changelog.xml index a2347873..1736b0ea 100644 --- a/app/src/main/res/xml/frost_changelog.xml +++ b/app/src/main/res/xml/frost_changelog.xml @@ -11,6 +11,8 @@ + + diff --git a/app/src/test/kotlin/com/pitchedapps/frost/injectors/CssAssetsTest.kt b/app/src/test/kotlin/com/pitchedapps/frost/injectors/CssAssetsTest.kt index 0613d28e..8894e5b6 100644 --- a/app/src/test/kotlin/com/pitchedapps/frost/injectors/CssAssetsTest.kt +++ b/app/src/test/kotlin/com/pitchedapps/frost/injectors/CssAssetsTest.kt @@ -1,3 +1,19 @@ +/* + * Copyright 2019 Allan Wang + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ package com.pitchedapps.frost.injectors import java.io.File @@ -13,4 +29,4 @@ class CssAssetsTest { assertTrue(file.exists(), "${asset.name} not found at ${file.path}") } } -} \ No newline at end of file +} diff --git a/app/src/test/kotlin/com/pitchedapps/frost/injectors/JsAssetsTest.kt b/app/src/test/kotlin/com/pitchedapps/frost/injectors/JsAssetsTest.kt index eab62b27..7fcb8573 100644 --- a/app/src/test/kotlin/com/pitchedapps/frost/injectors/JsAssetsTest.kt +++ b/app/src/test/kotlin/com/pitchedapps/frost/injectors/JsAssetsTest.kt @@ -1,3 +1,19 @@ +/* + * Copyright 2019 Allan Wang + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ package com.pitchedapps.frost.injectors import java.io.File @@ -13,4 +29,4 @@ class JsAssetsTest { assertTrue(file.exists(), "${asset.name} not found at ${file.path}") } } -} \ No newline at end of file +} diff --git a/app/src/web/.idea/watcherTasks.xml b/app/src/web/.idea/watcherTasks.xml index 32d1e6f4..4caea6ed 100644 --- a/app/src/web/.idea/watcherTasks.xml +++ b/app/src/web/.idea/watcherTasks.xml @@ -17,7 +17,7 @@