Misc.

centrevilletech · Mar 8, 2018 · b46a5a5 · b46a5a5
1 parent 86868d7
commit b46a5a5
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 19 deletions.
diff --git a/app/controllers/index.js b/app/controllers/index.js
@@ -60,7 +60,9 @@ function doSetEmailAddressBtnClick() {
 
 function doReloadInboxBtnClick() {
 	if (OS_IOS) {
-		alert('Not supported on iOS yet.');
+		appInboxView.reload(function () {
+			alert('Reloaded the AppInbox successfully!');
+		});
 		// appInboxView.reload();
 	} else {
 		appInboxView.reload(function () {

diff --git a/app/lib/localytics-hyperloop.js b/app/lib/localytics-hyperloop.js
@@ -117,14 +117,15 @@ exports.getAppInboxView = function (args) {
 		if (!inboxViewController) {
 
 			var detailViewController,
+				navigationController,
 				detailCloseBtn;
 
 			detailCloseBtn = Ti.UI.createButton({ 
 				title: "Done",
-				top: 10, 
+				top: 20, 
 				left: 10,
-				width: 50,
-				height: 50
+				width: 44,
+				height: 44
 			});
 
 			detailCloseBtn.addEventListener('click', function () {
@@ -139,8 +140,9 @@ exports.getAppInboxView = function (args) {
 				callback: function (tableView, indexPath) {
 					 var campaign = inboxViewController.campaignForRowAtIndexPath(indexPath);
 					 detailViewController = Localytics.inboxDetailViewControllerForCampaign(campaign);	  
-					 detailViewController.view.addSubview(detailCloseBtn);
-					 TiApp.app().showModalController(detailViewController, true);
+					 navigationController = NavigationController.alloc().initWithRootViewController(detailViewController);
+					 navigationController.view.addSubview(detailCloseBtn);
+					 TiApp.app().showModalController(navigationController, true);
 					 if (!campaign.isRead()) {
 					 	campaign.setRead(true);
 					 	tableView.reloadData();
@@ -155,10 +157,12 @@ exports.getAppInboxView = function (args) {
 
 			// TODO: Build out code to reload the AppInbox when this method is hit.
 			returnView.reload = function (callback) {
-				console.error('reload of AppInbox not supportedy yet on iOS.');
-				if (typeof callback === 'function') {
-					callback();
-				}
+				//console.error('reload of AppInbox not supportedy yet on iOS.');
+				Localytics.refreshInboxCampaigns(function(inboxCampaigns){
+					if (typeof callback === 'function') {
+						callback();
+					}
+				});
 			};
 
 			return returnView;
@@ -180,16 +184,16 @@ exports.getAppInboxView = function (args) {
 		var Intent = require('android.content.Intent');
 		var InboxDetailFragment = require('com.localytics.android.InboxDetailFragment'),
 			TypedValue = require('android.util.TypedValue'),
-			Gravity = require('android.view.Gravity');
-
+			Gravity = require('android.view.Gravity');    
+				
 		// Create instances.
 		var currentActivity = new Activity(Ti.Android.currentActivity);
 		var inboxListAdapter = new InboxListAdapter(currentActivity);
 		var inflater = LayoutInflater.from(currentActivity.getApplicationContext());
 		var containerView = inflater.inflate(Titanium.App.Android.R.layout["activity_inbox"], null);
 		var inboxListView = ListView.cast(containerView.findViewById(Titanium.App.Android.R.id.lv_inbox));
 		var emptyTextView = TextView.cast(containerView.findViewById(Titanium.App.Android.R.id.tv_empty_inbox));
-
+  	
 		// Setup the ListView with an adapter.
 		inboxListView.setAdapter(inboxListAdapter);
 		inboxListView.setEmptyView(emptyTextView);

diff --git a/app/views/index.xml b/app/views/index.xml
@@ -15,10 +15,10 @@
 			</Window>
 		</Tab>
 		<Tab title="App Inbox">
-			<Window id="appInboxTabWindow" title="App Inbox">
+			<Window id="appInboxTabWindow" title="App Inbox" theme="AppTheme">
 				<View id="appInboxContainerView" />
 				<View id="appInboxControlBoxView">
-					<Button title="Reload Inbox (Android)" id="reloadInboxBtn" onClick="doReloadInboxBtnClick" />
+					<Button title="Reload Inbox" id="reloadInboxBtn" onClick="doReloadInboxBtnClick" />
 				</View>
 			</Window>
 		</Tab>

diff --git a/plugins/ti.alloy/hooks/alloy.js b/plugins/ti.alloy/hooks/alloy.js
@@ -152,9 +152,10 @@ exports.init = function (logger, config, cli, appc) {
 						cmd.map(function(a) {
 							if (/^[^"].* .*[^"]/.test(a)) return '"' + a + '"'; return a;
 						}).join(' ') + '"'].join(' ')], {
-						stdio: 'inherit',
-						windowsVerbatimArguments: true
-					});
+							stdio: 'inherit',
+							windowsVerbatimArguments: true
+						}
+					);
 				} else {
 					logger.info(__('Executing Alloy compile: %s', cmd.join(' ').cyan));
 					child = spawn(cmd.shift(), cmd);

diff --git a/tiapp.xml b/tiapp.xml
@@ -48,7 +48,7 @@
 			<uses-permission android:name="android.permission.INTERNET" />
 			<uses-permission android:name="android.permission.WAKE_LOCK" />
 			<application android:icon="@drawable/appicon" android:label="hyperloop.testapp" android:name="HyperloopTestappApplication" android:debuggable="false" android:theme="@style/Theme.AppCompat" android:resizeableActivity="true">
-				<activity android:name=".HyperloopTestappActivity" android:label="@string/app_name" android:theme="@style/Theme.Titanium" android:configChanges="keyboardHidden|orientation|fontScale|screenSize|smallestScreenSize|screenLayout|density">
+				<activity android:name=".HyperloopTestappActivity" android:label="@string/app_name" android:theme="@style/AppTheme" android:configChanges="keyboardHidden|orientation|fontScale|screenSize|smallestScreenSize|screenLayout|density">
 					<intent-filter>
 						<action android:name="android.intent.action.MAIN"/>
 						<category android:name="android.intent.category.LAUNCHER"/>