start working on themes

CMakeLists.txt

@@ -146,6 +146,7 @@ vala_precompile(UI ${UI_NAME}
 	src/FavIconCache.vala
 	src/FeedReader.vala
 	src/LoginInterface.vala
+  src/ArticleTheme.vala
 	src/dbUI.vala
 	src/UtilsUI.vala
 	src/Widgets/AddPopover.vala
@@ -310,3 +311,4 @@ install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/org.gnome.FeedReader.Daemon.serv
 install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/application-icons/hicolor DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons)
 install (CODE "execute_process (COMMAND gtk-update-icon-cache -t ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor)")
 install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/GrabberConfig DESTINATION ${PKGDATADIR})
+install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/ArticleView DESTINATION ${PKGDATADIR})

data/ArticleView/default/theme.json

@@ -0,0 +1,4 @@
+{
+  "name": "Default",
+  "author": "Bilal Elmoussaoui"
+}

data/ArticleView/midnight/theme.json

@@ -0,0 +1,4 @@
+{
+  "name": "Midnight",
+  "author": "Bilal Elmoussaoui"
+}

data/org.gnome.FeedReader.gresource.xml

@@ -6,11 +6,6 @@
 		<file compressed="true">gtk-css/gtk.css</file>
 		<file compressed="true">gtk-css/elementary.css</file>
 
-		<file compressed="true">ArticleView/default/style.css</file>
-		<file compressed="true">ArticleView/default/article.html</file>
-		<file compressed="true">ArticleView/midnight/style.css</file>
-		<file compressed="true">ArticleView/midnight/article.html</file>
-
 		<file preprocess="xml-stripblanks">icons/16x16/actions/feed-add-symbolic.svg</file>
 		<file preprocess="xml-stripblanks">icons/16x16/actions/feed-arrow-up-symbolic.svg</file>
 		<file preprocess="xml-stripblanks">icons/16x16/actions/feed-refresh-symbolic.svg</file>

src/ArticleTheme.vala

@@ -0,0 +1,87 @@
+using Gee;
+
+public class  FeedReader.ArticleTheme {
+    static Array<HashMap> themes = new Array<HashMap> ();
+
+    public FeedReader.ArticleTheme() {
+      // Local themes
+      string theme_dir = GLib.Environment.get_home_dir() + "/.feedreader/themes/";
+      FeedReader.ArticleTheme.themes += grabThemes(theme_dir);
+      // Global themes
+      string global_dir = Constants.INSTALL_PREFIX + "/share/ArticleView/";
+      FeedReader.ArticleTheme.themes += grabThemes(theme_dir);
+    }
+
+    private HashMap<string, string> getThemeInfo (string theme_path) {
+      """
+        Parse a theme directory, and check if it's a valid theme
+      """
+      var themeInfo = new HashMap<string, string> ();
+      bool corrupted_theme = true;
+      string theme_name = "";
+      string author = "";
+      try {
+        Dir theme_dir = Dir.open(theme_path, 0);
+        string ? name = null;
+        while ((name = theme_dir.read_name()) != null){
+          if (name == "theme.json"){
+              corrupted_theme = false;
+              string path = Path.build_filename(theme_path, name);
+              Json.Parser parser = new Json.Parser();
+              try {
+                parser.load_from_file(path);
+                Json.Object obj = parser.get_root().get_object();
+
+                Value val;
+                foreach (unowned string nname in obj.get_members()){
+                  val = obj.get_member(nname).get_value();
+                  switch(nname) {
+                    case "author":
+                      author = (string) val;
+                    break;
+                    case "name":
+                      theme_name = (string) val;
+                    break;
+                  }
+                }
+              }catch(Error err){
+                corrupted_theme = true;
+              }
+          }
+        }
+      }catch(GLib.FileError err){
+
+      }
+      if (!corrupted_theme){
+        themeInfo.set("name", theme_name);
+        themeInfo.set("author", author);
+        themeInfo.set("path", theme_path);
+      } else {
+        themeInfo.set("corrupted", "true");
+      }
+      return themeInfo;
+    }
+
+    private Array<HashMap> grabThemes(string location) {
+      """
+        Return a list of themes on a specific location (global/local)
+      """
+      Array<HashMap> themes = new Array<HashMap> ();
+      try{
+          Dir dir = Dir.open(location, 0);
+          string ? name = null;
+          while ((name = dir.read_name()) != null){
+            string path = Path.build_filename(location, name);
+            if(FileUtils.test(path, FileTest.IS_DIR)){
+              var themeInfo = getThemeInfo(path);
+              if (!"corrupted" in themeInfo.keys){
+                themes.append_val(themeInfo);
+              }
+            }
+          }
+      } catch (GLib.FileError err){
+
+      }
+      return themes;
+    }
+}

src/Utils.vala

@@ -669,4 +669,6 @@ public class FeedReader.Utils : GLib.Object {
 		if(!setting.set_string(key, val))
 			Logger.error("Utils.gsettingWriteString: writing %s %s failed".printf(setting.schema_id, key));
 	}
+
+
 }

src/Widgets/Setting.vala

@@ -55,20 +55,22 @@ public class FeedReader.SettingFont : FeedReader.Setting {
 
 public class FeedReader.ArticleThemeSetting : FeedReader.Setting {
 
-  public ArticleThemeSetting (string name, GLib.Settings settings, string key, string [] values, string ? tooltip = null){
+  public ArticleThemeSetting (string name, GLib.Settings settings, string key, Array<HashMap> themes, string ? tooltip = null){
       base (name, tooltip);
       var liststore = new Gtk.ListStore(1, typeof(string));
       int active = 0;
       bool was_found = false;
       string current_theme = settings.get_string(key);
-      foreach (string val in values){
+      foreach (HashMap theme in themes){
         Gtk.TreeIter iter;
-        if (current_theme == val.down()){
+        string theme_name = theme.get("name");
+        string path = theme.get("path");
+        if (current_theme == path){
           was_found = true;
         }
         liststore.append(out iter);
-        liststore.set(iter, 0, val);
-        liststore.set(iter, 1, val.down());
+        liststore.set(iter, 0, theme_name);
+        liststore.set(iter, 1, path);
         if(!was_found){
           active += 1;
         }

src/Widgets/SettingsDialog.vala

@@ -108,8 +108,7 @@ public class FeedReader.SettingsDialog : Gtk.Dialog {
 
 		var articleview_settings = headline(_("Article View:"));
 
-		var article_theme = new ArticleThemeSetting(_("Theme"), Settings.general(), "article-theme",
-                {_("Default"), _("Midnight")});
+		var article_theme = new ArticleThemeSetting(_("Theme"), Settings.general(), "article-theme", FeedReader.ArticleTheme.themes);
 		article_theme.changed.connect(() => {
 			ColumnView.get_default().reloadArticleView();
 		});