Merge branch 'similar-to-other-projects' into 'master'

Make the project more similar to other Schmiddi on Mobile projects

See merge request schmiddi-on-mobile/flare!174
This commit is contained in:
Julian Schmidhuber committed 2025-04-22 14:09:29 +00:00
commit 7465907ca9
8 files changed
+96 -127

No files matched your search

+6 -11
View File
@@ -1,6 +1,7 @@
#!/bin/sh
slug="flare"
url_slug="$slug"
app_id="de.schmidhuberj.Flare"
gitlab_project_id="37464215"
@@ -42,7 +43,7 @@ echo "> Updating CHANGELOG.md."
if ! grep -q "## \[$1\]" CHANGELOG.md; then
sed -i "s/## \[Unreleased\]/## \[Unreleased\]\n\n## \[$1\] - $date/" CHANGELOG.md
sed -r -i "s|\[Unreleased\]: https://gitlab.com/schmiddi-on-mobile/$slug/-/compare/(.*)...master|\[Unreleased\]: https://gitlab.com/schmiddi-on-mobile/$slug/-/compare/$1...master\n[$1]: https://gitlab.com/schmiddi-on-mobile/$slug/-/compare/\1...$1|" CHANGELOG.md
sed -r -i "s|\[Unreleased\]: https://gitlab.com/schmiddi-on-mobile/$url_slug/-/compare/(.*)...master|\[Unreleased\]: https://gitlab.com/schmiddi-on-mobile/$url_slug/-/compare/$1...master\n[$1]: https://gitlab.com/schmiddi-on-mobile/$url_slug/-/compare/\1...$1|" CHANGELOG.md
fi
@@ -57,17 +58,11 @@ changelog_newline=$(echo $changelog)
if ! grep -q "<release version=\"$1\"" "data/$app_id.metainfo.xml.in.in"; then
# TODO: This does not format the release notes in the metainfo nicely.
# Maybe run a formatter with the release notes?
sed -i "s|<releases>|<releases>\n <release version=\"v$1\" date=\"$date\">\n <description translate=\"no\">\n $changelog_newline\n </description>\n </release>|" "data/$app_id.metainfo.xml.in.in"
sed -i "s|<releases>|<releases>\n <release version=\"$1\" date=\"$date\">\n <description translate=\"no\">\n $changelog_newline\n </description>\n </release>|" "data/$app_id.metainfo.xml.in.in"
fi
echo "> Updating about window."
sed -i "s|release-notes: .*|release-notes: \"$changelog_newline\";|" data/resources/ui/about.blp.in
echo "> Running the application"
if command -v run 2>&1 > /dev/null; then
@@ -142,7 +137,7 @@ git push && git push --tags
echo "> Waiting for CI to finish. This will take approximately 30 minutes. You will be notified once CI is finished."
until curl -I --fail "https://gitlab.com/api/v4/projects/${gitlab_project_id}/packages/generic/$slug/$1/$slug-$1.tar.xz" &> /dev/null; do
until curl -I --fail "https://gitlab.com/api/v4/projects/${gitlab_project_id}/packages/generic/$url_slug/$1/$slug-$1.tar.xz" &> /dev/null; do
# Try again in 2 minutes
sleep 120
done
@@ -165,8 +160,8 @@ done
echo "> Detected open Flatpak PR to monitor: $pr_number. Depending on the current Flathub buildbot usage, the build can take a long time to complete. You will be notified once the build succeeds."
comments=$(curl "https://api.github.com/repos/flathub/$app_id/issues/$pr_number/comments" 2> /dev/null)
while ! echo "$comments" | grep "Build.*successful" &> /dev/null; do
if echo "$comments" | grep "Build.*failed" &> /dev/null; then
while ! echo "$comments" | grep "build.*succeeded" &> /dev/null; do
if echo "$comments" | grep "build.*failed" &> /dev/null; then
notify-send "Flathub build failed" "Please resolve manually."
echo "! Flathub build failed. Please resolve manually."
exit 1
+60 -60
View File
@@ -38,22 +38,22 @@
</description>
<releases>
<release version="v0.15.16" date="2025-04-09">
<release version="0.15.16" date="2025-04-09">
<description translate="no">
<p>Fixed</p> <ul> <li>Images as attachments being cut off in messages.</li> </ul>
</description>
</release>
<release version="v0.15.15" date="2025-04-01">
<release version="0.15.15" date="2025-04-01">
<description translate="no">
<p>Fixed</p> <ul> <li>Some channel names not displaying in the header bar, for example due to an ascii heart.</li> <li>Images sent not being downloadable for other people.</li> </ul>
</description>
</release>
<release version="v0.15.14" date="2025-03-09">
<release version="0.15.14" date="2025-03-09">
<description translate="no">
<p>Fixed</p> <ul> <li>Ignore one more networking-related error.</li> <li>Don't stop receiving messages after an error occurred when receiving a message.</li> </ul>
</description>
</release>
<release version="v0.15.13" date="2025-03-06">
<release version="0.15.13" date="2025-03-06">
<description translate="no">
<p>Fixed</p>
<ul>
@@ -66,7 +66,7 @@
</ul>
</description>
</release>
<release version="v0.15.12" date="2025-02-28">
<release version="0.15.12" date="2025-02-28">
<description translate="no">
<p>Fixed</p>
<ul>
@@ -74,7 +74,7 @@
</ul>
</description>
</release>
<release version="v0.15.11" date="2025-02-26">
<release version="0.15.11" date="2025-02-26">
<description translate="no">
<p>HOTFIX</p>
<ul>
@@ -82,7 +82,7 @@
</ul>
</description>
</release>
<release version="v0.15.10" date="2025-02-26">
<release version="0.15.10" date="2025-02-26">
<description translate="no">
<p>Fixed</p>
<ul>
@@ -94,7 +94,7 @@
</ul>
</description>
</release>
<release version="v0.15.9" date="2025-02-13">
<release version="0.15.9" date="2025-02-13">
<description translate="no">
<p>Security</p>
<ul>
@@ -106,7 +106,7 @@
</ul>
</description>
</release>
<release version="v0.15.8" date="2025-01-30">
<release version="0.15.8" date="2025-01-30">
<description translate="no">
<p>HOTFIX</p>
<ul>
@@ -114,7 +114,7 @@
</ul>
</description>
</release>
<release version="v0.15.7" date="2025-01-16">
<release version="0.15.7" date="2025-01-16">
<description translate="no">
<p>HOTFIX</p>
<ul>
@@ -122,7 +122,7 @@
</ul>
</description>
</release>
<release version="v0.15.6" date="2024-11-20">
<release version="0.15.6" date="2024-11-20">
<description translate="no">
<p>Fixed</p>
<ul>
@@ -130,7 +130,7 @@
</ul>
</description>
</release>
<release version="v0.15.5" date="2024-11-11">
<release version="0.15.5" date="2024-11-11">
<description translate="no">
<p>Chores</p>
<ul>
@@ -138,7 +138,7 @@
</ul>
</description>
</release>
<release version="v0.15.4" date="2024-11-02">
<release version="0.15.4" date="2024-11-02">
<description translate="no">
<p>Changed</p>
<ul>
@@ -152,7 +152,7 @@
</ul>
</description>
</release>
<release version="v0.15.3" date="2024-10-07">
<release version="0.15.3" date="2024-10-07">
<description translate="no">
<p>Chores</p>
<ul>
@@ -162,7 +162,7 @@
</ul>
</description>
</release>
<release version="v0.15.2" date="2024-09-26">
<release version="0.15.2" date="2024-09-26">
<description translate="no">
<p>HOTFIX</p>
<ul>
@@ -174,7 +174,7 @@
</ul>
</description>
</release>
<release version="v0.15.1" date="2024-09-13">
<release version="0.15.1" date="2024-09-13">
<description translate="no">
<p>Chores</p>
<ul>
@@ -192,7 +192,7 @@
</ul>
</description>
</release>
<release version="v0.15.0" date="2024-07-22">
<release version="0.15.0" date="2024-07-22">
<description translate="no">
<p>HOTFIX</p>
<ul>
@@ -211,7 +211,7 @@
</ul>
</description>
</release>
<release version="v0.14.3" date="2024-04-20">
<release version="0.14.3" date="2024-04-20">
<description translate="no">
<p>Fixes</p>
<ul>
@@ -220,7 +220,7 @@
</ul>
</description>
</release>
<release version="v0.14.2" date="2024-04-02">
<release version="0.14.2" date="2024-04-02">
<description translate="no">
<p>Added</p>
<ul>
@@ -239,7 +239,7 @@
</ul>
</description>
</release>
<release version="v0.14.1" date="2024-03-22">
<release version="0.14.1" date="2024-03-22">
<description translate="no">
<p>Added</p>
<ul>
@@ -247,7 +247,7 @@
</ul>
</description>
</release>
<release version="v0.14.0" date="2024-03-20">
<release version="0.14.0" date="2024-03-20">
<description translate="no">
<p>HOTFIX</p>
<ul>
@@ -267,7 +267,7 @@
</ul>
</description>
</release>
<release version="v0.13.0" date="2024-02-25">
<release version="0.13.0" date="2024-02-25">
<description translate="no">
<p>Added</p>
<ul>
@@ -280,7 +280,7 @@
</ul>
</description>
</release>
<release version="v0.12.0" date="2024-02-11">
<release version="0.12.0" date="2024-02-11">
<description translate="no">
<p>Added</p>
<ul>
@@ -301,7 +301,7 @@
</ul>
</description>
</release>
<release version="v0.11.2" date="2024-01-04">
<release version="0.11.2" date="2024-01-04">
<description translate="no">
<p>HOTFIX</p>
<ul>
@@ -313,7 +313,7 @@
</ul>
</description>
</release>
<release version="v0.11.1" date="2023-12-30">
<release version="0.11.1" date="2023-12-30">
<description translate="no">
<p>Fixed</p>
<ul>
@@ -325,7 +325,7 @@
</ul>
</description>
</release>
<release version="v0.11.0" date="2023-12-25">
<release version="0.11.0" date="2023-12-25">
<description translate="no">
<p>HOTFIX</p>
<ul>
@@ -356,7 +356,7 @@
</ul>
</description>
</release>
<release version="v0.10.0" date="2023-08-28">
<release version="0.10.0" date="2023-08-28">
<description translate="no">
<p>Added</p>
<ul>
@@ -376,7 +376,7 @@
</ul>
</description>
</release>
<release version="v0.9.3" date="2023-08-17">
<release version="0.9.3" date="2023-08-17">
<description translate="no">
<p>Added</p>
<ul>
@@ -388,7 +388,7 @@
</ul>
</description>
</release>
<release version="v0.9.2" date="2023-08-09">
<release version="0.9.2" date="2023-08-09">
<description translate="no">
<p>HOTFIX</p>
<ul>
@@ -400,7 +400,7 @@
</ul>
</description>
</release>
<release version="v0.9.1" date="2023-08-02">
<release version="0.9.1" date="2023-08-02">
<description translate="no">
<p>Added</p>
<ul>
@@ -424,7 +424,7 @@
</ul>
</description>
</release>
<release version="v0.9.0" date="2023-07-10">
<release version="0.9.0" date="2023-07-10">
<description translate="no">
<p>Changed</p>
<ul>
@@ -443,7 +443,7 @@
</ul>
</description>
</release>
<release version="v0.8.2" date="2023-05-29">
<release version="0.8.2" date="2023-05-29">
<description translate="no">
<p>Added</p>
<ul>
@@ -459,7 +459,7 @@
</ul>
</description>
</release>
<release version="v0.8.1" date="2023-05-07">
<release version="0.8.1" date="2023-05-07">
<description translate="no">
<p>Added</p>
<ul>
@@ -474,7 +474,7 @@
</ul>
</description>
</release>
<release version="v0.8.0" date="2023-05-03">
<release version="0.8.0" date="2023-05-03">
<description translate="no">
<p>Changed</p>
<ul>
@@ -491,7 +491,7 @@
</ul>
</description>
</release>
<release version="v0.7.2" date="2023-04-08">
<release version="0.7.2" date="2023-04-08">
<description translate="no">
<p>Added</p>
<ul>
@@ -504,7 +504,7 @@
</ul>
</description>
</release>
<release version="v0.7.1" date="2023-04-01">
<release version="0.7.1" date="2023-04-01">
<description translate="no">
<p>HOTFIX</p>
<ul>
@@ -512,7 +512,7 @@
</ul>
</description>
</release>
<release version="v0.7.0" date="2023-03-29">
<release version="0.7.0" date="2023-03-29">
<description translate="no">
<p>BREAKING</p>
<ul>
@@ -543,7 +543,7 @@
</ul>
</description>
</release>
<release version="v0.6.0" date="2023-01-13">
<release version="0.6.0" date="2023-01-13">
<description translate="no">
<p>Added</p>
<ul>
@@ -556,7 +556,7 @@
</ul>
</description>
</release>
<release version="v0.5.7" date="2022-12-17">
<release version="0.5.7" date="2022-12-17">
<description translate="no">
<p>Fixed</p>
<ul>
@@ -565,7 +565,7 @@
</ul>
</description>
</release>
<release version="v0.5.6" date="2022-12-03">
<release version="0.5.6" date="2022-12-03">
<description translate="no">
<p>Fixed</p>
<ul>
@@ -575,7 +575,7 @@
</ul>
</description>
</release>
<release version="v0.5.5" date="2022-11-16">
<release version="0.5.5" date="2022-11-16">
<description translate="no">
<p>HOTFIX</p>
<ul>
@@ -583,7 +583,7 @@
</ul>
</description>
</release>
<release version="v0.5.4" date="2022-11-15">
<release version="0.5.4" date="2022-11-15">
<description translate="no">
<p>Changed</p>
<ul>
@@ -598,7 +598,7 @@
</ul>
</description>
</release>
<release version="v0.5.3" date="2022-10-27">
<release version="0.5.3" date="2022-10-27">
<description translate="no">
<p>HOTFIX:</p>
<ul>
@@ -606,7 +606,7 @@
</ul>
</description>
</release>
<release version="v0.5.2" date="2022-10-16">
<release version="0.5.2" date="2022-10-16">
<description translate="no">
<p>Added:</p>
<ul>
@@ -625,7 +625,7 @@
</ul>
</description>
</release>
<release version="v0.5.1" date="2022-10-10">
<release version="0.5.1" date="2022-10-10">
<description translate="no">
<p>Added:</p>
<ul>
@@ -646,7 +646,7 @@
</ul>
</description>
</release>
<release version="v0.5.0" date="2022-10-05">
<release version="0.5.0" date="2022-10-05">
<description translate="no">
<p>Added:</p>
<ul>
@@ -672,7 +672,7 @@
</ul>
</description>
</release>
<release version="v0.4.1" date="2022-09-20">
<release version="0.4.1" date="2022-09-20">
<description translate="no">
<p>Added:</p>
<ul>
@@ -687,7 +687,7 @@
</ul>
</description>
</release>
<release version="v0.4.0" date="2022-09-16">
<release version="0.4.0" date="2022-09-16">
<description translate="no">
<p>Added:</p>
<ul>
@@ -703,7 +703,7 @@
</ul>
</description>
</release>
<release version="v0.3.3" date="2022-09-05">
<release version="0.3.3" date="2022-09-05">
<description translate="no">
<p>Added:</p>
<ul>
@@ -720,57 +720,57 @@
</ul>
</description>
</release>
<release version="v0.3.2" date="2022-08-30">
<release version="0.3.2" date="2022-08-30">
<description translate="no">
<p>Hotfix for crash without libsecret set up.</p>
</description>
</release>
<release version="v0.3.1" date="2022-08-25">
<release version="0.3.1" date="2022-08-25">
<description translate="no">
<p>Fix gschema not being installed.</p>
</description>
</release>
<release version="v0.3.0" date="2022-08-25">
<release version="0.3.0" date="2022-08-25">
<description translate="no">
<p>Implemented device name for linking, added support for video attachment, configurable lazy-load attachments, bug fixes.</p>
</description>
</release>
<release version="v0.2.1" date="2022-08-15">
<release version="0.2.1" date="2022-08-15">
<description translate="no">
<p>Hotfix for not beeing able to link and unlink the device.</p>
</description>
</release>
<release version="v0.2.0" date="2022-08-07">
<release version="0.2.0" date="2022-08-07">
<description translate="no">
<p>UI updates, more translations, bug fixing.</p>
</description>
</release>
<release version="v0.1.5" date="2022-07-23">
<release version="0.1.5" date="2022-07-23">
<description translate="no">
<p>Added ability to upload and download attachments, added ability to remove reply and attachments before sending, fixed some bugs mainly regarding reply messages.</p>
</description>
</release>
<release version="v0.1.4" date="2022-07-16">
<release version="0.1.4" date="2022-07-16">
<description translate="no">
<p>Fixed many bugs, including wrong association for messages to channels, wrongly displayed channel names as "Note to self" and a few crashes.</p>
</description>
</release>
<release version="v0.1.3" date="2022-07-10">
<release version="0.1.3" date="2022-07-10">
<description translate="no">
<p>Fix message receiving, sending attachments.</p>
</description>
</release>
<release version="v0.1.2" date="2022-07-08">
<release version="0.1.2" date="2022-07-08">
<description translate="no">
<p>Bug fixing, error handling, russian and german translation, small UI updates.</p>
</description>
</release>
<release version="v0.1.1" date="2022-07-05">
<release version="0.1.1" date="2022-07-05">
<description translate="no">
<p>Small UI changes, change of license.</p>
</description>
</release>
<release version="v0.1.0" date="2022-06-20">
<release version="0.1.0" date="2022-06-20">
<description translate="no">
<p>Initial Release.</p>
</description>
+2 -1
View File
@@ -1,5 +1,4 @@
subdir('icons')
subdir('resources')
# Desktop file
desktop_conf = configuration_data()
@@ -66,3 +65,5 @@ install_data(
# Compile schemas
settings_schemas = [ '@[email protected]'.format(base_id) ]
gnome.compile_schemas(depend_files: files(settings_schemas))
subdir('resources')
+9 -6
View File
@@ -1,9 +1,6 @@
subdir('ui')
# Blueprint
blueprints = custom_target('blueprints',
input: files(
'ui/about.blp',
'ui/attachment.blp',
'ui/call_message_item.blp',
'ui/channel_messages.blp',
@@ -41,11 +38,17 @@ blueprints = custom_target('blueprints',
)
# Resources
resources_conf = configuration_data()
resources_conf.set('app-id', application_id)
resources = gnome.compile_resources(
'resources',
'resources.gresource.xml',
configure_file(
input: 'resources.gresource.xml.in',
output: '@BASENAME@',
configuration: resources_conf,
),
gresource_bundle: true,
install: false,
install: true,
install_dir: pkgdatadir,
dependencies: blueprints,
dependencies: [ appdata, blueprints ],
)
@@ -17,7 +17,6 @@
<file preprocess="xml-stripblanks">ui/preferences_window.ui</file>
<file preprocess="xml-stripblanks">ui/shortcuts.ui</file>
<file preprocess="xml-stripblanks">ui/text_entry.ui</file>
<file preprocess="xml-stripblanks">ui/about.ui</file>
<file preprocess="xml-stripblanks">ui/dialog_unlink.ui</file>
<file preprocess="xml-stripblanks">ui/dialog_clear_messages.ui</file>
<file preprocess="xml-stripblanks">ui/call_message_item.ui</file>
@@ -41,6 +40,7 @@
<file compressed="true">style.css</file>
<file compressed="true">style-dark.css</file>
<file compressed="true">style-hc.css</file>
<file preprocess="xml-stripblanks">@[email protected]</file>
<file preprocess="xml-stripblanks">icons/scalable/status/view-more-horizontal-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/scalable/status/phonelink2-symbolic.svg</file>
-18
View File
@@ -1,18 +0,0 @@
using Gtk 4.0;
using Adw 1;
Adw.AboutDialog about {
application-icon: "icon";
application-name: "Flare";
version: "@VERSION@";
comments: "Chat with your friends on Signal";
issue-url: "https://gitlab.com/schmiddi-on-mobile/flare/-/issues";
support-url: "https://matrix.to/#/%23flare-signal:matrix.org";
website: "https://mobile.schmidhuberj.de/flare";
developer-name: "Julian Schmidhuber";
translator-credits: _("translator-credits");
// TODO: string[] is not supported by Blueprint, so artists need to be hardcoded
copyright: "© 2022 Julian Schmidhuber";
license-type: agpl_3_0_only;
release-notes: "<p>Fixed</p> <ul> <li>Images as attachments being cut off in messages.</li> </ul>";
}
-19
View File
@@ -1,19 +0,0 @@
global_conf = configuration_data()
global_conf.set('APP_ID', application_id)
global_conf.set('PKGDATADIR', pkgdatadir)
global_conf.set('PROFILE', profile)
global_conf.set('VERSION', version + version_suffix)
global_conf.set('GETTEXT_PACKAGE', gettext_package)
global_conf.set('LOCALEDIR', localedir)
global_conf.set('BUILD_DIR', meson.project_build_root())
config = configure_file(
input: 'about.blp.in',
output: 'about.blp',
configuration: global_conf
)
run_command(
'cp',
meson.project_build_root() / 'data' / 'resources' / 'ui' / 'about.blp',
meson.project_source_root() / 'data' / 'resources' / 'ui' / 'about.blp',
check: true
)
+18 -11
View File
@@ -75,10 +75,10 @@ impl Window {
}
pub mod imp {
use crate::prelude::*;
use crate::{config, prelude::*};
use std::{env, path::PathBuf};
use adw::{AboutDialog, AlertDialog, EntryRow, ResponseAppearance};
use adw::{AlertDialog, EntryRow, ResponseAppearance};
use gio::{Cancellable, Settings, SimpleAction, SimpleActionGroup};
use glib::subclass::InitializingObject;
use glib::{BindingFlags, BoxedAnyObject, Propagation};
@@ -352,17 +352,24 @@ pub mod imp {
log::trace!("Setting up about-page action");
let action_about = SimpleAction::new("about", None);
action_about.connect_activate(clone!(
#[weak]
#[weak(rename_to = window)]
obj,
move |_, _| {
let builder = Builder::from_resource("/ui/about.ui");
let about: AboutDialog = builder
.object("about")
.expect("about.ui to have at least one object about");
// TODO: Replace this in Blueprint when string[] is supported
about.set_artists(&["David Lapshin <[email protected]>"]);
about.add_link("GitLab", "https://gitlab.com/schmiddi-on-mobile/flare");
about.present(Some(&obj));
let about_dialog = adw::AboutDialog::from_appdata(
&(config::RESOURCES_PATH.to_owned() + config::APP_ID + ".metainfo.xml"),
Some(env!("CARGO_PKG_VERSION")),
);
about_dialog.set_comments(env!("CARGO_PKG_DESCRIPTION"));
about_dialog.set_developers(
&(env!("CARGO_PKG_AUTHORS").split(':').collect::<Vec<&str>>()),
);
// translators: One per line: How you want to be credited as a, e.g. by the name you use, and optionally an email address ("Edgar Allan Poe <[email protected]>")
about_dialog.set_translator_credits(&gettextrs::gettext("translator-credits"));
about_dialog.set_artists(&["David Lapshin <[email protected]>"]);
about_dialog.add_link("GitLab", "https://gitlab.com/schmiddi-on-mobile/flare");
about_dialog.present(Some(&window));
}
));