Commit Graph

232 Commits

Author SHA1 Message Date
DjBushido
8d6a3b0d84 Slight refactoring of BibleMenu
Needs a test case, but having issues with the emulator on Windows
2014-11-16 00:28:25 -05:00
Bradlee Speice
6c139eacab Make the VerseContent immutable
Not quite certain this is the way to go, but let's try a functional experiment.
2014-11-13 00:04:20 -05:00
Bradlee Speice
1ee1a41004 Switch get() to [] 2014-11-12 23:43:21 -05:00
Bradlee Speice
187a73cf92 Kotlin migration is done!
There will of course be refactoring and whatnot, but I consider this an accomplishment.
2014-11-12 23:41:05 -05:00
Bradlee Speice
0e7680ca9e Rename the ExpListNavDrawerFragment 2014-11-12 22:21:32 -05:00
Bradlee Speice
18c9df404e Books are now deleted correctly
Still need to handle all the network related errors...
2014-11-12 01:01:34 -05:00
Bradlee Speice
8137c4795a Fix issues the OsisParser regenerating VerseContent
BookManager is still currently unable to delete books
2014-11-12 00:34:31 -05:00
Bradlee Speice
cce463cde9 Properly remove a book
Not sure why it needs to be implemented this way...
2014-11-12 00:09:24 -05:00
Bradlee Speice
b65b5680f9 Remove the InstalledManager
Largely duplicated work, and makes testing easier!
2014-11-11 23:46:51 -05:00
Bradlee Speice
35b515add7 Small documentation update on Injector 2014-11-11 23:26:01 -05:00
Bradlee Speice
7cfe273cb6 Refactor BookDownloadManager to Kotlin
I don't like that I had to make one static method a class method, but I like how much cleaner everything else is!
2014-11-11 22:55:31 -05:00
Bradlee Speice
86adeb4951 Refactor the DLProgressEvent to Kotlin 2014-11-11 21:53:13 -05:00
Bradlee Speice
b778748ee0 Rename FinalDelegate to SafeValDelegate 2014-11-11 13:29:55 -05:00
Bradlee Speice
c394fce273 Use a delegate to make OsisParser cleaner 2014-11-11 10:09:47 -05:00
Bradlee Speice
c57babd68a Add some tests to the OsisParser
Testing state machines can be difficult if it's not black box...
2014-11-11 00:33:51 -05:00
Bradlee Speice
6a45d872f8 Refactor the Core of LocaleManager, test it 2014-11-10 23:45:21 -05:00
Bradlee Speice
0f0b60c186 Revert "Building against SDK 21"
This reverts commit fbc7e9a681.
2014-11-09 23:55:30 -05:00
Bradlee Speice
6c8f92e742 Revert "Some more build fixes - use Android-Gradle .14"
This reverts commit 51a3dd3eac.
2014-11-09 23:55:23 -05:00
Bradlee Speice
59a924c14a Revert "Set minifyEnabled"
This reverts commit 84bd26ac52.
2014-11-09 23:55:20 -05:00
Bradlee Speice
84bd26ac52 Set minifyEnabled 2014-11-09 23:36:55 -05:00
Bradlee Speice
51a3dd3eac Some more build fixes - use Android-Gradle .14 2014-11-09 22:30:05 -05:00
Bradlee Speice
fbc7e9a681 Building against SDK 21 2014-11-09 21:13:07 -05:00
Bradlee Speice
d7e9dd34c9 Expose the modulesByLanguage
Can be refactored later, internal implementation uses the "proper" way of accessing things.
2014-11-08 00:34:08 -05:00
Bradlee Speice
1ea27f50b9 Slight refactor, FixedLanguage should be private 2014-11-08 00:29:10 -05:00
Bradlee Speice
cc15e9219d Some slight refactoring, test filtering books 2014-11-08 00:22:13 -05:00
Bradlee Speice
24f639a024 Upgrade Kotlin 2014-11-07 23:27:06 -05:00
Bradlee Speice
ad1a0eee84 Boundary Value testing working as hoped. 2014-11-07 00:27:17 -05:00
Bradlee Speice
c0281cc8c7 Working language selector! 2014-11-07 00:11:05 -05:00
Bradlee Speice
88a40cbfbb Add a language spinner
It doesn't do much yet...
2014-11-06 23:13:45 -05:00
Bradlee Speice
23bd5136b5 Provide access to network state
Also fix the no books installed issue (again)
2014-11-06 20:06:17 -05:00
Bradlee Speice
72f375ff9f Revert "Remove the build flavors"
This reverts commit c38dad605a.
2014-11-06 19:57:13 -05:00
Bradlee Speice
c38dad605a Remove the build flavors
This is actually a pretty big accomplishment, should be a blog post shortly.
2014-10-30 00:42:23 -04:00
Bradlee Speice
1eb914819d Refactor main menu to Kotlin
So much less code to write and maintain... love it.
2014-10-24 23:53:39 -04:00
Bradlee Speice
8104ffa862 Test case refactoring, test doUpdate
Boundary Values are awesome - https://www.destroyallsoftware.com/talks/boundaries
2014-10-22 23:32:18 -04:00
Bradlee Speice
f4e8ffaebc Some more cleanup and additions
Android is seriously not test-friendly
2014-10-22 23:16:52 -04:00
Bradlee Speice
22fd32b26d RefreshManager going functional! 2014-10-22 22:21:42 -04:00
Bradlee Speice
6d15167100 Upgrade Kotlin 2014-10-22 20:42:39 -04:00
Bradlee Speice
9424d43ef7 Not pretty, but displays verse at top of screen 2014-10-12 23:53:59 -04:00
Bradlee Speice
ff9f2ac7b3 Slight refactor
Tried to refactor all the way to Kotlin, but ran into some casting issues ultimately after trying to work around Dagger.
2014-10-12 22:34:17 -04:00
Bradlee Speice
bfde7d5839 Fix NPE trying to open a book 2014-10-12 21:27:48 -04:00
Bradlee Speice
2ee16ceb4f Fix infinite scroll getting thrown into an infinite loop...
Ironic, no?
2014-09-27 19:20:27 -04:00
Bradlee Speice
b842ee1933 Forgot to include the UI Utils scroll files 2014-09-27 18:40:35 -04:00
Bradlee Speice
918f7688ba Now able to infinitely scroll bibles!
Tons of issues outstanding, but this is a huge accomplishment.
2014-09-16 23:37:08 -04:00
Bradlee Speice
ef7b8f82fa Remove Hugo, it keeps on breaking the build... 2014-09-14 22:19:56 -04:00
Bradlee Speice
df5700107d Kotlin WebView/Javascript client! 2014-09-14 21:56:09 -04:00
Bradlee Speice
d309d0de19 Filtered out the wrong books of the Bible. 2014-09-14 20:03:33 -04:00
Bradlee Speice
d74b684620 Force VerseContent to take in a non-null verse 2014-09-14 16:30:12 -04:00
Bradlee Speice
f9f8ea929f Add a TODO for JSON parsing in the future 2014-09-14 16:26:43 -04:00
Bradlee Speice
597cfca710 Test Hugo one more time, it's working locally... 2014-09-13 00:44:36 -04:00
Bradlee Speice
a01c7940ed Remove Hugo for Travis
Seems to be causing out of memory errors...
2014-09-13 00:15:17 -04:00
Bradlee Speice
12ff40adb7 Clean up the Travis build a bit 2014-09-12 22:47:02 -04:00
Bradlee Speice
67b11b3ab0 Make sure the unit tests pass correctly 2014-09-12 22:36:53 -04:00
Bradlee Speice
cbb4b5fd14 Add a whole lot of debug goodies 2014-09-12 22:23:48 -04:00
Bradlee Speice
cb13dd64aa Get a first manager to Kotlin
Extension functions are fun...
2014-09-11 00:41:11 -04:00
Bradlee Speice
2ae714a935 Kotlin migration continues... 2014-09-10 23:31:16 -04:00
Bradlee Speice
f05e50292e Move parser to Kotlin 2014-09-10 22:41:34 -04:00
Bradlee Speice
3d8ff65af4 Bringing back Kotlin
I can do manual DI for testing, other Android classes can handle interfacing with Kotlin. From my testing, interop is quite smooth.
2014-09-09 23:31:32 -04:00
Bradlee Speice
4d0a8618a8 Displaying chapter and verse headers now 2014-09-09 23:05:58 -04:00
Bradlee Speice
3eb4b77cdb @NotNull was triggering some build errors... 2014-09-09 00:29:18 -04:00
Bradlee Speice
ba908c4f46 Remove Kotlin from build config 2014-09-09 00:19:17 -04:00
Bradlee Speice
13417b2ad5 Strip out Kotlin
I just simply need DI too much, and I don't want to have a Java shell class for everything in Kotlin.
2014-09-09 00:10:12 -04:00
Bradlee Speice
24a384d30e Revert "The kotlin migration continues..."
I like my DI annotations too much...

This reverts commit 540426a0a2.
2014-09-08 23:45:20 -04:00
Bradlee Speice
540426a0a2 The kotlin migration continues... 2014-09-08 23:36:33 -04:00
Bradlee Speice
20e4dfe4c4 Begin parsing OSIS on my own
Also add Kotlin, since I'd like to do what I can to get away from Java.
2014-09-07 21:27:41 -04:00
Bradlee Speice
80238f3cf2 Handle no books installed on start properly. 2014-09-03 22:49:18 -04:00
Bradlee Speice
54d0157785 Quick comment update 2014-09-03 21:45:55 -04:00
Bradlee Speice
5ebd66b6c7 Remove the "testing" mode 2014-09-03 21:44:17 -04:00
Bradlee Speice
abbcbb3947 Quick fix so tests pass
Please note, this needs to get fixed before going live. This logic is needed.
2014-09-01 23:01:51 -04:00
Bradlee Speice
479879925f State we need the gradle build plugin at least 12+ 2014-09-01 23:01:08 -04:00
Bradlee Speice
0451d9443f Remove a useless test
Because I can't remove a book without restarting the application (no idea why this is) it's impossible to test this.
2014-09-01 16:17:43 -04:00
Bradlee Speice
40c706c4ab Fix a deprecation 2014-09-01 16:10:04 -04:00
Bradlee Speice
2d59859ac7 Remove Gson, I'm not doing anything with it quite yet. 2014-09-01 15:59:08 -04:00
Bradlee Speice
9c53484891 Fix some build issues with the JS 2014-09-01 15:57:57 -04:00
Bradlee Speice
839e211c44 Provide Gson in DI 2014-09-01 15:35:55 -04:00
Bradlee Speice
c9098c570c Script to set up JS building 2014-09-01 15:35:07 -04:00
Bradlee Speice
ae43667f2f JS can call Android and get a value back! 2014-09-01 14:32:13 -04:00
Bradlee Speice
e20e42b7bd Android can now call Angular! 2014-09-01 12:28:51 -04:00
Bradlee Speice
799091b6e4 Statically get access to the Angular scope 2014-09-01 11:25:22 -04:00
Bradlee Speice
1911f3128a Continued angular work
I probably should note - I'm including the dist/ folder in Git because I'm not expecting everyone to have gulp/dependencies installed. Easier to hack through if you can actually build and run only the Java section of code!
2014-09-01 11:07:24 -04:00
Bradlee Speice
1255580b7a Initial Angular commit 2014-09-01 10:47:59 -04:00
Bradlee Speice
bd77dcc3a7 Initial gulp build system 2014-09-01 10:18:37 -04:00
Bradlee Speice
aa29caebb3 Switch LruCache to DI 2014-09-01 08:28:50 -04:00
Bradlee Speice
cc0c681bae Use the proper HTML handler 2014-09-01 08:09:49 -04:00
Bradlee Speice
c26beac6bb And I have working text. 2014-09-01 07:58:33 -04:00
Bradlee Speice
c0c0643b84 Add in the And-bible OSIS parser
Took me a while to do the research I needed, sorry it's been so long. Largely useless currently, but gives me a starting place to adapt.
2014-08-22 19:53:57 -04:00
Bradlee Speice
6271cc9626 Figured out why I was getting some initial errors. 2014-08-09 20:52:02 -04:00
Bradlee Speice
1df6a13735 More skeleton updates to make things look nice 2014-08-09 20:45:35 -04:00
Bradlee Speice
302ae9d6f4 Skeleton for verse lookup is complete.
Unfortunately, looks like I'm going to have some work to either incorporate an OSIS formatter, or re-use one.
Given the license of and-bible, I think I might end up re-using that.
2014-08-09 20:25:27 -04:00
Bradlee Speice
44ed42135f Fixed the build issue.
Dagger 1.2.2 and Esperandro do not play nice together. Filed issue 25 with Esperandro - https://github.com/dkunzler/esperandro/issues/25
2014-08-09 20:07:38 -04:00
Bradlee Speice
ad33ed9619 Initial verse lookup and caching.
Having some weird issues on the build, syncing to Github so I can test elsewhere. Things are likely broken right now.
2014-08-09 19:34:31 -04:00
Bradlee Speice
0caca67f44 DownloadActivity remembers your category on rotate 2014-07-23 23:35:12 -04:00
Bradlee Speice
23c41ddb72 Get the DownloadActivity back on track. 2014-07-23 23:17:57 -04:00
Bradlee Speice
787cc4aa24 [broken] Significant refactoring work
Last step is getting the downloader back up to speed.
2014-07-23 23:02:48 -04:00
Bradlee Speice
f3cd9b8de4 [broken] Add some TODO messages
The ExpandableListView is working, but needs *SIGNIFICANT* refactoring/edits before moving on.
2014-07-22 23:51:14 -04:00
Bradlee Speice
07f6705539 [broken] Add initial ExpandableListView navbar 2014-07-22 23:47:16 -04:00
Bradlee Speice
a0e9939954 BibleViewer uses OGHolder pattern too. 2014-07-21 22:55:34 -04:00
Bradlee Speice
915467c465 Permanent implementation of the OG holder pattern 2014-07-21 22:52:19 -04:00
Bradlee Speice
7c483695d3 PoC: Don't rebuild the OG on conf change 2014-07-21 22:19:52 -04:00
Bradlee Speice
d61f9057b6 Download now using the new Navbar 2014-07-21 20:42:21 -04:00
Bradlee Speice
54c3dd01a9 Navdrawer: Change text color, not imageview 2014-07-20 21:50:49 -04:00
Bradlee Speice
9a2ede432e One more RM test case 2014-07-20 21:21:24 -04:00
Bradlee Speice
8b40fbcd96 First mockito test! 2014-07-20 21:12:00 -04:00
Bradlee Speice
021cf1359d Quick NPE fix 2014-07-19 23:33:19 -04:00
Bradlee Speice
d685beaae6 Can't fix tests, fix application instead
See documentation for more information on why I can't fix the tests to actually guarantee anything.
2014-07-19 23:27:49 -04:00
Bradlee Speice
f2a4ceceff Tests still fail, but look prettier! 2014-07-19 01:44:22 -04:00
Bradlee Speice
b7198b984c Global import optimize 2014-07-19 00:32:26 -04:00
Bradlee Speice
46e1285b61 Clean and make more strict the InstalledManager tests
Unfortunately, they're currently always going to succeed. I'm having issues with the API not giving me a fresh list of what is installed.
2014-07-19 00:29:27 -04:00
Bradlee Speice
d6d52cea04 Add a test for removing a book 2014-07-18 18:39:03 -04:00
Bradlee Speice
08a1aaa684 First InstalledManager test case 2014-07-17 18:12:56 -04:00
Bradlee Speice
ca22be41cc Add a test for the download job ID 2014-07-17 17:42:31 -04:00
Bradlee Speice
b40106cedb Fix a minor issue pointed out by FindBugs 2014-07-16 20:01:04 -04:00
Bradlee Speice
28227f2ef3 Add a highlighting Navbar on the front page
Used to help orient people scrolling through books, in a way that is colorful. Shading the background of a list item is also totally a possibility.
2014-07-13 22:43:54 -04:00
Bradlee Speice
d85182a76f Switch up the launcher icon and some colors 2014-07-13 20:19:11 -04:00
Bradlee Speice
0014ec8bad Display books of the Bible in the navbar 2014-07-11 19:56:02 -04:00
Bradlee Speice
365cf0dccb Add the first full-scale test case
Also demonstrates some advanced Dagger usage
2014-07-10 22:37:37 -04:00
Bradlee Speice
a9b06a7fde One more static reference refactoring 2014-07-10 21:34:19 -04:00
Bradlee Speice
80e38dacb4 More refactoring work
Able to delete an extraneous class!
2014-07-09 22:34:11 -04:00
Bradlee Speice
b0327dd491 Continue refactoring out static fields 2014-07-09 22:15:18 -04:00
Bradlee Speice
60ea2a6097 Add the BibleViewer activity back
And with that, I am fully back up-to-date
2014-07-09 21:55:56 -04:00
Bradlee Speice
949f35f312 Don't require the actual Activity, just an injector 2014-07-09 21:30:22 -04:00
Bradlee Speice
e7cf3be6bc Remove a PoC test case, and make sure all tests are successful. 2014-07-09 21:20:52 -04:00
Bradlee Speice
099c7ec02a Relocate a test case 2014-07-09 21:14:57 -04:00
Bradlee Speice
cf7bc7c139 Add code to do Fragment instrumentation tests 2014-07-09 21:14:23 -04:00
Bradlee Speice
9548bb50ef Add a "testing mode" inject
Doesn't do anything currently, but will allow for Activities/etc. which can't be easily sub-classed, mocked, etc. during runs to modify behavior.
2014-07-07 23:28:28 -04:00
Bradlee Speice
a15e78978b Remove a static field
Because dependency injection
2014-07-07 23:13:25 -04:00
Bradlee Speice
d6951fcc9f Initial DownloadActivity import
I wish all new activities were this easy...
Needs significant refactoring/testing attention, coming shortly.
2014-07-07 22:09:15 -04:00
Bradlee Speice
5c71e8f014 PoC using reflection
Test will need to be something more meaningful later.
2014-07-06 23:05:28 -04:00
DjBushido
60185c934a Test cases pass now with the navbar 2014-07-05 15:59:34 -04:00
DjBushido
b0a8a37b67 Add initial Travis build 2014-07-05 11:12:37 -04:00
DjBushido
8b5e6ede51 Testing now working
Still requires shenanigans in its own right, but this is a much better platform.
Plus, I don't need to mess with the application context, all I do is change the injections.
2014-07-05 10:35:55 -04:00
DjBushido
b34f5e147a Add the jSword build 2014-07-04 22:25:35 -04:00
DjBushido
ba38867104 Add the initial project. 2014-07-04 22:09:25 -04:00