Skip to content

Commit

Permalink
Finished Version 1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@myzinsky
myzinsky committed May 28, 2022
1 parent 2a8c2ab commit 1f6095d
Show file tree
Hide file tree
Showing 15 changed files with 161 additions and 171 deletions.
4 changes: 2 additions & 2 deletions android/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<manifest package="de.webappjung.CloudLogOffline" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0.9" android:versionCode="9" android:installLocation="auto">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29"/>
<manifest package="de.webappjung.CloudLogOffline" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.1.0" android:versionCode="10" android:installLocation="auto">
<uses-sdk android:minSdkVersion="30" android:targetSdkVersion="30"/>

<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
Remove the comment if you do not require these default permissions. -->
Expand Down
Binary file modified android/res/drawable-hdpi/icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/res/drawable-ldpi/icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/res/drawable-mdpi/icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/res/drawable-xhdpi/icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/res/drawable-xxhdpi/icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/res/drawable-xxxhdpi/icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions ios/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,27 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>${QMAKE_SHORT_VERSION}</string>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleSignature</key>
<string>${QMAKE_PKGINFO_TYPEINFO}</string>
<key>CFBundleVersion</key>
<string>${QMAKE_FULL_VERSION}</string>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>MinimumOSVersion</key>
<string>${IPHONEOS_DEPLOYMENT_TARGET}</string>
<key>NOTE</key>
<string>This file was generated by Qt/QMake.</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Locating repeaters near your location</string>
<key>UILaunchStoryboardName</key>
<string>myLaunchScreen</string>
<string>myLaunchScreen</string>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Locating repeaters near your location</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion qml/AboutView.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Page {

text: "<h1>About</h1>
CloudLogApp is developed by Web &amp; App Dr.-Ing. Matthias Jung (DL9MJ),
http://www.webappjung.de/<br>"
http://www.webappjung.de/<br>. The repeater list is provided by https://hearham.com<br>"
color: "white"
}

Expand Down
282 changes: 132 additions & 150 deletions qml/RepeaterItem.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,178 +31,160 @@ SwipeDelegate {
height: 50
width: parent.width

Rectangle {
id: callcityrect
z: 100
color: "#555555"
width: call.contentWidth + city.contentWidth + 10
height: call.contentHeight
anchors.left: parent.left
anchors.leftMargin: 5
anchors.top: parent.top
anchors.topMargin: 5
Text {
id: call
text: model.call.replace(/0/g,"\u2205").toUpperCase()
font.underline: false
font.weight: Font.Bold
style: Text.Normal
font.wordSpacing: 0
font.capitalization: Font.Capitalize
color: "#607D8B"
font.pixelSize: 20
font.bold: true
MouseArea {
anchors.fill: parent

Rectangle {
id: callcityrect
z: 100
color: "#555555"
width: call.contentWidth + city.contentWidth + 10
height: call.contentHeight
anchors.left: parent.left
anchors.leftMargin: 5
anchors.top: parent.top
anchors.topMargin: 5
Text {
id: call
text: model.call.replace(/0/g,"\u2205").toUpperCase()
font.underline: false
font.weight: Font.Bold
style: Text.Normal
font.wordSpacing: 0
font.capitalization: Font.Capitalize
color: "#607D8B"
font.pixelSize: 20
font.bold: true
}

Text {
id: city
anchors.top: parent.top
anchors.left: call.right
anchors.leftMargin: 10
color: "#ffffff"
text: model.city
font.italic: true
font.bold: false
font.wordSpacing: 0
opacity: 0.87
font.pixelSize: 20
}
}

Text {
id: city
Rectangle {
id: gradient
z: 100
color: "transparent"
anchors.top: parent.top
anchors.left: call.right
anchors.leftMargin: 10
anchors.left: callcityrect.right
anchors.topMargin: 5
anchors.leftMargin: 0
height: city.contentHeight
width: 50
LinearGradient {
anchors.fill: parent
start: Qt.point(0,0)
end: Qt.point(gradient.width,0)
gradient: Gradient {
GradientStop { position: 0.0; color: "#555555" }
GradientStop { position: 0.5; color: "#555555" }
GradientStop { position: 1.0; color: "transparent" }
}
}
}

Text {
id: modes
z: 50
color: "#ffffff"
text: model.city
font.italic: true
text: model.mode
anchors.rightMargin: 10
font.italic: false
font.bold: false
anchors.top: parent.top
anchors.right: parent.right
anchors.topMargin: 5
font.wordSpacing: 0
opacity: 0.87
font.pixelSize: 20
}
}

Rectangle {
id: gradient
z: 100
color: "transparent"
anchors.top: parent.top
anchors.left: callcityrect.right
anchors.topMargin: 5
anchors.leftMargin: 0
height: city.contentHeight
width: 50
LinearGradient {
anchors.fill: parent
start: Qt.point(0,0)
end: Qt.point(gradient.width,0)
gradient: Gradient {
GradientStop { position: 0.0; color: "#555555" }
GradientStop { position: 0.5; color: "#555555" }
GradientStop { position: 1.0; color: "transparent" }
}
}
}
Text {
id: freq
text: model.freq + " MHz"
anchors.left: parent.left
anchors.leftMargin: 5
anchors.top: parent.top
anchors.topMargin:30
anchors.verticalCenter: parent.verticalCenter
color: "white"
opacity: 0.87

Text {
id: modes
z: 50
color: "#ffffff"
text: model.mode
anchors.rightMargin: 10
font.italic: false
font.bold: false
anchors.top: parent.top
anchors.right: parent.right
anchors.topMargin: 5
font.wordSpacing: 0
opacity: 0.87
font.pixelSize: 20
}
}

Text {
id: freq
text: model.freq + " MHz"
anchors.left: parent.left
anchors.leftMargin: 5
anchors.top: parent.top
anchors.topMargin:30
anchors.verticalCenter: parent.verticalCenter
color: "white"
opacity: 0.87
Text {
id: shift
text: model.shif + " MHz"
anchors.top: parent.top
anchors.topMargin: 30
anchors.left: freq.right
anchors.leftMargin: 10
color: "white"
opacity: 0.87
}

}
Text {
id: tone
text: model.tone + (model.tone !== "" ? " Hz" : "")
anchors.top: parent.top
anchors.topMargin: 30
anchors.left: shift.right
anchors.leftMargin: 10
color: "white"
opacity: 0.87
}

Text {
id: shift
text: model.shif + " MHz"
anchors.top: parent.top
anchors.topMargin: 30
anchors.left: freq.right
anchors.leftMargin: 10
color: "white"
opacity: 0.87
}
Text {
id: dist
text: Number(model.dist).toFixed(2) + " km"
anchors.top: parent.top
anchors.topMargin: 30
anchors.right: parent.right
anchors.rightMargin: 10
color: "white"
opacity: 0.87
}

Text {
id: tone
text: model.tone + (model.tone !== "" ? " Hz" : "")
anchors.top: parent.top
anchors.topMargin: 30
anchors.left: shift.right
anchors.leftMargin: 10
color: "white"
opacity: 0.87
}

Text {
id: dist
text: Number(model.dist).toFixed(2) + " km"
anchors.top: parent.top
anchors.topMargin: 30
anchors.right: parent.right
anchors.rightMargin: 10
color: "white"
opacity: 0.87
}
}
}
onClicked: {
swipe.close()

swipe.right: Rectangle {
width: 50
height: 50
anchors.right: parent.right
anchors.rightMargin: 0
clip: true
color: Material.color(Material.BlueGrey)
MouseArea {
id: edit
anchors.fill: parent

Text {
font.family: fontAwesome.name
text: "\uf055"
font.pixelSize: Qt.application.font.pixelSize * 1.6
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
color: "#ffffff"
opacity: 0.87
}

onClicked: {
swipe.close()
var strippedMode = ""

var strippedMode = ""
if(mode.includes("FM")) {
strippedMode = "FM";
} else if(mode.includes("DMR")) {
strippedMode = "DMR";
} else if(mode.includes("Wires")) {
strippedMode = "C4FM";
} else if(mode.includes("D-Star")) {
strippedMode = "DSTAR";
}

if(mode.includes("FM")) {
strippedMode = "FM";
} else if(mode.includes("DMR")) {
strippedMode = "DMR";
} else if(mode.includes("Wires")) {
strippedMode = "C4FM";
} else if(mode.includes("D-Star")) {
strippedMode = "DSTAR";
stackView.push("QSOViewWrapper.qml", {
"addQSO" : true,
"liveQSO" : true,
"updateQSO" : false,
"mode" : strippedMode,
"freq" : model.freq,
"sent" : "5",
"recv" : "5",
"comm" : "Via Repeater: " + model.call,
});
}

stackView.push("QSOViewWrapper.qml", {
"addQSO" : true,
"liveQSO" : true,
"updateQSO" : false,
"mode" : strippedMode,
"freq" : model.freq,
"sent" : "5",
"recv" : "5",
"comm" : "Via Repeater: " + model.call,
});
}
}
}

}
2 changes: 1 addition & 1 deletion qml/SettingsView.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ Page {
SettingsSwitch {
id: rbSwitch
icon: "\uf519"
text: qsTr("Repeater Book")
text: qsTr("Hear HAM Repeater List")
helpText: qsTr("Activate this to see repeaters near to you")
Layout.columnSpan: 2
checked: settings.rbActive
Expand Down
4 changes: 2 additions & 2 deletions src/translationmanager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ void translationManager::switchToLanguage(const QString &language)
bool success = translator->load(language);

if(success == true) { // Search for iOS:
qDebug() << "Language Switched: " << language;
qDebug() << "Language Switched iOS: " << language;
} else { // Search for Android again:
success = translator->load(":/translations/"+language+".qm");
if(success == true) {
qDebug() << "Language Switched: " << language;
qDebug() << "Language Switched Android: " << language;
} else {
qDebug() << "Language File Not Found: " << language;
}
Expand Down
Loading

0 comments on commit 1f6095d

Please sign in to comment.