mirror-github-minimalbible/MinimalBible
1
0
Fork 0
mirror of https://github.com/MinimalBible/MinimalBible synced 2024-11-04 23:28:19 -05:00
Code Issues Releases Wiki Activity

Android can now call Angular!

Browse Source
This commit is contained in:
Bradlee Speice 2014-09-01 12:28:51 -04:00
parent 799091b6e4
commit e20e42b7bd
4 changed files with 31215 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31204
app/src/main/assets/dist/book-bundle.js vendored
View File

File diff suppressed because one or more lines are too long

2
app/src/main/assets/gulpfile.js
View File

@ -22,7 +22,7 @@ gulp.task('watch', function() {
.on('error', gutil.log.bind(gutil, 'Browserify Error')) .on('error', gutil.log.bind(gutil, 'Browserify Error'))
.pipe(source('book-bundle.js')) .pipe(source('book-bundle.js'))
.pipe(buffer()) .pipe(buffer())
.pipe(uglify()) //.pipe(uglify()) // Since Android needs to call in, can't minify
.pipe(gulp.dest('./dist')); .pipe(gulp.dest('./dist'));
} }

17
app/src/main/assets/src/book.coffee
View File

@ -1,4 +1,4 @@
require 'jquery' # For using selectors to access scope $ = require 'jquery' # For using selectors to access scope
require 'angular' require 'angular'
app = angular.module('bookApp', []) app = angular.module('bookApp', [])
@ -8,10 +8,21 @@ app.controller 'BookCtrl', ['$scope', ($scope) ->
{'text': 'hello.'} {'text': 'hello.'}
]; ];
$scope.alert = -> $scope.appendVerse = (text) ->
alert "Hello!" $scope.verses.push {'text': text}
] ]
# Due to page initialization, we can only store the controller string.
# The actual element changes, so there's nothing we can do with JQuery
# etc. to grab the scope ahead of time and re-use it.
controller = "#bookController"
window.appendVerse = (text) ->
scope = angular.element($("#bookController")).scope()
scope.appendVerse text
# Since we're calling outside of angular, we need to manually apply
scope.$apply()
### ###
Future reference: Get the controller scope like so: Future reference: Get the controller scope like so:
angular.element($("<controller-element>")).scope().<function> angular.element($("<controller-element>")).scope().<function>

5
app/src/main/java/org/bspeice/minimalbible/activity/viewer/BookFragment.java
View File

@ -113,7 +113,8 @@ public class BookFragment extends BaseFragment {
Verse initial = new Verse(vUtil.getVersification(mBook.get()), Verse initial = new Verse(vUtil.getVersification(mBook.get()),
BibleBook.GEN, 1, 1); BibleBook.GEN, 1, 1);
super.onPageFinished(view, url); super.onPageFinished(view, url);
// invokeJavascript("set_content", lookupService.getHTMLVerse(initial)); // invokeJavascript("appendVerse", lookupService.getHTMLVerse(initial));
invokeJavascript("appendVerse", "Testing string...");
} }
@Override @Override
@ -124,7 +125,7 @@ public class BookFragment extends BaseFragment {
} }
}); });
// TODO: Remove remote debugging when ready // TODO: Remove remote debugging when ready - or should this be removed?
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
WebView.setWebContentsDebuggingEnabled(true); WebView.setWebContentsDebuggingEnabled(true);
} }