Skip to content
Permalink
Browse files

Merge pull request #396 from YIO-Remote/develop

Develop / Small bugfixes
  • Loading branch information
martonborzak committed Jan 3, 2020
2 parents 59920ae + 6702167 commit 6f5b180771287a05f38b958ae3c332e42b1bdb9d
Showing with 3,320 additions and 3,002 deletions.
  1. +2 βˆ’2 .github/workflows/copy_translation.yml
  2. +2 βˆ’2 .github/workflows/cpplint_modified_files.yml
  3. +3 βˆ’0 .gitignore
  4. +9 βˆ’1 MainContainer.qml
  5. +50 βˆ’1 style.qml β†’ Style.qml
  6. +10 βˆ’9 basic_ui/ChargingScreen.qml
  7. +1 βˆ’0 basic_ui/ClosingScreen.qml
  8. +9 βˆ’8 basic_ui/ContextMenu.qml
  9. +3 βˆ’2 basic_ui/ContextMenuIcon.qml
  10. +6 βˆ’5 basic_ui/CustomButton.qml
  11. +6 βˆ’5 basic_ui/CustomButtonState.qml
  12. +1 βˆ’1 basic_ui/CustomImageLoader.qml
  13. +6 βˆ’5 basic_ui/CustomSwitch.qml
  14. +5 βˆ’4 basic_ui/MainNavigation.qml
  15. +20 βˆ’19 basic_ui/MiniMediaPlayer.qml
  16. +9 βˆ’8 basic_ui/Notification.qml
  17. +2 βˆ’1 basic_ui/NotificationDrawer.qml
  18. +10 βˆ’8 basic_ui/PopupLowBattery.qml
  19. +9 βˆ’8 basic_ui/Profiles.qml
  20. +2 βˆ’2 basic_ui/ProgressCircle.qml
  21. +3 βˆ’2 basic_ui/Settings.qml
  22. +11 βˆ’10 basic_ui/StatusBar.qml
  23. +4 βˆ’3 basic_ui/Tag.qml
  24. +4 βˆ’2 basic_ui/Volume.qml
  25. +2 βˆ’1 basic_ui/pages/Favorites.qml
  26. +2 βˆ’1 basic_ui/pages/Group.qml
  27. +6 βˆ’5 basic_ui/pages/Page.qml
  28. +21 βˆ’21 basic_ui/settings/Battery.qml
  29. +6 βˆ’5 basic_ui/settings/Bluetooth.qml
  30. +4 βˆ’3 basic_ui/settings/Devices.qml
  31. +22 βˆ’21 basic_ui/settings/Display.qml
  32. +15 βˆ’15 basic_ui/settings/Integrations.qml
  33. +7 βˆ’7 basic_ui/settings/Languages.qml
  34. +18 βˆ’17 basic_ui/settings/Network.qml
  35. +23 βˆ’22 basic_ui/settings/PowerSaving.qml
  36. +6 βˆ’6 basic_ui/settings/RemoteConfig.qml
  37. +10 βˆ’9 basic_ui/settings/Softwareupdate.qml
  38. +10 βˆ’10 basic_ui/settings/System.qml
  39. +5 βˆ’4 basic_ui/settings/WifiNetworkListElement.qml
  40. +31 βˆ’29 components/ButtonBase.qml
  41. +15 βˆ’14 components/blind/ui/Button.qml
  42. +15 βˆ’14 components/blind/ui/Card.qml
  43. +11 βˆ’5 components/climate/ui/Button.qml
  44. +18 βˆ’17 components/climate/ui/Card.qml
  45. +9 βˆ’9 components/climate/ui/ContextMenu.qml
  46. +15 βˆ’14 components/light/ui/Button.qml
  47. +30 βˆ’29 components/light/ui/CardColor.qml
  48. +16 βˆ’15 components/light/ui/CardDimmable.qml
  49. +13 βˆ’12 components/light/ui/CardSwitch.qml
  50. +2 βˆ’0 components/media_player/sources/searchmodel_mediaplayer.cpp
  51. +3 βˆ’2 components/media_player/sources/searchmodel_mediaplayer.h
  52. +8 βˆ’7 components/media_player/ui/AlbumView.qml
  53. +4 βˆ’3 components/media_player/ui/Button.qml
  54. +10 βˆ’9 components/media_player/ui/Card.qml
  55. +15 βˆ’14 components/media_player/ui/CardHome.qml
  56. +7 βˆ’6 components/media_player/ui/CardPlaylists.qml
  57. +21 βˆ’20 components/media_player/ui/CardSearch.qml
  58. +2 βˆ’1 components/remote/ui/Button.qml
  59. +4 βˆ’3 components/remote/ui/ir/Button.qml
  60. +14 βˆ’13 components/remote/ui/ir/Card.qml
  61. +4 βˆ’3 components/remote/ui/ir/CardButtons.qml
  62. +5 βˆ’4 components/remote/ui/ir/CardChannels.qml
  63. +16 βˆ’15 components/weather/ui/Button.qml
  64. +14 βˆ’13 components/weather/ui/Card.qml
  65. +13 βˆ’0 keyboard.qrc
  66. +13 βˆ’11 keyboard/QtQuick/VirtualKeyboard/Styles/remotestyle/style.qml
  67. +14 βˆ’36 main.qml
  68. +1 βˆ’0 qml.qrc
  69. +6 βˆ’8 remote.pro
  70. +9 βˆ’1 sources/entities/entities.cpp
  71. +3 βˆ’3 sources/entities/entities.h
  72. +85 βˆ’0 sources/entities/switch.cpp
  73. +57 βˆ’0 sources/entities/switch.h
  74. +60 βˆ’0 sources/entities/switchinterface.h
  75. +14 βˆ’14 sources/main.cpp
  76. +0 βˆ’5 style.qrc
  77. +72 βˆ’72 translations/bg_BG.ts
  78. +72 βˆ’72 translations/cs_CZ.ts
  79. +72 βˆ’72 translations/da_DK.ts
  80. +83 βˆ’83 translations/de_DE.ts
  81. +72 βˆ’72 translations/el_GR.ts
  82. +72 βˆ’72 translations/en_US.ts
  83. +72 βˆ’72 translations/es_ES.ts
  84. +72 βˆ’72 translations/et_EE.ts
  85. +72 βˆ’72 translations/fi_FI.ts
  86. +72 βˆ’72 translations/fr_FR.ts
  87. +72 βˆ’72 translations/ga_IE.ts
  88. +72 βˆ’72 translations/hr_HR.ts
  89. +72 βˆ’72 translations/hu_HU.ts
  90. +72 βˆ’72 translations/is_IS.ts
  91. +72 βˆ’72 translations/it_IT.ts
  92. +72 βˆ’72 translations/lt_LT.ts
  93. +72 βˆ’72 translations/lv_LV.ts
  94. +72 βˆ’72 translations/mt_MT.ts
  95. +72 βˆ’72 translations/nl_NL.ts
  96. +72 βˆ’72 translations/no_NO.ts
  97. +72 βˆ’72 translations/pl_PL.ts
  98. +72 βˆ’72 translations/pt_BR.ts
  99. +72 βˆ’72 translations/pt_PT.ts
  100. +72 βˆ’72 translations/ro_RO.ts
  101. +72 βˆ’72 translations/ru_BY.ts
  102. +72 βˆ’72 translations/ru_MD.ts
  103. +72 βˆ’72 translations/ru_RU.ts
  104. +72 βˆ’72 translations/ru_UA.ts
  105. +72 βˆ’72 translations/sk_SK.ts
  106. +72 βˆ’72 translations/sl_SI.ts
  107. +72 βˆ’72 translations/sv_SE.ts
  108. +72 βˆ’72 translations/zh_CN.ts
  109. +72 βˆ’72 translations/zh_TW.ts
  110. +12 βˆ’11 wifiSetup.qml
@@ -2,7 +2,7 @@ name: Copy translation master file
on:
push:
branches:
- dev
- develop
jobs:
copycat:
name: Copycat
@@ -16,7 +16,7 @@ jobs:
DST_REPO_NAME: translations
DST_PATH: remote-software/en_US.ts
GH_PAT: ${{ secrets.GH_TOKEN }}
SRC_BRANCH: dev
SRC_BRANCH: develop
SRC_PATH: translations/en_US.ts
USERNAME: Workflow
EMAIL: hello@yio-remote.com
@@ -8,7 +8,7 @@
# Modified by Markus Zehnder:
# - limit by path: only commits including .h or .cpp files
# - limit to feature branches in pushes: gradually increase code quality for new features
# - compare changes against dev branch instead of master
# - compare changes against develop branch instead of master
# - custom rule and file exclusions for remote-software project
# - clean exit without stacktrace

@@ -36,7 +36,7 @@ jobs:
- run: sudo update-alternatives --install /usr/bin/python python ${pythonLocation}/bin/python3.8 10
- run: python -m pip install cpplint
- run: git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY
- run: git diff origin/dev --name-only > git_diff.txt
- run: git diff origin/develop --name-only > git_diff.txt
- name: cpplint_modified_files
shell: python
run: |
@@ -81,3 +81,6 @@ plugins/*.so
*.autosave
# Makefile should always be generated with qmake
Makefile

# Translation binary files
translations/*.qm
@@ -123,6 +123,8 @@ Item {
property int itemsLoaded: 0
property bool startUp: false

signal loadedItems()

SwipeView {
id: mainNavigationSwipeview
width: parent.width
@@ -157,8 +159,14 @@ Item {
}

onStatusChanged: {
if (status == Loader.Ready) {
if (mainNavigationLoader.status == Loader.Ready) {
itemsLoaded += 1;
console.debug("PAGE LOADED: " + itemsLoaded);

if (itemsLoaded === mainNavigation.menuConfig.count) {
console.debug("ALL PAGES LOADED. SENDING SIGNAL.");
main_container.loadedItems();
}
}
}
}
@@ -19,7 +19,6 @@
*
* SPDX-License-Identifier: GPL-3.0-or-later
*****************************************************************************/

pragma Singleton

import QtQuick 2.11
@@ -50,7 +49,57 @@ QtObject {
property color colorMedium: darkMode ? "#282828" : "#D4D4D4"
property color colorDark: darkMode ? "#1C1C1C" : "#ffffff"

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// ICONS
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

readonly property QtObject icons: QtObject {
readonly property string cool: "\uE91E"
readonly property string heat: "\uE91F"

readonly property string circle_full: "\uE91A"
readonly property string circle: "\uE91B"
readonly property string square_full: "\uE91C"
readonly property string square: "\uE91D"

readonly property string left_arrow: "\uE917"
readonly property string right_arrow: "\uE918"
readonly property string up_arrow: "\uE919"
readonly property string down_arrow: "\uE916"

readonly property string close: "\uE915"
readonly property string home: "\uE900"

readonly property string light: "\uE901"
readonly property string link: "\uE902"
readonly property string music: "\uE903"
readonly property string prev: "\uE909"
readonly property string next: "\uE904"
readonly property string pause: "\uE905"
readonly property string play: "\uE906"
readonly property string playlist: "\uE907"
readonly property string search: "\uE90C"
readonly property string speaker: "\uE90D"
readonly property string speakers: "\uE90E"
readonly property string radio: "\uE90A"

readonly property string power_on: "\uE908"
readonly property string remote: "\uE90B"
readonly property string stairs: "\uE90F"
readonly property string tv: "\uE910"
readonly property string weather: "\uE911"
readonly property string climate: "\uE913"
readonly property string blind: "\uE914"
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// FONT STYLES
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

property font buttonFont: Qt.font({
family: "Open Sans",
weight: Font.Normal,
pixelSize: 27,
lineHeight: 1
})
}
@@ -22,13 +22,14 @@

import QtQuick 2.11
import QtGraphicalEffects 1.0
import Style 1.0
import "qrc:/scripts/helper.js" as JSHelper

Rectangle {
id: chargingScreen
width: parent.width
height: parent.height
color: colorBackground
color: Style.colorBackground

state: "hidden"

@@ -103,7 +104,7 @@ Rectangle {
color: "#00000000"
radius: 16
border.width: 6
border.color: colorLine
border.color: Style.colorLine
}

// battery frame
@@ -113,9 +114,9 @@ Rectangle {
anchors.horizontalCenter: parent.horizontalCenter
width: 151
height: 218
color: colorBackground
color: Style.colorBackground
border.width: 6
border.color: colorLine
border.color: Style.colorLine
radius: 32

// battery fill
@@ -125,7 +126,7 @@ Rectangle {
anchors.bottomMargin: 23
width: 106
height: battery_level*172
color: colorGreen
color: Style.colorGreen
radius: 8
}

@@ -140,18 +141,18 @@ Rectangle {
anchors.horizontalCenter: parent.horizontalCenter

ColorOverlay {
visible: !darkMode
visible: !Style.darkMode
anchors.fill: parent
source: parent
color: colorText
color: Style.colorText
}
}
}
}

Text {
id: chargeText
color: colorText
color: Style.colorText
text: Math.round(battery_level * 100) + qsTr("% Charged") + translateHandler.emptyString
anchors.bottom: parent.bottom
anchors.bottomMargin: 230
@@ -166,7 +167,7 @@ Rectangle {

Text {
id: timeText
color: colorText
color: Style.colorText
text: loader_main.item ? loader_main.item.statusBar.timeText.text : ""
verticalAlignment: Text.AlignVCenter
anchors.horizontalCenter: parent.horizontalCenter
@@ -22,6 +22,7 @@

import QtQuick 2.11
import Launcher 1.0
import Style 1.0

Rectangle {
id: closingScreen
@@ -21,13 +21,14 @@
*****************************************************************************/

import QtQuick 2.11
import Style 1.0

Rectangle {
id: main
width: parent.width
height: 100+(80*list.length)
radius: cornerRadius
color: colorBackground
radius: Style.cornerRadius
color: Style.colorBackground

property var list: []
property string id
@@ -82,14 +83,14 @@ Rectangle {

Text {
id: icon
color: colorText
color: Style.colorText
text: {
if (list[index] == "PLAY")
return "\uE903"
return Style.icons.music
else if (list[index] == "QUEUE")
return "\uE907"
return Style.icons.playlist
else if (list[index] == "SONGRADIO")
return "\uE90A"
return Style.icons.radio
else
return ""
}
@@ -115,7 +116,7 @@ Rectangle {
else
return "Not supported"
}
color: colorText
color: Style.colorText
anchors.left: icon.right
anchors.leftMargin: 20
anchors.verticalCenter: parent.verticalCenter
@@ -149,7 +150,7 @@ Rectangle {

Text {
text: qsTr("Cancel") + translateHandler.emptyString
color: colorText
color: Style.colorText
opacity: 0.5
anchors.centerIn: parent
font.family: "Open Sans"
@@ -21,15 +21,16 @@
*****************************************************************************/

import QtQuick 2.11
import Style 1.0

Rectangle {
id: circleButton
width: 30
height: 30
color: colorLine
color: Style.colorLine
radius: width/2

property var colorBg: colorBackground
property var colorBg: Style.colorBackground
property alias mouseArea: mouseArea


@@ -22,6 +22,7 @@

import QtQuick 2.11
import QtQuick.Controls 2.5
import Style 1.0

Rectangle {

@@ -32,17 +33,17 @@ Rectangle {
id: button
width: buttonText.implicitWidth+60
height: 60
color: colorBackgroundTransparent
color: Style.colorBackgroundTransparent
radius: 40
border.color: colorLine
border.color: Style.colorLine

states: State {
name: "pressed"
when: mouseArea.pressed == true
PropertyChanges {
target: button
color: colorLine
border.color: colorBackgroundTransparent
color: Style.colorLine
border.color: Style.colorBackgroundTransparent
}
}

@@ -55,7 +56,7 @@ Rectangle {

Text {
id: buttonText
color: colorText
color: Style.colorText
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
verticalAlignment: Text.AlignVCenter
@@ -21,6 +21,7 @@
*****************************************************************************/

import QtQuick 2.9
import Style 1.0

Rectangle {

@@ -31,17 +32,17 @@ Rectangle {
id: button
width: buttonText.implicitWidth+60
height: 60
color: buttonState ? colorHighlight1 : colorBackgroundTransparent
color: buttonState ? Style.colorHighlight1 : Style.colorBackgroundTransparent
radius: 40
border.color: buttonState ? colorHighlight1 : colorLine
border.color: buttonState ? Style.colorHighlight1 : Style.colorLine

states: State {
name: "pressed"
when: mouseArea.pressed === true
PropertyChanges {
target: button
color: buttonState ? colorBackgroundTransparent : colorHighlight1
border.color: buttonState ? colorLine : colorBackgroundTransparent
color: buttonState ? Style.colorBackgroundTransparent : Style.colorHighlight1
border.color: buttonState ? Style.colorLine : Style.colorBackgroundTransparent
}
}

@@ -54,7 +55,7 @@ Rectangle {

Text {
id: buttonText
color: colorText
color: Style.colorText
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
verticalAlignment: Text.AlignVCenter
@@ -71,4 +71,4 @@ Item {
}
}
}
}
}

0 comments on commit 6f5b180

Please sign in to comment.
You can’t perform that action at this time.