Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/GeopJr/Tuba into feat/cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@GeopJr
GeopJr committed Aug 8, 2023
2 parents dabbf74 + 0d39caa commit 4c77edd
Show file tree
Hide file tree
Showing 53 changed files with 1,949 additions and 981 deletions.
3 changes: 3 additions & 0 deletions data/dev.geopjr.Tuba.gschema.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@
<key name="media-viewer-expand-pictures" type="b">
<default>true</default>
</key>
<key name="enlarge-custom-emojis" type="b">
<default>false</default>
</key>

<key name="window-x" type="i">
<default>-1</default>
Expand Down
18 changes: 18 additions & 0 deletions data/dev.geopjr.Tuba.metainfo.xml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,24 @@
<control>touch</control>
</recommends>
<releases>
<release version="0.4.1" date="2023-08-05">
<description translatable="no">
<ul>
<li>Fixed News' discussed label not being aligned properly</li>
<li>Fixed some strings being untranslatable</li>
<li>Fixed sidebar having horizontal overflow in some languages</li>
<li>Fixed custom emoji chooser not getting dismissed on Esc</li>
<li>Added showing error dialogs when composer fails</li>
<li>Fixed work-in-background setting not being able to be saved</li>
<li>Reverted the media viewer background color change</li>
<li>Fixed volume on videos not matching the actual value</li>
<li>Fixed videos playing even when not visible</li>
<li>Fixed custom emoji picker not listing emojis alphabetically</li>
<li>Fixed custom emoji picker button being visible even if there are no emojis</li>
<li>Read the full changelog on the repo</li>
</ul>
</description>
</release>
<release version="0.4.0" date="2023-07-19">
<description translatable="no">
<ul>
Expand Down
3 changes: 3 additions & 0 deletions data/gresource.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@
<file preprocess="xml-stripblanks">icons/scalable/actions/tuba-text-justify-left-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/scalable/actions/tuba-cat-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/scalable/actions/tuba-brain-augemnted-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/scalable/actions/tuba-lightbulb-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/scalable/actions/tuba-important-small-symbolic.svg</file>
<!-- <file preprocess="xml-stripblanks">icons/scalable/actions/tuba-language-symbolic.svg</file> -->

<file>gtk/help-overlay.ui</file>
Expand All @@ -79,6 +81,7 @@
<file>ui/views/sidebar/account.ui</file>
<file>ui/views/sidebar/item.ui</file>
<file>ui/widgets/bookwyrmpage.ui</file>
<file>ui/widgets/announcement.ui</file>
<file>ui/widgets/status.ui</file>
<file>ui/widgets/votebox.ui</file>
<file>ui/dialogs/new_account.ui</file>
Expand Down
2 changes: 2 additions & 0 deletions data/icons/scalable/actions/tuba-important-small-symbolic.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions data/icons/scalable/actions/tuba-lightbulb-symbolic.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 36 additions & 0 deletions data/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,33 @@ flowboxchild {
}

/* Status action icons */
@keyframes rotate_star {
from { -gtk-icon-transform: rotate(-72deg); }
to {}
}

@keyframes bounce {
0% { -gtk-icon-transform: translateY(-3px); }
50% { -gtk-icon-transform: translateY(3px); }
100% {}
}

@keyframes rotate_half {
from { -gtk-icon-transform: rotate(-180deg); }
to {}
}

.ttl-status-action-reblog.enabled image {
animation: rotate_half 0.4s ease;
}

.ttl-status-action-bookmark.enabled image {
animation: bounce 0.4s ease;
}

.ttl-status-action-star.enabled image {
animation: rotate_star 0.4s ease;
}

.ttl-status-action-star:hover,
.ttl-status-action-star.enabled {
Expand Down Expand Up @@ -234,6 +261,11 @@ flowboxchild {
background: alpha(@success_bg_color, 0.1);
}

.media-viewer-headerbar {
background: rgba(0, 0, 0, .7);
color: white;
}

.ttl-status-heading {
font-size: 13px;
}
Expand Down Expand Up @@ -463,3 +495,7 @@ video > overlay > revealer > controls {
border-radius: 100%;
padding: 3px;
}

.attention {
color: @yellow_4;
}
11 changes: 11 additions & 0 deletions data/ui/dialogs/preferences.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,17 @@
</child>
</object>
</child>
<child>
<object class="AdwActionRow">
<property name="title" translatable="yes">Enlarge custom emojis</property>
<property name="activatable_widget">enlarge_custom_emojis</property>
<child>
<object class="GtkSwitch" id="enlarge_custom_emojis">
<property name="valign">center</property>
</object>
</child>
</object>
</child>
<child>
<object class="AdwActionRow">
<property name="title" translatable="yes">Scale up custom emojis on hover</property>
Expand Down
3 changes: 2 additions & 1 deletion data/ui/dialogs/profile_edit.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,12 @@
<!-- translators: profile bio or description -->
<property name="title" translatable="yes">Bio</property>
<child type="action">
<object class="GtkMenuButton">
<object class="GtkMenuButton" id="cepbtn">
<property name="sensitive" bind-source="bio_row" bind-property="expanded" bind-flags="sync-create"/>
<style>
<class name="circular"/>
</style>
<property name="visible">0</property>
<property name="popover">custom_emoji_picker</property>
<property name="valign">center</property>
<property name="halign">center</property>
Expand Down
154 changes: 154 additions & 0 deletions data/ui/widgets/announcement.ui
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0" />
<template class="TubaWidgetsAnnouncement" parent="GtkListBoxRow">
<property name="child">
<object class="GtkBox">
<property name="margin-start">18</property>
<property name="margin-end">18</property>
<property name="margin_top">15</property>
<property name="margin_bottom">18</property>
<property name="hexpand">1</property>
<property name="orientation">horizontal</property>
<property name="spacing">14</property>
<child>
<object class="GtkBox">
<property name="orientation">vertical</property>
<child>
<object class="AdwAvatar" id="avatar">
<property name="size">48</property>
<property name="valign">start</property>
<property name="visible">true</property>
</object>
</child>
</object>
</child>
<child>
<object class="GtkBox">
<property name="orientation">vertical</property>
<child>
<object class="GtkBox">
<property name="vexpand">1</property>
<property name="spacing">6</property>
<property name="valign">start</property>
<child>
<object class="GtkFlowBox">
<property name="selection-mode">none</property>
<property name="column_spacing">6</property>
<!-- Lower values leave space between items -->
<property name="max_children_per_line">100</property>
<child>
<object class="GtkFlowBoxChild">
<property name="focusable">0</property>
<child>
<object class="TubaWidgetsRichLabel" id="name_label">
<property name="visible">True</property>
<property name="ellipsize">False</property>
<property name="use-markup">False</property>
<property name="smaller-emoji-pixel-size">True</property>
<style>
<class name="font-bold" />
<class name="ttl-name-button" />
</style>
</object>
</child>
</object>
</child>
<child>
<object class="GtkFlowBoxChild">
<property name="can-target">0</property>
<child>
<object class="GtkLabel" id="handle_label">
<property name="label" translatable="no">Handle</property>
<property name="ellipsize">end</property>
<property name="single_line_mode">1</property>
<property name="xalign">0</property>
<property name="hexpand">1</property>
<style>
<class name="body" />
<class name="dim-label" />
</style>
</object>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkBox">
<property name="halign">end</property>
<property name="valign">center</property>
<property name="margin_start">6</property>
<property name="spacing">3</property>
<child>
<object class="GtkImage" id="attention_indicator">
<property name="visible">0</property>
<property name="icon_name">tuba-important-small-symbolic</property>
<property name="icon_size">1</property>
<property name="tooltip_text" translatable="yes">Unread</property>
<style>
<class name="attention" />
</style>
</object>
</child>
<child>
<object class="GtkImage" id="edited_indicator">
<property name="visible">0</property>
<property name="icon_name">tuba-paper-small-symbolic</property>
<property name="icon_size">1</property>
<property name="tooltip_text" translatable="yes">Edited</property>
<style>
<class name="dim-label" />
</style>
</object>
</child>
<child>
<object class="GtkLabel" id="date_label">
<property name="label" translatable="no">Yesterday</property>
<property name="xalign">0</property>
<style>
<class name="body" />
<class name="dim-label" />
</style>
</object>
</child>
</object>
</child>
</object>
</child>

<child>
<object class="GtkBox">
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<style>
<class name="ttl-status-content" />
</style>
<child>
<object class="TubaWidgetsMarkupView" id="content">
<property name="visible">True</property>
<property name="hexpand">False</property>
</object>
</child>
</object>
</child>

<child>
<object class="GtkFlowBox" id="emoji_reactions">
<property name="margin-top">16</property>
<property name="visible">0</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<!-- Lower values leave space between items -->
<property name="max_children_per_line">100</property>
</object>
</child>
</object>
</child>
</object>
</property>
<style>
<class name="ttl-post" />
</style>
</template>
</interface>
7 changes: 6 additions & 1 deletion meson.build
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
project(
'dev.geopjr.Tuba',
['c', 'vala'],
version: '0.4.0',
version: '0.4.1',
meson_version: '>= 0.56.0',
default_options: [
'warning_level=2',
'werror=false',
],
)

# https://gitlab.gnome.org/GNOME/vala/-/issues/1413#note_1707480
if meson.get_compiler ('c').get_id () == 'clang'
add_project_arguments('-Wno-incompatible-function-pointer-types', language: 'c')
endif

devel = get_option('devel')
distro = get_option('distro')

Expand Down
Loading

0 comments on commit 4c77edd

Please sign in to comment.