Fix Facebook Layout

DylanVanAssche · Apr 19, 2018 · b2d71be · b2d71be
1 parent c9c4135
commit b2d71be
Show file tree

Hide file tree

Showing 57 changed files with 18 additions and 18 deletions.
diff --git a/qml/components/ExternalWebview.qml b/qml/components/ExternalWebview.qml
diff --git a/qml/components/FBWebview.qml b/qml/components/FBWebview.qml
@@ -82,17 +82,17 @@ Item {
 
         function activate(category) {
             if(category == "sailbook-request") {
-                webview.url = "https://m.facebook.com/friends";
+                webview.url = "https://touch.facebook.com/friends";
                 app.activate();
                 console.debug("Notification activation: " + category);
             }
             else if(category == "sailbook-message") {
-                webview.url = "https://m.facebook.com/messages";
+                webview.url = "https://touch.facebook.com/messages";
                 app.activate();
                 console.debug("Notification activation: " + category);
             }
             else if(category == "sailbook-notification") {
-                webview.url = "https://m.facebook.com/notifications";
+                webview.url = "https://touch.facebook.com/notifications";
                 app.activate();
                 console.debug("Notification activation: " + category);
             }
@@ -128,7 +128,7 @@ Item {
         }
         clip: true // Enforce painting inside our defined screen
         opacity: loading || !connected? 0.0: 1.0
-        url: "https://m.facebook.com/home.php?sk=" + Util.getFeedPriority(settings.priorityFeed)
+        url: "https://touch.facebook.com/home.php?sk=" + Util.getFeedPriority(settings.priorityFeed)
         onLoadingChanged: loading? undefined: Messages.publishNotifications();
 
         // Rounding floating numbers in JS: https://stackoverflow.com/questions/9453421/how-to-round-float-numbers-in-javascript

diff --git a/qml/components/IconTextButton.qml b/qml/components/IconTextButton.qml
diff --git a/qml/components/ImagePicker.qml b/qml/components/ImagePicker.qml
diff --git a/qml/components/NavigationButton.qml b/qml/components/NavigationButton.qml
diff --git a/qml/components/PlaceholderWebview.qml b/qml/components/PlaceholderWebview.qml
diff --git a/qml/components/TextLabel.qml b/qml/components/TextLabel.qml
diff --git a/qml/cover/CoverPage.qml b/qml/cover/CoverPage.qml
diff --git a/qml/harbour-sailbook.qml b/qml/harbour-sailbook.qml
@@ -45,7 +45,7 @@ ApplicationWindow
 
     property variant notifications: [0,0,0,0,0,0,0,0,0]
     property string appName: "Sailbook"
-    property string version: "10.0-0"
+    property string version: "11.0-0"
     property string userAgentName
     property string userAgent
 

diff --git a/qml/js/media.js b/qml/js/media.js
diff --git a/qml/js/messages.js b/qml/js/messages.js
diff --git a/qml/js/util.js b/qml/js/util.js
diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml
diff --git a/qml/pages/ExternalUrlPage.qml b/qml/pages/ExternalUrlPage.qml
diff --git a/qml/pages/FirstPage.qml b/qml/pages/FirstPage.qml
@@ -25,15 +25,15 @@ Page {
         Row {
             anchors { fill: parent }
             NavigationButton { onClicked: fbWebview.goBack(); iconSource: "qrc:///images/icon-back.svg"; visible: settings.placeBack==1 && fbWebview.canGoBack }
-            NavigationButton { onClicked: fbWebview.setUrl("https://m.facebook.com/home.php?sk=" + Util.getFeedPriority(settings.priorityFeed)); notifyIndicator: app.notifications[0]; iconSource: "qrc:///images/icon-newsfeed.svg"; visible: settings.showFeed }
-            NavigationButton { onClicked: fbWebview.setUrl("https://m.facebook.com/friends"); notifyIndicator: app.notifications[1]; iconSource: "qrc:///images/icon-requests.svg"; visible: settings.showFriends }
-            NavigationButton { onClicked: fbWebview.setUrl("https://m.facebook.com/messages"); notifyIndicator: app.notifications[2]; iconSource: "qrc:///images/icon-messages.svg"; visible: settings.showMessages }
-            NavigationButton { onClicked: fbWebview.setUrl("https://m.facebook.com/notifications"); notifyIndicator: app.notifications[3]; iconSource: "qrc:///images/icon-notifications.svg"; visible: settings.showNotifications }
-            NavigationButton { onClicked: fbWebview.setUrl("https://m.facebook.com/search/top?soft=search"); notifyIndicator: app.notifications[4]; iconSource: "qrc:///images/icon-search.svg"; visible: settings.showSearch }
-            NavigationButton { onClicked: fbWebview.setUrl("https://m.facebook.com/events/upcoming"); notifyIndicator: app.notifications[5]; iconSource: "qrc:///images/icon-events.svg"; visible: settings.showEvents }
-            NavigationButton { onClicked: fbWebview.setUrl("https://m.facebook.com/groups"); notifyIndicator: app.notifications[6]; iconSource: "qrc:///images/icon-groups.svg"; visible: settings.showGroups }
-            NavigationButton { onClicked: fbWebview.setUrl("https://m.facebook.com/pages/?category=liked"); notifyIndicator: app.notifications[7]; iconSource: "qrc:///images/icon-pages.svg"; visible: settings.showLikedPages }
-            NavigationButton { onClicked: fbWebview.setUrl("https://m.facebook.com/settings"); notifyIndicator: app.notifications[8]; iconSource: "qrc:///images/icon-settings.svg"; visible: settings.showSettings }
+            NavigationButton { onClicked: fbWebview.setUrl("https://touch.facebook.com/home.php?sk=" + Util.getFeedPriority(settings.priorityFeed)); notifyIndicator: app.notifications[0]; iconSource: "qrc:///images/icon-newsfeed.svg"; visible: settings.showFeed }
+            NavigationButton { onClicked: fbWebview.setUrl("https://touch.facebook.com/friends"); notifyIndicator: app.notifications[1]; iconSource: "qrc:///images/icon-requests.svg"; visible: settings.showFriends }
+            NavigationButton { onClicked: fbWebview.setUrl("https://touch.facebook.com/messages"); notifyIndicator: app.notifications[2]; iconSource: "qrc:///images/icon-messages.svg"; visible: settings.showMessages }
+            NavigationButton { onClicked: fbWebview.setUrl("https://touch.facebook.com/notifications"); notifyIndicator: app.notifications[3]; iconSource: "qrc:///images/icon-notifications.svg"; visible: settings.showNotifications }
+            NavigationButton { onClicked: fbWebview.setUrl("https://touch.facebook.com/search/top?soft=search"); notifyIndicator: app.notifications[4]; iconSource: "qrc:///images/icon-search.svg"; visible: settings.showSearch }
+            NavigationButton { onClicked: fbWebview.setUrl("https://touch.facebook.com/events/upcoming"); notifyIndicator: app.notifications[5]; iconSource: "qrc:///images/icon-events.svg"; visible: settings.showEvents }
+            NavigationButton { onClicked: fbWebview.setUrl("https://touch.facebook.com/groups"); notifyIndicator: app.notifications[6]; iconSource: "qrc:///images/icon-groups.svg"; visible: settings.showGroups }
+            NavigationButton { onClicked: fbWebview.setUrl("https://touch.facebook.com/pages/?category=liked"); notifyIndicator: app.notifications[7]; iconSource: "qrc:///images/icon-pages.svg"; visible: settings.showLikedPages }
+            NavigationButton { onClicked: fbWebview.setUrl("https://touch.facebook.com/settings"); notifyIndicator: app.notifications[8]; iconSource: "qrc:///images/icon-settings.svg"; visible: settings.showSettings }
         }
     }
 }

diff --git a/qml/pages/ImagePage.qml b/qml/pages/ImagePage.qml
diff --git a/qml/pages/ImageSelectorPage.qml b/qml/pages/ImageSelectorPage.qml
diff --git a/qml/pages/SettingsPage.qml b/qml/pages/SettingsPage.qml
diff --git a/qml/pages/TranslationsPage.qml b/qml/pages/TranslationsPage.qml
diff --git a/qml/pages/VideoPage.qml b/qml/pages/VideoPage.qml
diff --git a/qml/resources/css/external.css b/qml/resources/css/external.css
diff --git a/qml/resources/css/sailbook-theme-ambience.css b/qml/resources/css/sailbook-theme-ambience.css
diff --git a/qml/resources/css/sailbook-theme-facebook.css b/qml/resources/css/sailbook-theme-facebook.css
diff --git a/qml/resources/css/sailbook-theme-night.css b/qml/resources/css/sailbook-theme-night.css
diff --git a/qml/resources/images/icon-back.svg b/qml/resources/images/icon-back.svg
diff --git a/qml/resources/images/icon-belgium.png b/qml/resources/images/icon-belgium.png
diff --git a/qml/resources/images/icon-events.svg b/qml/resources/images/icon-events.svg
diff --git a/qml/resources/images/icon-external.png b/qml/resources/images/icon-external.png
diff --git a/qml/resources/images/icon-finland.png b/qml/resources/images/icon-finland.png
diff --git a/qml/resources/images/icon-fontawesome.png b/qml/resources/images/icon-fontawesome.png
diff --git a/qml/resources/images/icon-french.png b/qml/resources/images/icon-french.png
diff --git a/qml/resources/images/icon-germany.png b/qml/resources/images/icon-germany.png
diff --git a/qml/resources/images/icon-github.png b/qml/resources/images/icon-github.png
diff --git a/qml/resources/images/icon-groups.svg b/qml/resources/images/icon-groups.svg
diff --git a/qml/resources/images/icon-italy.png b/qml/resources/images/icon-italy.png
diff --git a/qml/resources/images/icon-messages.svg b/qml/resources/images/icon-messages.svg
diff --git a/qml/resources/images/icon-newsfeed.svg b/qml/resources/images/icon-newsfeed.svg
diff --git a/qml/resources/images/icon-notifications.png b/qml/resources/images/icon-notifications.png
diff --git a/qml/resources/images/icon-notifications.svg b/qml/resources/images/icon-notifications.svg
diff --git a/qml/resources/images/icon-pages.svg b/qml/resources/images/icon-pages.svg
diff --git a/qml/resources/images/icon-paypal.png b/qml/resources/images/icon-paypal.png
diff --git a/qml/resources/images/icon-requests.svg b/qml/resources/images/icon-requests.svg
diff --git a/qml/resources/images/icon-sailbook.png b/qml/resources/images/icon-sailbook.png
diff --git a/qml/resources/images/icon-sailbook.svg b/qml/resources/images/icon-sailbook.svg
diff --git a/qml/resources/images/icon-search.svg b/qml/resources/images/icon-search.svg
diff --git a/qml/resources/images/icon-settings.svg b/qml/resources/images/icon-settings.svg
diff --git a/qml/resources/images/icon-telegram.png b/qml/resources/images/icon-telegram.png
diff --git a/qml/resources/images/icon-trans.png b/qml/resources/images/icon-trans.png
diff --git a/qml/resources/images/icon-twitter.png b/qml/resources/images/icon-twitter.png
diff --git a/qml/resources/images/image-placeholder.gif b/qml/resources/images/image-placeholder.gif
diff --git a/qml/resources/images/image-placeholder.png b/qml/resources/images/image-placeholder.png
diff --git a/qml/resources/js/external.js b/qml/resources/js/external.js
diff --git a/qml/resources/js/sailbook.js b/qml/resources/js/sailbook.js
diff --git a/rpm/harbour-sailbook.changes b/rpm/harbour-sailbook.changes
diff --git a/rpm/harbour-sailbook.spec b/rpm/harbour-sailbook.spec
@@ -13,8 +13,8 @@ Name:       harbour-sailbook
 %{!?qtc_make:%define qtc_make make}
 %{?qtc_builddir:%define _builddir %qtc_builddir}
 Summary:    Sailbook
-Version:    10.1
-Release:    7
+Version:    11.0
+Release:    0
 Group:      Qt/Qt
 License:    GPLv3
 URL:        https://github.com/DylanVanAssche/harbour-sailbook

diff --git a/rpm/harbour-sailbook.yaml b/rpm/harbour-sailbook.yaml
@@ -1,7 +1,7 @@
 Name: harbour-sailbook
 Summary: Sailbook
-Version: 10.1
-Release: 7
+Version: 11.0
+Release: 0
 # The contents of the Group field should be one of the groups listed here:
 # http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS
 Group: Qt/Qt

diff --git a/src/harbour-sailbook.cpp b/src/harbour-sailbook.cpp