Skip to content
Snippets Groups Projects
  1. Apr 01, 2016
  2. Mar 31, 2016
  3. Mar 30, 2016
  4. Mar 29, 2016
  5. Mar 28, 2016
  6. Mar 26, 2016
  7. Mar 22, 2016
  8. Mar 16, 2016
  9. Mar 15, 2016
    • akwizgran's avatar
      Finish SplashScreenActivity when starting next activity. · e39a74bd
      akwizgran authored
      Fixes #270.
      e39a74bd
    • akwizgran's avatar
      Reverted text colour to black. · d605e1ca
      akwizgran authored
      @color/briar_text_primary is used in a lot of places other than the settings screen - if we want to use grey text in the settings screen we'll need to find another way.
      
      Also fixed some misspelled resource names and included the colours from the Briar palette in color.xml.
      d605e1ca
    • akwizgran's avatar
      Fixed merge issues. · 3d575162
      akwizgran authored
      3d575162
    • akwizgran's avatar
      Merge branch '247-dagger-2' into 'master' · c2a1cc1e
      akwizgran authored
      247 dagger 2
      
      This MR in a nutshell replaces Guice and Roboguice with Dagger 2, which offers a lot more possibilities than is implemented in this branch, such as using lazy injections for performance purposes. With Dagger 2 all the magic happens at compile time, so no need to worry about unfulfilled injections at runtime, but due to restrictions I was forced to put injected test code into an Android module. We therefore have a new test module, `android-test`.
      
      A consequence of using Dagger 2 is that we no longer have a view injector and I therefore had to replace those with manual references. 
      
      Closes #247 
      
      See merge request !118
      c2a1cc1e
  10. Mar 14, 2016
Loading