From 0bd4373862ecc5bfe06590c3650481303bdde3d1 Mon Sep 17 00:00:00 2001 From: Slava Monich Date: Tue, 10 Dec 2019 03:42:24 +0300 Subject: [PATCH] [app] Use fixed color for folder title Because the background color is fixed too. --- app/qml/BooksShelfItem.qml | 15 +++++++++------ app/qml/BooksTitleText.qml | 14 +++++++------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/app/qml/BooksShelfItem.qml b/app/qml/BooksShelfItem.qml index dcf9305..d706ad3 100644 --- a/app/qml/BooksShelfItem.qml +++ b/app/qml/BooksShelfItem.qml @@ -1,20 +1,21 @@ /* - Copyright (C) 2015-2016 Jolla Ltd. - Contact: Slava Monich + Copyright (C) 2015-2019 Jolla Ltd. + Copyright (C) 2015-2019 Slava Monich - You may use this file under the terms of BSD license as follows: + You may use this file under the terms of the BSD license as follows: Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of the Jolla Ltd nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. + * Neither the names of the copyright holders nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -105,6 +106,8 @@ Item { BooksTitleText { id: title + + color: cover.book ? Theme.primaryColor : "#ffe798" anchors.centerIn: parent width: parent.width - 2*Theme.paddingMedium height: parent.height - 2*Theme.paddingMedium diff --git a/app/qml/BooksTitleText.qml b/app/qml/BooksTitleText.qml index d57224b..42d5ca4 100644 --- a/app/qml/BooksTitleText.qml +++ b/app/qml/BooksTitleText.qml @@ -1,20 +1,21 @@ /* - Copyright (C) 2015 Jolla Ltd. - Contact: Slava Monich + Copyright (C) 2015-2019 Jolla Ltd. + Copyright (C) 2015-2019 Slava Monich - You may use this file under the terms of BSD license as follows: + You may use this file under the terms of the BSD license as follows: Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of the Jolla Ltd nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. + * Neither the names of the copyright holders nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -33,7 +34,6 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 Text { - color: Theme.primaryColor font.family: Theme.fontFamily font.pixelSize: Theme.fontSizeSmall horizontalAlignment: Text.AlignHCenter