Use consts if possible (#57)

ryonakano · Apr 9, 2022 · 7c277ac · 7c277ac
1 parent ba117dd
commit 7c277ac
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/meson.build b/meson.build
@@ -15,7 +15,7 @@ add_project_arguments(
 
 config_data = configuration_data()
 config_data.set_quoted('LOCALEDIR', get_option('prefix') / get_option('localedir'))
-config_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
+config_data.set_quoted('PROJECT_NAME', meson.project_name())
 config_file = configure_file(
     input: 'src' / 'Config.vala.in',
     output: '@BASENAME@',

diff --git a/src/Application.vala b/src/Application.vala
@@ -15,20 +15,20 @@ public class Application : Gtk.Application {
 
     public Application () {
         Object (
-            application_id: "com.github.ryonakano.pinit",
+            application_id: Constants.PROJECT_NAME,
             flags: ApplicationFlags.FLAGS_NONE
         );
     }
 
     construct {
         Intl.setlocale (LocaleCategory.ALL, "");
-        Intl.bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
-        Intl.bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-        Intl.textdomain (GETTEXT_PACKAGE);
+        Intl.bindtextdomain (Constants.PROJECT_NAME, Constants.LOCALEDIR);
+        Intl.bind_textdomain_codeset (Constants.PROJECT_NAME, "UTF-8");
+        Intl.textdomain (Constants.PROJECT_NAME);
     }
 
     static construct {
-        settings = new Settings ("com.github.ryonakano.pinit");
+        settings = new Settings (Constants.PROJECT_NAME);
     }
 
     protected override void activate () {

diff --git a/src/Config.vala.in b/src/Config.vala.in
@@ -1,2 +1,5 @@
-public const string GETTEXT_PACKAGE = @GETTEXT_PACKAGE@;
-public const string LOCALEDIR = @LOCALEDIR@;
+public class Constants {
+    public const string APP_NAME = "Pin It!";
+    public const string LOCALEDIR = @LOCALEDIR@;
+    public const string PROJECT_NAME = @PROJECT_NAME@;
+}
diff --git a/src/MainWindow.vala b/src/MainWindow.vala
@@ -21,7 +21,7 @@ public class MainWindow : Hdy.Window {
 
     public MainWindow () {
         Object (
-            title: "Pin It!"
+            title: Constants.APP_NAME
         );
     }
 
@@ -143,7 +143,7 @@ public class MainWindow : Hdy.Window {
     }
 
     public void show_welcome_view () {
-        header_bar.title = "Pin It!";
+        header_bar.title = Constants.APP_NAME;
         home_button.sensitive = false;
         deck.visible_child = welcome_view;
     }

diff --git a/src/Views/WelcomeView.vala b/src/Views/WelcomeView.vala
@@ -6,7 +6,7 @@
 public class WelcomeView : Granite.Widgets.Welcome {
     public WelcomeView () {
         Object (
-            title: "Pin It!",
+            title: Constants.APP_NAME,
             subtitle: _("Pin any apps into the launcher")
         );
     }