- fixed some errors that occurred when changing categories
- fixed layout bugs - new app icon
10
CHANGELOG.md
|
@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
|
|||
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
|
||||
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
|
||||
|
||||
# [0.01.4b] - 2019-05-31
|
||||
### Fixed
|
||||
- fixed some errors that occurred when changing categories
|
||||
- fixed layout bugs
|
||||
- new app icon
|
||||
|
||||
## [0.01.3b] - 2019-05-25
|
||||
### Fixed
|
||||
- minor bug fixes
|
||||
|
||||
## [0.01.2b] - 2019-05-24
|
||||
### Added
|
||||
- added ability to change category in results without going back to calendar
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0"?>
|
||||
<manifest package="com.itsblue.blueROCKtest" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.01.3b" android:versionCode="4" android:installLocation="auto">
|
||||
<manifest package="com.itsblue.blueROCK" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.01.4b" android:versionCode="5" android:installLocation="auto">
|
||||
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="blueROCK" android:icon="@drawable/icon">
|
||||
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="blueROCK (for digitalROCK)" android:screenOrientation="unspecified" android:launchMode="singleTop">
|
||||
<intent-filter>
|
||||
|
|
Before Width: | Height: | Size: 138 KiB After Width: | Height: | Size: 150 KiB |
Before Width: | Height: | Size: 138 KiB After Width: | Height: | Size: 150 KiB |
Before Width: | Height: | Size: 138 KiB After Width: | Height: | Size: 150 KiB |
|
@ -27,8 +27,10 @@ ListView {
|
|||
|
||||
signal refresh()
|
||||
|
||||
anchors.margins: 10
|
||||
anchors.rightMargin: 14
|
||||
anchors {
|
||||
leftMargin: 10
|
||||
rightMargin: 14
|
||||
}
|
||||
|
||||
clip: true
|
||||
|
||||
|
@ -53,8 +55,6 @@ ListView {
|
|||
active: true
|
||||
}
|
||||
|
||||
|
||||
|
||||
Behavior on opacity {
|
||||
NumberAnimation {
|
||||
duration: 200
|
||||
|
@ -82,6 +82,7 @@ ListView {
|
|||
postRefreshDelay: 0
|
||||
|
||||
busyIndicator: FancyBusyIndicator {}
|
||||
refreshPosition: height * 1.3
|
||||
|
||||
onRefreshRequested: {
|
||||
control.refresh()
|
||||
|
|
30
resources/qml/Pages/AthleteSearchPage.qml
Normal file
|
@ -0,0 +1,30 @@
|
|||
/*
|
||||
blueROCK - for digital rock
|
||||
Copyright (C) 2019 Dorian Zedler
|
||||
|
||||
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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import QtQuick 2.0
|
||||
import QtQuick.Controls 2.4
|
||||
|
||||
Page {
|
||||
id: root
|
||||
|
||||
title: "start"
|
||||
property Component headerComponent: null
|
||||
|
||||
|
||||
|
||||
}
|
|
@ -76,7 +76,7 @@ Page {
|
|||
root.ready = true
|
||||
}
|
||||
else {
|
||||
root.status = 900
|
||||
//root.status = 901
|
||||
root.ready = false
|
||||
}
|
||||
}
|
||||
|
@ -92,6 +92,8 @@ Page {
|
|||
if(openLoadingDl)
|
||||
loadingDl.open()
|
||||
|
||||
var oldParams = Object.assign({}, root.params)
|
||||
|
||||
// update all the given values
|
||||
for(var prop in params){
|
||||
if(params.hasOwnProperty(prop)){
|
||||
|
@ -101,6 +103,12 @@ Page {
|
|||
|
||||
loadData(root.params)
|
||||
|
||||
console.log("ready: " + root.ready + ": " + root.status)
|
||||
|
||||
if(root.status !== 200)
|
||||
root.params = oldParams
|
||||
|
||||
|
||||
if(openLoadingDl)
|
||||
loadingDl.close()
|
||||
|
||||
|
@ -178,15 +186,16 @@ Page {
|
|||
widgetLd.sourceComponent = calComp
|
||||
//widgetLd.item.widgetData = root.widgetData
|
||||
}
|
||||
root.status = widgetLd.item.status
|
||||
root.status = widgetLd.item.status
|
||||
|
||||
if(widgetLd.item.ready){
|
||||
return true
|
||||
}
|
||||
else {
|
||||
delete(widgetLd.sourceComponent = null)
|
||||
return false
|
||||
}
|
||||
if(widgetLd.item.ready){
|
||||
return true
|
||||
}
|
||||
else {
|
||||
root.status = widgetLd.item.status === undefined ? 900:widgetLd.item.status
|
||||
delete(widgetLd.sourceComponent)
|
||||
return false
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
|
|
|
@ -158,7 +158,7 @@ DataListView {
|
|||
// function to scroll to the next competition that is not already over
|
||||
var compList = control.widgetData["competitions"]
|
||||
|
||||
console.log("scrolling")
|
||||
//console.log("scrolling")
|
||||
|
||||
if(parseInt(control.year) === new Date().getFullYear()){
|
||||
for(var i = 0; i < compList.length; i ++){
|
||||
|
@ -374,13 +374,13 @@ DataListView {
|
|||
text: name
|
||||
}
|
||||
|
||||
Label {
|
||||
/*Label {
|
||||
id: infola
|
||||
|
||||
width: parent.width
|
||||
|
||||
text: thisData.info
|
||||
}
|
||||
}*/
|
||||
|
||||
Label {
|
||||
id: dateLa
|
||||
|
|
|
@ -93,7 +93,7 @@ DataListView {
|
|||
var addition = "(Registration) "
|
||||
|
||||
if(titleString !== undefined){
|
||||
return addition + titleString
|
||||
return addition + " " + titleString
|
||||
}
|
||||
else {
|
||||
return ""
|
||||
|
|
|
@ -114,7 +114,7 @@ DataListView {
|
|||
var addition = qsTr("(Results)")
|
||||
|
||||
if(titleString !== undefined){
|
||||
return addition + titleString
|
||||
return addition + " " + titleString
|
||||
}
|
||||
else {
|
||||
return ""
|
||||
|
@ -612,12 +612,6 @@ DataListView {
|
|||
|
||||
currentIndex: getIndex(parseInt(control.widgetData['route_order']))
|
||||
|
||||
Component.onCompleted: {
|
||||
//currentIndex = getIndex(params.route)
|
||||
//setCurrentIndex(getIndex(params.route))
|
||||
//routeSelectTb.setCurrentIndex(routeSelectTb.getIndex(parseInt(control.widgetData['route_order'])))
|
||||
}
|
||||
|
||||
function getTabs() {
|
||||
|
||||
var obj = control.widgetData["route_names"]
|
||||
|
@ -675,6 +669,7 @@ DataListView {
|
|||
//console.log("changing to index: " + index + " (" + routeSelectTb.tabs[index][0] + ", " + routeSelectTb.tabs[index][1] + ")")
|
||||
if(routeSelectTb.getIndex(parseInt(control.widgetData['route_order'])) !== index){
|
||||
control.changeRoute(routeSelectTb.tabs[index][0])
|
||||
routeSelectTb.setCurrentIndex(routeSelectTb.getIndex(parseInt(control.widgetData['route_order'])))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -173,8 +173,13 @@ DataListView {
|
|||
Row {
|
||||
id: partDelFirstRow
|
||||
|
||||
width: parent.width
|
||||
height: parent.height
|
||||
anchors {
|
||||
fill: parent
|
||||
leftMargin: parent.width * 0.05
|
||||
rightMargin: parent.width * 0.05
|
||||
}
|
||||
|
||||
spacing: width * 0.1
|
||||
|
||||
Label {
|
||||
height: parent.height
|
||||
|
@ -191,7 +196,7 @@ DataListView {
|
|||
|
||||
Label {
|
||||
height: parent.height
|
||||
width: parent.width * 0.5
|
||||
width: parent.width * 0.4
|
||||
|
||||
fontSizeMode: Text.Fit
|
||||
font.bold: true
|
||||
|
@ -287,7 +292,6 @@ DataListView {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
|
@ -308,8 +312,10 @@ DataListView {
|
|||
|
||||
onClicked: {
|
||||
//console.log("changing to index: " + index + " (" + routeSelectTb.tabs[index][0] + ", " + routeSelectTb.tabs[index][1] + ")")
|
||||
|
||||
control.changeRoute(routeSelectTb.tabs[index][0])
|
||||
if(routeSelectTb.getIndex(parseInt(control.widgetData['route_order'])) !== index){
|
||||
control.changeRoute(routeSelectTb.tabs[index][0])
|
||||
routeSelectTb.setCurrentIndex(routeSelectTb.getIndex(parseInt(control.widgetData['route_order'])))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -612,5 +612,6 @@ Window {
|
|||
|
||||
return([infoLevel, errorString, errorDescription])
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -16,5 +16,6 @@
|
|||
<file>Widgets/RegistrationWidget.qml</file>
|
||||
<file>Widgets/StartlistWidget.qml</file>
|
||||
<file>Widgets/RankingWidget.qml</file>
|
||||
<file>Pages/AthleteSearchPage.qml</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
|
Before Width: | Height: | Size: 138 KiB After Width: | Height: | Size: 150 KiB |
BIN
resources/shared/faviconMonochrome.png
Normal file
After Width: | Height: | Size: 123 KiB |
Before Width: | Height: | Size: 82 KiB After Width: | Height: | Size: 119 KiB |
BIN
resources/shared/photo_2019-05-31_10-49-49.jpg
Normal file
After Width: | Height: | Size: 70 KiB |
BIN
resources/shared/photo_2019-05-31_10-49-58.jpg
Normal file
After Width: | Height: | Size: 68 KiB |
BIN
resources/shared/photo_2019-05-31_10-56-40.jpg
Normal file
After Width: | Height: | Size: 74 KiB |