Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change RDNN #12

Merged
merged 11 commits into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
uses: flatpak/flatpak-github-actions/flatpak-builder@v6
with:
bundle: AppGenerator.flatpak
manifest-path: io.github.ecommunity.app-generator.yml
manifest-path: io.github.ellie_commons.app-generator.yml
run-tests: true
repository-name: appcenter
repository-url: https://flatpak.elementary.io/repo.flatpakrepo
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<h3 align="center">Create an elementary OS app using one of the pre-made app templates</h3>
</div>

![Screenshot](https://raw.githubusercontent.com/elementary-community/app-generator/refs/heads/main/data/io.github.ecommunity.app-generator.png)
![Screenshot](https://raw.githubusercontent.com/elementary-community/app-generator/refs/heads/main/data/io.github.ellie_commons.app-generator.png)
alainm23 marked this conversation as resolved.
Show resolved Hide resolved

## Building and Installation

Expand All @@ -27,23 +27,23 @@ cd build
ninja
```

To install, use `ninja install`, then execute with `io.github.ecommunity.app-generator`
To install, use `ninja install`, then execute with `io.github.ellie_commons.app-generator`

```bash
ninja install
io.github.ecommunity.app-generator
io.github.ellie_commons.app-generator
```

## Flatpak

Run `flatpak-builder` to configure the build environment, download dependencies, build, and install

```bash
flatpak-builder build io.github.ecommunity.app-generator.yml --user --install --force-clean --install-deps-from=appcenter
flatpak-builder build io.github.ellie_commons.app-generator.yml --user --install --force-clean --install-deps-from=appcenter
```

Then execute with

```bash
flatpak run io.github.ecommunity.app-generator
flatpak run io.github.ellie_commons.app-generator
```
70 changes: 36 additions & 34 deletions data/app-generator.appdata.xml.in
Original file line number Diff line number Diff line change
@@ -1,37 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop-application">
<id>io.github.ecommunity.app-generator</id>
<metadata_license>CC-BY-4.0</metadata_license>
<project_license>GPL-3.0-or-later</project_license>
<name>App Generator</name>
<summary>Create an elementary OS app using one of the pre-made app templates</summary>
<description>
<p>
App Generator streamlines the process of creating Vala and GTK projects, allowing you to quickly get started without having to configure everything from scratch. With just a few clicks, it generates a well-organized and functional project structure, optimizing your workflow and saving you from repetitive setup tasks. Perfect for developers who want to focus on coding without worrying about configuration details.
</p>
</description>
<screenshots>
<screenshot type="default">
<image>https://raw.githubusercontent.com/elementary-community/app-generator/refs/heads/main/data/io.github.ecommunity.app-generator.png</image>
</screenshot>
</screenshots>
<kudos>
<kudo>ModernToolkit</kudo>
<kudo>HiDpiIcon</kudo>
</kudos>
<developer_name translate="no">elementary Community</developer_name>
<url type="homepage">https://github.com/elementary-community/app-generator</url>
<url type="bugtracker">https://github.com/elementary-community/app-generator/issues</url>
<launchable type="desktop-id">io.github.ecommunity.app-generator.desktop</launchable>
<releases>
<release version="1.0.0" date="2024-10-08">
<description>
<p>First Release!!!</p>
</description>
</release>
</releases>
<content_rating type="oars-1.1" />
<custom>
<value key="x-appcenter-color-primary">#603461</value>
</custom>
<id>io.github.ellie_commons.app-generator</id>
<metadata_license>CC-BY-4.0</metadata_license>
<project_license>GPL-3.0-or-later</project_license>
<name>App Generator</name>
<summary>Create an elementary OS app using one of the pre-made app templates</summary>
<description>
<p>
App Generator streamlines the process of creating Vala and GTK projects, allowing you to quickly get started without having to configure everything from scratch. With just a few clicks, it generates a well-organized and functional project structure, optimizing your workflow and saving you from repetitive setup tasks. Perfect for developers who want to focus on coding without worrying about configuration details.
alainm23 marked this conversation as resolved.
Show resolved Hide resolved
</p>
</description>
<screenshots>
<screenshot type="default">
<image>https://raw.githubusercontent.com/ellie-commons/app-generator/refs/heads/main/data/io.github.ellie_commons.app-generator.png</image>
</screenshot>
</screenshots>
<kudos>
<kudo>ModernToolkit</kudo>
<kudo>HiDpiIcon</kudo>
</kudos>
<developer id="io.github.ellie_commons">
<name>elementary Commons</name>
</developer>
<url type="homepage">https://github.com/ellie-commons/app-generator</url>
<url type="bugtracker">https://github.com/ellie-commons/app-generator/issues</url>
<launchable type="desktop-id">io.github.ellie_commons.app-generator.desktop</launchable>
<releases>
<release version="1.0.0" date="2024-10-08">
<description>
<p>First Release!!!</p>
</description>
</release>
</releases>
<content_rating type="oars-1.1" />
<custom>
<value key="x-appcenter-color-primary">#603461</value>
</custom>
</component>
4 changes: 2 additions & 2 deletions data/app-generator.desktop.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ Name=App Generator
Comment=Create an elementary OS app using one of the pre-made app templates.
Categories=Development;Education;

Icon=io.github.ecommunity.app-generator
Exec=io.github.ecommunity.app-generator
Icon=io.github.ellie_commons.app-generator
Exec=io.github.ellie_commons.app-generator
Terminal=false
2 changes: 1 addition & 1 deletion data/app-generator.gresource.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/io/github/ecommunity/app-generator/">
<gresource prefix="/io/github/ellie_commons/app-generator/">
<file alias="Application.css">Application.css</file>
</gresource>
</gresources>
2 changes: 1 addition & 1 deletion data/app-generator.gschema.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<schemalist>
<schema path="/io/github/ecommunity/app-generator/" id="io.github.ecommunity.app-generator">
<schema path="/io/github/ellie_commons/app-generator/" id="io.github.ellie_commons.app-generator">
<key name="window-height" type="i">
<default>700</default>
<summary>Most recent window height</summary>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This is the same ID that you've used in meson.build and other files
app-id: io.github.ecommunity.app-generator
app-id: io.github.ellie_commons.app-generator

# Instead of manually specifying a long list of build and runtime dependencies,
# we can use a convenient pre-made runtime and SDK. For this example, we'll be
Expand All @@ -10,7 +10,7 @@ sdk: io.elementary.Sdk

# This should match the exec line in your .desktop file and usually is the same
# as your app ID
command: io.github.ecommunity.app-generator
command: io.github.ellie_commons.app-generator

# Here we can specify the kinds of permissions our app needs to run. Since we're
# not using hardware like webcams, making sound, or reading external files, we
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# project name and programming language
project(
'io.github.ecommunity.app-generator',
'io.github.ellie_commons.app-generator',
'vala', 'c',
version: '0.1'
)
Expand Down
8 changes: 4 additions & 4 deletions po/de.po
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# German translations for io.github.elementary-community.app-generator package.
# Copyright (C) 2024 THE io.github.elementary-community.app-generator'S COPYRIGHT HOLDER
# This file is distributed under the same license as the io.github.elementary-community.app-generator package.
# German translations for io.github.ellie_commons.app-generator package.
# Copyright (C) 2024 THE io.github.ellie_commons.app-generator'S COPYRIGHT HOLDER
# This file is distributed under the same license as the io.github.ellie_commons.app-generator package.
# Automatically generated, 2024.
#
msgid ""
msgstr ""
"Project-Id-Version: io.github.elementary-community.app-generator\n"
"Project-Id-Version: io.github.ellie_commons.app-generator\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-13 09:15+0300\n"
"PO-Revision-Date: 2024-09-19 11:25-0500\n"
Expand Down
8 changes: 4 additions & 4 deletions po/es.po
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Spanish translations for io.github.elementary-community.app-generator package.
# Copyright (C) 2024 THE io.github.elementary-community.app-generator'S COPYRIGHT HOLDER
# This file is distributed under the same license as the io.github.elementary-community.app-generator package.
# Spanish translations for io.github.ellie_commons.app-generator package.
# Copyright (C) 2024 THE io.github.ellie_commons.app-generator'S COPYRIGHT HOLDER
# This file is distributed under the same license as the io.github.ellie_commons.app-generator package.
# Automatically generated, 2024.
#
msgid ""
msgstr ""
"Project-Id-Version: io.github.elementary-community.app-generator\n"
"Project-Id-Version: io.github.ellie_commons.app-generator\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-13 09:15+0300\n"
"PO-Revision-Date: 2024-09-19 11:25-0500\n"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the io.github.ecommunity.app-generator package.
# This file is distributed under the same license as the io.github.ellie_commons.app-generator package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: io.github.ecommunity.app-generator\n"
"Project-Id-Version: io.github.ellie_commons.app-generator\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-13 09:15+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
Expand Down
30 changes: 15 additions & 15 deletions src/Application.vala
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ public class AppGenerator : Gtk.Application {
public MainWindow main_window;

public static AppGenerator _instance = null;
public static AppGenerator instance {
get {
if (_instance == null) {
_instance = new AppGenerator ();
}
return _instance;
}
}
public static AppGenerator instance {
get {
if (_instance == null) {
_instance = new AppGenerator ();
}
return _instance;
}
}


public AppGenerator () {
Object (
application_id: "io.github.ecommunity.app-generator",
application_id: "io.github.ellie_commons.app-generator",
flags: ApplicationFlags.FLAGS_NONE
);
}
Expand All @@ -44,9 +44,9 @@ public class AppGenerator : Gtk.Application {

protected override void activate () {
if (main_window != null) {
main_window.present ();
return;
}
main_window.present ();
return;
}

var main_window = new MainWindow (this);

Expand All @@ -55,7 +55,7 @@ public class AppGenerator : Gtk.Application {
* Set maximize after height/width else window is min size on unmaximize
* Bind maximize as SET else get get bad sizes
*/
var settings = new Settings ("io.github.ecommunity.app-generator");
var settings = new Settings ("io.github.ellie_commons.app-generator");
settings.bind ("window-height", main_window, "default-height", SettingsBindFlags.DEFAULT);
settings.bind ("window-width", main_window, "default-width", SettingsBindFlags.DEFAULT);

Expand All @@ -67,7 +67,7 @@ public class AppGenerator : Gtk.Application {

// Use Css
var provider = new Gtk.CssProvider ();
provider.load_from_resource ("/io/github/ecommunity/app-generator/Application.css");
provider.load_from_resource ("/io/github/ellie_commons/app-generator/Application.css");

Gtk.StyleContext.add_provider_for_display (
Gdk.Display.get_default (),
Expand All @@ -79,6 +79,6 @@ public class AppGenerator : Gtk.Application {

public static int main (string[] args) {
AppGenerator app = AppGenerator.instance;
return app.run (args);
return app.run (args);
}
}
2 changes: 1 addition & 1 deletion src/Config.vala.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
public const string GETTEXT_PACKAGE = @GETTEXT_PACKAGE@;
public const string LOCALEDIR = @LOCALEDIR@;
public const string REPOSITORY_TEMPLATE_URL = "https://github.com/elementary-community/elementary-app-template.git";
public const string REPOSITORY_TEMPLATE_URL = "https://github.com/ellie-commons/elementary-app-template.git";
16 changes: 8 additions & 8 deletions src/MainWindow.vala
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ public class MainWindow : Gtk.ApplicationWindow {
}

static construct {
weak Gtk.IconTheme default_theme = Gtk.IconTheme.get_for_display (Gdk.Display.get_default ());
default_theme.add_resource_path ("/io/github/ecommunity/app-generator/");
}
weak Gtk.IconTheme default_theme = Gtk.IconTheme.get_for_display (Gdk.Display.get_default ());
default_theme.add_resource_path ("/io/github/ellie_commons/app-generator/");
}

construct {
var headerbar = new Gtk.HeaderBar () {
title_widget = new Gtk.Label (null),
hexpand = true
};
title_widget = new Gtk.Label (null),
hexpand = true
};

var project_icon = new Gtk.Image.from_icon_name ("applications-development") {
pixel_size = 96
Expand Down Expand Up @@ -86,8 +86,8 @@ public class MainWindow : Gtk.ApplicationWindow {
main_box.append (form_box);

var toolbar_view = new Adw.ToolbarView ();
toolbar_view.add_top_bar (headerbar);
toolbar_view.content = main_box;
toolbar_view.add_top_bar (headerbar);
toolbar_view.content = main_box;

child = toolbar_view;

Expand Down
6 changes: 3 additions & 3 deletions src/Services/FormControl.vala
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ public class FormControl : GLib.Object {
if (value == null) {
return false;
}

foreach (Validator validator in validators) {
if (!validator.validate (value)) {
return false;
}
}

return true;
}
}
Expand Down Expand Up @@ -51,4 +51,4 @@ public class FormControl : GLib.Object {

return null;
}
}
}
4 changes: 2 additions & 2 deletions src/Services/FormGroup.vala
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class FormGroup : GLib.Object {
}

public FormGroup () {
controls = new Gee.ArrayList<FormControl>();
controls = new Gee.ArrayList<FormControl> ();
}

public void add_control (FormControl control) {
Expand All @@ -30,4 +30,4 @@ public class FormGroup : GLib.Object {
value_changed (control, new_value);
});
}
}
}
4 changes: 2 additions & 2 deletions src/Services/Validators.vala
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class Validators.Regex : Validator {
if (regex == null) {
return true;
}

return regex.match (value);
}
}
}
2 changes: 1 addition & 1 deletion src/Views/Developer.vala
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@ public class Views.Developer : Adw.Bin {
name_entry.text = "";
email_entry.text = "";
}
}
}
Loading