lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-29 19:23:40 +02:00
Code Activity

donation: update campaign dates

Browse source 
Change-Id: Idc8b568234270f897936e60453e22a66d6d8624d
This commit is contained in:
Sébastien Blin 2023-11-28 10:58:42 -05:00
parent b7c3f3b553
commit dc7c366afa
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/app/appsettingsmanager.h
View file

@ -99,9 +99,9 @@ extern const QString defaultDownloadPath;
X(ShowMardownOption, false) \ X(ShowMardownOption, false) \
X(ChatViewEnterIsNewLine, false) \ X(ChatViewEnterIsNewLine, false) \
X(ShowSendOption, false) \ X(ShowSendOption, false) \
X(DonationVisibleDate, "2023-11-01 05:00") \ X(Donation2023VisibleDate, "2023-11-27 05:00") \
X(IsDonationVisible, true) \ X(IsDonationVisible, true) \
X(DonationEndDate, "2024-01-01 00:00") \ X(Donation2023EndDate, "2024-01-31 00:00") \
X(EnablePtt, false) \ X(EnablePtt, false) \
X(pttKey, 36) X(pttKey, 36)
#endif #endif

6
src/app/constant/JamiQmlUtils.qml
View file

@ -75,8 +75,8 @@ Item {
// The banner is visible if the current date is after the date set in the settings and before the end date // The banner is visible if the current date is after the date set in the settings and before the end date
// And if the donation toggle is checked // And if the donation toggle is checked
var isDonationVisible = UtilsAdapter.getAppValue(Settings.Key.IsDonationVisible); var isDonationVisible = UtilsAdapter.getAppValue(Settings.Key.IsDonationVisible);
var endDonationDate = new Date(Date.parse(UtilsAdapter.getAppValue(Settings.Key.DonationEndDate))); var endDonationDate = new Date(Date.parse(UtilsAdapter.getAppValue(Settings.Key.Donation2023EndDate)));
var donationVisibleDate = new Date(Date.parse(UtilsAdapter.getAppValue(Settings.Key.DonationVisibleDate))); var donationVisibleDate = new Date(Date.parse(UtilsAdapter.getAppValue(Settings.Key.Donation2023VisibleDate)));
return new Date() < endDonationDate && new Date() > donationVisibleDate && isDonationVisible && false; return new Date() < endDonationDate && new Date() > donationVisibleDate && isDonationVisible;
} }
} }

2
src/app/constant/JamiStrings.qml
View file

@ -853,7 +853,7 @@ Item {
property string zoomLevel: qsTr("Text zoom level") property string zoomLevel: qsTr("Text zoom level")
//Donation campaign //Donation campaign
property string donationTipBoxText: qsTr("Free and private sharing. <a href=\"https://jami.net/donate/\">Donate</a> to expand it.") property string donationTipBoxText: qsTr("Free and private sharing. <a href=\"https://jami.net/whydonate/\">Donate</a> to expand it.")
property string donation: qsTr("Donate") property string donation: qsTr("Donate")
property string donationText: qsTr("If you enjoy using Jami and believe in our mission, would you make a donation?") property string donationText: qsTr("If you enjoy using Jami and believe in our mission, would you make a donation?")
property string notNow: qsTr("Not now") property string notNow: qsTr("Not now")

2
src/app/constant/JamiTheme.qml
View file

@ -681,7 +681,7 @@ Item {
// Donation campaign // Donation campaign
property color donationButtonTextColor: "#005699" property color donationButtonTextColor: "#005699"
property color donationBackgroundColor: "#D5E4EF" property color donationBackgroundColor: "#D5E4EF"
property string donationUrl: "https://jami.net/donate/" property string donationUrl: "https://jami.net/whydonate/"
//Connection monitoring //Connection monitoring
property color connectionMonitoringTableColor1: darkTheme ? "#4D4D4D" : "#f0efef" property color connectionMonitoringTableColor1: darkTheme ? "#4D4D4D" : "#f0efef"

2
src/app/tipsmodel.cpp
View file

@ -77,7 +77,7 @@ TipsModel::reset()
#ifndef APPSTORE #ifndef APPSTORE
QDate date = QDate::currentDate(); QDate date = QDate::currentDate();
if (date >= QDate::fromString("2023-11-01", "yyyy-MM-dd") && false) { if (date >= QDate::fromString("2023-11-27", "yyyy-MM-dd")) {
tips_.append({{"id", "14"}, {"title", tr("Donate")}, {"desc", ""}, {"type", "donation"}}); tips_.append({{"id", "14"}, {"title", tr("Donate")}, {"desc", ""}, {"type", "donation"}});
} }
#endif #endif