Merge pull request #85 from hansemannn/update-android-fb-sdk

[TIMOB-24593] Update Facebook Android SDK + iOS SDK to 4.25.0, support Graph v2.9 + FBSDKPlacesKit API, refactor iOS-project

.gitignore

@@ -41,6 +41,7 @@ android/.settings
 
 android/launch-*
 nbproject
-ios/FacebookIOS.xcodeproj/project.xcworkspace/xcuserdata/
+ios/titanium-facebook.xcodeproj/project.xcworkspace/xcuserdata/
 /android/java-sources.txt
 /ios/metadata.json
+/ios/facebook-iphone-*.zip

android/example/app.js

@@ -1,5 +1,5 @@
 // this sets the background color of the master UIView (when there are no windows/tab groups on it)
-Titanium.UI.setBackgroundColor('#000');
+Ti.UI.setBackgroundColor('#000');
 
 // create tab group
 var tabGroup = Titanium.UI.createTabGroup({backgroundColor:'#fff'});
@@ -8,34 +8,49 @@ var fb = require('facebook');
 // create base UI tab and root window
 //
 
-tabGroup.addTab(Titanium.UI.createTab({  
+tabGroup.addTab(Titanium.UI.createTab({
     icon:'KS_nav_views.png',
     title:'Login',
     window:require('facebook_login_logout').window()
 }));
-tabGroup.addTab(Titanium.UI.createTab({  
+
+tabGroup.addTab(Titanium.UI.createTab({
     icon:'KS_nav_views.png',
     title:'Read',
     window:require('facebook_read_stream').window()
 }));
 
-tabGroup.addTab(Titanium.UI.createTab({  
+tabGroup.addTab(Titanium.UI.createTab({
     icon:'KS_nav_views.png',
     title:'Publish',
     window:require('facebook_publish_stream').window()
 }));
 
-tabGroup.addTab(Titanium.UI.createTab({  
+tabGroup.addTab(Titanium.UI.createTab({
     icon:'KS_nav_views.png',
     title:'Photo',
     window:require('facebook_photos').window()
 }));
 
+if (Ti.Platform.osname !== 'android') {
+    tabGroup.addTab(Titanium.UI.createTab({
+        icon:'KS_nav_views.png',
+        title:'Messenger',
+        window:require('facebook_messenger').window()
+    }));
+
+    tabGroup.addTab(Titanium.UI.createTab({
+        icon:'KS_nav_views.png',
+        title:'Places',
+        window:require('facebook_places').window()
+    }));
+}
+
 fb.initialize(); // after you set up login/logout listeners and permissions
 
 // open tab group
 if (Ti.Platform.osname == 'android') {
 	tabGroup.fbProxy = fb.createActivityWorker({lifecycleContainer: tabGroup});
 }
-	
+
 tabGroup.open();

android/manifest

@@ -2,18 +2,17 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 6.2.0
+version: 6.3.0
 apiversion: 3
 architectures: armeabi-v7a x86
 description: facebook
 author: Mark Mokryn and Ashraf A. S. (Appcelerator)
 license: Apache License Version 2.0
 copyright: Copyright (c) 2014 by Mark Mokryn, Copyright (c) 2009-2017 by Appcelerator
-respackage: com.facebook
 
 # these should not be edited
 name: Facebook
 moduleid: facebook
 guid: e4f7ac61-1ee7-44c5-bc27-fa6876e2dce9
 platform: android
-minsdk: 6.0.0
+minsdk: 6.1.1