Skip to content

Commit

Permalink
Merge pull request #2926 from MerginMaps/stylev2_as_cpp
Browse files Browse the repository at this point in the history 
style v2 as cpp class
  • Loading branch information
@PeterPetrik
PeterPetrik authored Nov 30, 2023
2 parents 09aa8f2 + d816176 commit 67820e8
Show file tree
Hide file tree
Showing 36 changed files with 412 additions and 335 deletions.
201 changes: 201 additions & 0 deletions app/mmstyle.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
/***************************************************************************
* *
* 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 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/

#ifndef MMSTYLE_H
#define MMSTYLE_H

#include <QObject>
#include <QFont>
#include <QColor>
#include <QUrl>

class MMStyle: public QObject
{
Q_OBJECT

// Fonts - how to use
// standard - font: __style.p5
// extended - font.pixelSize: __style.p5.pixelSize; font.italic: true

// Fonts - Title
Q_PROPERTY( QFont t1 READ t1 CONSTANT )
Q_PROPERTY( QFont t2 READ t2 CONSTANT )
Q_PROPERTY( QFont t3 READ t3 CONSTANT )
Q_PROPERTY( QFont t4 READ t4 CONSTANT )
Q_PROPERTY( QFont t5 READ t5 CONSTANT )

// Fonts - Paragraph
Q_PROPERTY( QFont p1 READ p1 CONSTANT )
Q_PROPERTY( QFont p2 READ p2 CONSTANT )
Q_PROPERTY( QFont p3 READ p3 CONSTANT )
Q_PROPERTY( QFont p4 READ p4 CONSTANT )
Q_PROPERTY( QFont p5 READ p5 CONSTANT )
Q_PROPERTY( QFont p6 READ p6 CONSTANT )
Q_PROPERTY( QFont p7 READ p7 CONSTANT )

// Colors - primary palette
Q_PROPERTY( QColor grassColor READ grassColor CONSTANT )
Q_PROPERTY( QColor forestColor READ forestColor CONSTANT )
Q_PROPERTY( QColor nightColor READ nightColor CONSTANT )
Q_PROPERTY( QColor whiteColor READ whiteColor CONSTANT )
Q_PROPERTY( QColor transparentColor READ transparentColor CONSTANT )

// Colors - secondary palette
Q_PROPERTY( QColor lightGreenColor READ lightGreenColor CONSTANT )
Q_PROPERTY( QColor mediumGreenColor READ mediumGreenColor CONSTANT )
Q_PROPERTY( QColor grayColor READ grayColor CONSTANT )

// Colors - additional colors
Q_PROPERTY( QColor sandColor READ sandColor CONSTANT )
Q_PROPERTY( QColor sunsetColor READ sunsetColor CONSTANT )
Q_PROPERTY( QColor sunColor READ sunColor CONSTANT )
Q_PROPERTY( QColor earthColor READ earthColor CONSTANT )
Q_PROPERTY( QColor roseColor READ roseColor CONSTANT )
Q_PROPERTY( QColor skyColor READ skyColor CONSTANT )
Q_PROPERTY( QColor grapeColor READ grapeColor CONSTANT )
Q_PROPERTY( QColor deepOceanColor READ deepOceanColor CONSTANT )
Q_PROPERTY( QColor purpleColor READ purpleColor CONSTANT )
Q_PROPERTY( QColor fieldColor READ fieldColor CONSTANT )

// Colors - sentiment colors
Q_PROPERTY( QColor positiveColor READ positiveColor CONSTANT )
Q_PROPERTY( QColor warningColor READ warningColor CONSTANT )
Q_PROPERTY( QColor negativeColor READ negativeColor CONSTANT )
Q_PROPERTY( QColor informativeColor READ informativeColor CONSTANT )

// Colors - others
Q_PROPERTY( QColor nightAlphaColor READ nightAlphaColor CONSTANT ) // placeholder input color
Q_PROPERTY( QColor errorBgInputColor READ errorBgInputColor CONSTANT ) // error bg input color
Q_PROPERTY( QColor shadowColor READ shadowColor CONSTANT )

// Icons
Q_PROPERTY( QUrl arrowLinkRightIcon READ arrowLinkRightIcon CONSTANT )
Q_PROPERTY( QUrl searchIcon READ searchIcon CONSTANT )
Q_PROPERTY( QUrl calendarIcon READ calendarIcon CONSTANT )
Q_PROPERTY( QUrl showIcon READ showIcon CONSTANT )
Q_PROPERTY( QUrl hideIcon READ hideIcon CONSTANT )
Q_PROPERTY( QUrl xMarkIcon READ xMarkIcon CONSTANT )
Q_PROPERTY( QUrl errorIcon READ errorIcon CONSTANT )
Q_PROPERTY( QUrl arrowUpIcon READ arrowUpIcon CONSTANT )
Q_PROPERTY( QUrl arrowDownIcon READ arrowDownIcon CONSTANT )
Q_PROPERTY( QUrl qrCodeIcon READ qrCodeIcon CONSTANT )
Q_PROPERTY( QUrl checkmarkIcon READ checkmarkIcon CONSTANT )
Q_PROPERTY( QUrl closeButtonIcon READ closeButtonIcon CONSTANT )
Q_PROPERTY( QUrl closeIcon READ closeIcon CONSTANT )
Q_PROPERTY( QUrl waitingIcon READ waitingIcon CONSTANT )
Q_PROPERTY( QUrl deleteIcon READ deleteIcon CONSTANT )
Q_PROPERTY( QUrl doneIcon READ doneIcon CONSTANT )
Q_PROPERTY( QUrl editIcon READ editIcon CONSTANT )
Q_PROPERTY( QUrl moreIcon READ moreIcon CONSTANT )

// Images
Q_PROPERTY( QUrl uploadImage READ uploadImage CONSTANT )
Q_PROPERTY( QUrl reachedDataLimitImage READ reachedDataLimitImage CONSTANT )

// Map items
Q_PROPERTY( double mapItemHeight READ mapItemHeight CONSTANT )

// Toolbar
Q_PROPERTY( double toolbarHeight READ toolbarHeight CONSTANT )
Q_PROPERTY( double menuDrawerHeight READ menuDrawerHeight CONSTANT )

public:
explicit MMStyle( qreal dp )
: mDp( dp )
{}
~MMStyle() = default;

QFont t1() {return fontFactory( 18, true );}
QFont t2() {return fontFactory( 16, true );}
QFont t3() {return fontFactory( 14, true );}
QFont t4() {return fontFactory( 18, true );}
QFont t5() {return fontFactory( 10, true );}

QFont p1() {return fontFactory( 32, false );}
QFont p2() {return fontFactory( 24, false );}
QFont p3() {return fontFactory( 20, false );}
QFont p4() {return fontFactory( 16, false );}
QFont p5() {return fontFactory( 14, false );}
QFont p6() {return fontFactory( 12, false );}
QFont p7() {return fontFactory( 10, false );}

QColor grassColor() {return QColor::fromString( "#73D19C" );}
QColor forestColor() {return QColor::fromString( "#004C45" );}
QColor nightColor() {return QColor::fromString( "#12181F" );}
QColor whiteColor() {return QColor::fromString( "#FFFFFF" );}
QColor transparentColor() {return QColor::fromString( "transparent" );}

QColor lightGreenColor() {return QColor::fromString( "#EFF5F3" );}
QColor mediumGreenColor() {return QColor::fromString( "#B7CDC4" );}
QColor grayColor() {return QColor::fromString( "#E2E2E2" );}

QColor sandColor() {return QColor::fromString( "#FFF4E2" );}
QColor sunsetColor() {return QColor::fromString( "#FFB673" );}
QColor sunColor() {return QColor::fromString( "#F4CB46" );}
QColor earthColor() {return QColor::fromString( "#4D2A24" );}
QColor roseColor() {return QColor::fromString( "#FFBABC" );}
QColor skyColor() {return QColor::fromString( "#A6CBF4" );}
QColor grapeColor() {return QColor::fromString( "#5A2740" );}
QColor deepOceanColor() {return QColor::fromString( "#1C324A" );}
QColor purpleColor() {return QColor::fromString( "#CCBDF5" );}
QColor fieldColor() {return QColor::fromString( "#9BD1A9" );}

QColor positiveColor() {return QColor::fromString( "#C2FFA6" );}
QColor warningColor() {return QColor::fromString( "#FFD6A6" );}
QColor negativeColor() {return QColor::fromString( "#FFA6A6" );}
QColor informativeColor() {return QColor::fromString( "#A6F4FF" );}

QColor nightAlphaColor() {return QColor::fromString( "#AA12181F" );}
QColor errorBgInputColor() {return QColor::fromString( "#FEFAF9" );}
QColor shadowColor() {return QColor::fromString( "#66777777" );}

QUrl arrowLinkRightIcon() {return QUrl( "qrc:/Arrow Link Right.svg" );}
QUrl searchIcon() {return QUrl( "qrc:/Search.svg" );}
QUrl calendarIcon() {return QUrl( "qrc:/Calendar.svg" );}
QUrl showIcon() {return QUrl( "qrc:/Show.svg" );}
QUrl hideIcon() {return QUrl( "qrc:/Hide.svg" );}
QUrl xMarkIcon() {return QUrl( "qrc:/X Mark..svg" );}
QUrl errorIcon() {return QUrl( "qrc:/Error.svg" );}
QUrl arrowUpIcon() {return QUrl( "qrc:/Arrow Up.svg" );}
QUrl arrowDownIcon() {return QUrl( "qrc:/Arrow Down.svg" );}
QUrl qrCodeIcon() {return QUrl( "qrc:/QR Code.svg" );}
QUrl checkmarkIcon() {return QUrl( "qrc:/Checkmark.svg" );}
QUrl closeButtonIcon() {return QUrl( "qrc:/CloseButton.svg" );}
QUrl closeIcon() {return QUrl( "qrc:/Close.svg" );}
QUrl waitingIcon() {return QUrl( "qrc:/Waiting.svg" );}
QUrl deleteIcon() {return QUrl( "qrc:/Delete.svg" );}
QUrl doneIcon() {return QUrl( "qrc:/Done.svg" );}
QUrl editIcon() {return QUrl( "qrc:/Edit.svg" );}
QUrl moreIcon() {return QUrl( "qrc:/More.svg" );}

QUrl uploadImage() {return QUrl( "qrc:/UploadImage.svg" );}
QUrl reachedDataLimitImage() {return QUrl( "qrc:/ReachedDataLimitImage.svg" );}

double mapItemHeight() {return 50 * mDp;}

double toolbarHeight() {return 89 * mDp;}
double menuDrawerHeight() {return 67 * mDp;}

signals:
void styleChanged();

private:
QFont fontFactory( int pixelSize, bool bold )
{
QFont f;
f.setBold( bold );
f.setPixelSize( pixelSize * mDp );
return f;
}

qreal mDp;

};

#endif // MMSTYLE_H
99 changes: 0 additions & 99 deletions app/qmlV2/StyleV2.qml
View file

This file was deleted.

7 changes: 3 additions & 4 deletions app/qmlV2/component/MMButton.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import QtQuick
import QtQuick.Controls
import QtQuick.Controls.Basic
import "."
import ".."

Button {
id: control
Expand All @@ -20,20 +19,20 @@ Button {

contentItem: Text {
anchors.centerIn: control
font: StyleV2.t3
font: __style.t3
text: control.text
leftPadding: 32 * __dp
rightPadding: 32 * __dp
topPadding: 10 * __dp
bottomPadding: 10 * __dp
color: control.enabled ? control.down || control.hovered ? StyleV2.grassColor : StyleV2.forestColor : StyleV2.forestColor
color: control.enabled ? control.down || control.hovered ? __style.grassColor : __style.forestColor : __style.forestColor
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight
}

background: Rectangle {
color: transparent ? "transparent" : control.enabled ? control.down || control.hovered ? StyleV2.forestColor : StyleV2.grassColor : StyleV2.mediumGreenColor
color: transparent ? "transparent" : control.enabled ? control.down || control.hovered ? __style.forestColor : __style.grassColor : __style.mediumGreenColor
radius: height / 2
}
}
Loading

1 comment on commit 67820e8

@inputapp-bot
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iOS - version 23.11.490511 just submitted!

Please sign in to comment.