Commit Graph
2031 Commits
Author SHA1 Message Date
Peter Serwylo 7f929f96a1 Added en-US locale to preferences.
Also changed the way locales are loaded. Now it deals well with language
codes that are followed by country codes (e.g. "en-US" rather than just
"en").
2015-04-11 23:04:37 +10:00
Peter Serwylo 04a05e3c52 Merge branch 'fix155' into 'master'
Change client language from the app options (#155)

Bug: ActionBar Language does not change.

Edit: To make it more clear, you have to restart the app manually for the action bar language to be changed.

See merge request !65
2015-04-11 06:04:24 +00:00
Peter Serwylo 15b0beba17 Wifi swap client now requests swap server to connect back.
It does this by sending a HTTP POST request to /request-swap on the
swap server. That listens for a POST to this path, and responds by
popping open a confirmation message to the user on the server device.
2015-04-11 10:55:48 +10:00
Daniel Martí 3e9aca4137 Logging fixes
* Make expensive Log.d calls (inside loops) only in DEBUG
* Always make TAG private to make sure it doesn't use a parent's TAG
2015-04-10 13:58:26 +02:00
Daniel Martí 8f0488aa6a Some minor cleanups 2015-04-09 23:55:02 +02:00
Nico Alt 082c9117a2 move "Language" to "Display" (Preferences) 2015-04-09 11:58:31 +02:00
Peter Serwylo 1a114c6c45 Show app categories correctly. Fixes #214.
The categories were previously selected in the Spinner, then passed
directly to the database. Once the categories became translated, this
meant we were sending the translated category to the database.
However, the database only knows about English categories, and so we
instead need to look up the English translation for the selected
category before passing to the database. This is done by keeping
a list of original category names which is indexed the same as the
translated ones.
2015-04-09 15:47:00 +10:00
Daniel Martí 51a091fe44 Add a few changelog items 2015-04-09 00:25:42 +02:00
Daniel Martí db19842ce0 Add support for amazon search links 2015-04-09 00:17:21 +02:00
Daniel Martí c52262a405 Handle all app and search links via the main activity
Closes #208.
2015-04-09 00:13:40 +02:00
Nico Alt 14adb2a302 change client language from the app options (#155)
Bug: ActionBar Language does not change.
2015-04-08 20:53:04 +02:00
Daniel Martí b751594bfe Centralise int and date parsing and formatting in Utils 2015-04-07 15:00:34 +02:00
Daniel Martí c92970a3ed Use switches more often 2015-04-07 12:57:17 +02:00
Daniel Martí c54c905d2e Some more small code refactors 2015-04-07 12:38:21 +02:00
Daniel Martí 0f18a0979d Run Android Studio's import optimizer
* Remove all wildcard imports
* Reorder alphabetically and by source
* Remove unused imports
2015-04-07 11:58:22 +02:00
Daniel Martí e3175530ed Apply a bunch of Android Studio fixes 2015-04-07 11:43:07 +02:00
Daniel Martí a67fdfeb89 Remove overrides that didn't do anything 2015-04-07 11:21:56 +02:00
Daniel Martí 0a11c4cd3e Optimize imports a bit 2015-04-07 10:47:24 +02:00
Daniel Martí 3d55c0b45b Remove unused jdk* spongycastle source files 2015-04-07 10:47:24 +02:00
Daniel Martí c7b16c6713 Only use 3.X workarounds on 3.X 2015-04-07 10:44:33 +02:00
Daniel Martí 2f80d37c24 Add name for 5.1 (22) 2015-04-07 10:44:33 +02:00
Daniel Martí b18231c25d Don't shadow PreferenceFragment class name
I chose PreferencesFragment (plural) in concordance with PreferencesActivity.
2015-04-07 10:44:28 +02:00
Daniel Martí dc86129cca More final keywords 2015-04-06 17:54:28 +02:00
Daniel Martí 14a38f2f50 Better explain our code style 2015-04-06 17:54:28 +02:00
Daniel Martí 81c44ef4ae Merge branch 'fix168' into 'master'
Fix #168: Not enough space for version number and license

downgrade weight from 2 to 1 and from 1 to 0

See merge request !62
2015-04-05 16:57:11 +00:00
Daniel Martí 9261f60225 Merge branch 'fix127' into 'master'
Fix #127: Add text wrapping in application view

Similar fix like in #168.

See merge request !63
2015-04-05 16:56:34 +00:00
Nico Alt b017f35010 fix #127: Add text wrapping in application view 2015-04-04 22:30:18 +02:00
Nico Alt d6cac24fed fix #168: Not enough space for version number and license
downgrade weight from 2 to 1 and from 1 to 0
2015-04-04 22:11:10 +02:00
Daniel Martí 8dfeabcf18 Fix broken link (spongycastle java file moved/gone) 2015-04-03 00:08:21 +02:00
Daniel Martí d70252a3f2 Add HACKING md file 2015-04-02 09:57:47 +02:00
Daniel Martí 822a75258c Shorten some logging tags 2015-04-02 09:46:32 +02:00
Peter Serwylo d62a3c711d Correctly select swappable apps from list.
Previously, there was a bug with an off-by-one error, as android-11
or later was treating the headerView different to android-10 and
earlier. They now both have the same understanding about the header
view.
2015-04-02 16:20:23 +11:00
Peter Serwylo 9db556f4b7 Hack to get layouts working on API > 16
For some reasono specify different layout-v* directories to inflate
views based on the android version is  not working as desired.
Previously there was a "layout", "layout-land" and "layout-v11" dir.
Only "layout" and "layout-v11" had the "select_local_apps_list_item.xml"
layout in them, the "layout-v11" version did _not_ have a checkbox,
whereas the other vanilla one did.

This worked on a android-16 emulator. It would correctly pick up the
view from "layout-v11". However, on a android-19 device, android-19
emulator, android-21 device and android-21 emulator, they all picked
up the view from the "layout" dir - with checkbox and all.

I couldn't figure out for the life of my why this was happening, so
I started to figure out which one it _would_ work with. I added
a layout-v* for every single version, and in each, put a text view
telling me which version it was. That way, viewing the list of apps to
swap, the list would inflate a view, and tell me which layout-v* dir it
inflated it from. It worked for layout-v17 and higher, but was unable
to inflate layouts from layout-v11 to layout-v16. So I deleted all
except layout-v17, and it now works for android-16, 19 and 21 as per my
tests.
2015-04-02 14:37:40 +11:00
Peter Serwylo ead4f449d6 Fix #211 - don't force every incoming intent to be a repo intent. 2015-04-02 09:42:48 +11:00
Daniel Martí 0a515dfae1 Bump to 0.84-test 0.84-test 2015-04-01 20:56:47 +02:00
Daniel Martí 4fb12261e4 Simplify some spongycastle symlinks 2015-04-01 20:55:41 +02:00
Daniel Martí 1845e392d2 Ignore stuff from imported libs 2015-04-01 20:52:48 +02:00
Daniel Martí 2cd026b34b Forgot to update the support-v4-preferencefragment paths in ant 2015-04-01 20:35:26 +02:00
Daniel Martí 9e82463e46 More final keywords 2015-04-01 17:12:52 +02:00
Daniel Martí 05aa6a39fa Small cursor null, count and close() 2015-04-01 17:04:51 +02:00
Daniel Martí 0506160f7b Make use of List.contains(o) since it already does .equals() 2015-04-01 16:57:16 +02:00
Daniel Martí ea559d0675 Add some final keywords
Especially in constants within classes, which allows for inlining.
2015-04-01 16:17:34 +02:00
Daniel Martí bdbb6ce03a Outdent all switch cases 2015-04-01 13:27:23 +02:00
Daniel Martí 1295158de2 Small style fix to the last commit 2015-04-01 13:14:28 +02:00
Daniel Martí b0e4f59f43 Use string switches from Java 1.7
Advantages:
 * Greatly simplifies code
 * No variable name duplication
 * Potentially more efficient bytecode
2015-04-01 13:09:02 +02:00
Daniel Martí 3eddb1402c Infer more types taking advantage of java 1.7 to simplify code 2015-04-01 12:11:23 +02:00
Daniel Martí d9590743d9 Get rid of root build.gradle hacks again
Now that we controll all lib build.gradle files, we can finally do it.

If we want to build support-v7 from source again with gradle, we'll import the
build.gradle and "fix" it like the rest.
2015-04-01 11:59:31 +02:00
Daniel Martí 94eb8c7084 Update support-v4-preferencefragment aar 2015-04-01 11:32:39 +02:00
Daniel Martí 5fef0d012f Clean v4-preferencefragment build.gradle 2015-04-01 11:28:51 +02:00
Daniel Martí 2ce62aac65 Adapt our gradle setup to the new v4-preferencefragment location 2015-04-01 11:28:36 +02:00