Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Proposal for an Android Studio branch; a trial migration to Android Studio project, Gradle. #279

Open
wants to merge 34 commits into
base: master
Choose a base branch
from
Open

Proposal for an Android Studio branch; a trial migration to Android Studio project, Gradle. #279

wants to merge 34 commits into from

Commits on Jan 5, 2015

  1. Imported and converted the original Eclipse project into an Android 

    Studio project using Android Studio.

Compiles and runs after manual compilation of NDK sources.
    @liquiddandruff
    liquiddandruff committed Jan 5, 2015
    Configuration menu
    Copy the full SHA
    a837c97 View commit details
    Browse the repository at this point in the history

  2. Updated .gitignore 

    Added .iml files
    @liquiddandruff
    liquiddandruff committed Jan 5, 2015
    Configuration menu
    Copy the full SHA
    15a7661 View commit details
    Browse the repository at this point in the history

  3. Removed erroneous digit from project name (remnant from auto-conversion) 

    Updated .gitignore
Untracked newly ignored files/directories
    @liquiddandruff
    liquiddandruff committed Jan 5, 2015
    Configuration menu
    Copy the full SHA
    932c1e3 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2015

  1. Tell lint not to check release builds.

    @liquiddandruff
    liquiddandruff committed Jan 6, 2015
    Configuration menu
    Copy the full SHA
    bb9e1fe View commit details
    Browse the repository at this point in the history

  2. Ignore apk and txt files

    @liquiddandruff
    liquiddandruff committed Jan 6, 2015
    Configuration menu
    Copy the full SHA
    a9ae8ba View commit details
    Browse the repository at this point in the history

  3. Append port to path when downloading books from 

    multiple servers on same ip.
    @liquiddandruff
    liquiddandruff committed Jan 6, 2015
    Configuration menu
    Copy the full SHA
    e5db27f View commit details
    Browse the repository at this point in the history

  4. Assured .idea/ was not needed for successfull build, ignored more gra… 

    …dle build files
    @liquiddandruff
    liquiddandruff committed Jan 6, 2015
    Configuration menu
    Copy the full SHA
    c32425b View commit details
    Browse the repository at this point in the history

  5. Cleaned ignored files

    @liquiddandruff
    liquiddandruff committed Jan 6, 2015
    Configuration menu
    Copy the full SHA
    7adf1f7 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2015

  1. Re-add TODOs from upstream

    @liquiddandruff
    liquiddandruff committed Jan 7, 2015
    Configuration menu
    Copy the full SHA
    b8bd2d4 View commit details
    Browse the repository at this point in the history

  2. Re-add help/ from upstream

    @liquiddandruff
    liquiddandruff committed Jan 7, 2015
    Configuration menu
    Copy the full SHA
    ae19456 View commit details
    Browse the repository at this point in the history

  3. Ignore the generated help epubs

    @liquiddandruff
    liquiddandruff committed Jan 7, 2015
    Configuration menu
    Copy the full SHA
    99228ff View commit details
    Browse the repository at this point in the history

  4. Make note for help epub generation

    @liquiddandruff
    liquiddandruff committed Jan 7, 2015
    Configuration menu
    Copy the full SHA
    26aee8a View commit details
    Browse the repository at this point in the history

  5. Add README, show import-summary

    @liquiddandruff
    liquiddandruff committed Jan 7, 2015
    Configuration menu
    Copy the full SHA
    3528745 View commit details
    Browse the repository at this point in the history

  6. SYNCED with upstream/master 446ab1e

    @liquiddandruff
    liquiddandruff committed Jan 7, 2015
    Configuration menu
    Copy the full SHA
    0d3cc2f View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2015

  1. Updated README with build instructions, removed comments from build.g… 

    …radle
    @liquiddandruff
    liquiddandruff committed Jan 8, 2015
    Configuration menu
    Copy the full SHA
    0b6d16c View commit details
    Browse the repository at this point in the history

  2. Updated README

    @liquiddandruff
    liquiddandruff committed Jan 8, 2015
    Configuration menu
    Copy the full SHA
    3e47275 View commit details
    Browse the repository at this point in the history

  3. Fixes geometer#140, needs cleanup

    @liquiddandruff
    liquiddandruff committed Jan 8, 2015
    Configuration menu
    Copy the full SHA
    1c2f147 View commit details
    Browse the repository at this point in the history

  4. Double-checking

    @liquiddandruff
    liquiddandruff committed Jan 8, 2015
    Configuration menu
    Copy the full SHA
    b9d04fd View commit details
    Browse the repository at this point in the history

  5. Cleanup, comments

    @liquiddandruff
    liquiddandruff committed Jan 8, 2015
    Configuration menu
    Copy the full SHA
    5d071e3 View commit details
    Browse the repository at this point in the history

  6. More cleanup

    @liquiddandruff
    liquiddandruff committed Jan 8, 2015
    Configuration menu
    Copy the full SHA
    076d2c3 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2015

  1. Fluid backbutton longpress geometer#269

    @liquiddandruff
    liquiddandruff committed Jan 9, 2015
    Configuration menu
    Copy the full SHA
    b987e1e View commit details
    Browse the repository at this point in the history

  2. Implement go to previous book action geometer#269

    @liquiddandruff
    liquiddandruff committed Jan 9, 2015
    Configuration menu
    Copy the full SHA
    445bd77 View commit details
    Browse the repository at this point in the history

  3. Clean up

    @liquiddandruff
    liquiddandruff committed Jan 9, 2015
    Configuration menu
    Copy the full SHA
    8910503 View commit details
    Browse the repository at this point in the history

  4. Implement go to library actions, cleanup

    @liquiddandruff
    liquiddandruff committed Jan 9, 2015
    Configuration menu
    Copy the full SHA
    5cb2e40 View commit details
    Browse the repository at this point in the history

  5. Correct indentation, cleanup

    @liquiddandruff
    liquiddandruff committed Jan 9, 2015
    Configuration menu
    Copy the full SHA
    2f7d0d0 View commit details
    Browse the repository at this point in the history

  6. Update README.md

    @liquiddandruff
    liquiddandruff committed Jan 9, 2015
    Configuration menu
    Copy the full SHA
    96b044c View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2015

  1. Merged back_button_long_perss_269, preference action

    @liquiddandruff
    liquiddandruff committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    ec02a98 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'android_studio' of github.com:liquiddandruff/FBReaderJ … 

    …into android_studio
    @liquiddandruff
    liquiddandruff committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    596bc3e View commit details
    Browse the repository at this point in the history

  3. SYNCED with upstream/master ea88a4e

    @liquiddandruff
    liquiddandruff committed Jan 10, 2015
    Configuration menu
    Copy the full SHA
    7e0292a View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2015

  1. SYNCED with upstream/master f1291f2

    @liquiddandruff
    liquiddandruff committed Jan 13, 2015
    Configuration menu
    Copy the full SHA
    36ae6c9 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2015

  1. SYNCED with upstream/master a0361de

    @liquiddandruff
    liquiddandruff committed Feb 16, 2015
    Configuration menu
    Copy the full SHA
    8418e67 View commit details
    Browse the repository at this point in the history

  2. Add utility script to convert diffs from upstream/master to Android S… 

    …tudio paths
    @liquiddandruff
    liquiddandruff committed Feb 16, 2015
    Configuration menu
    Copy the full SHA
    77d668d View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2016

  1. add docs

    @liquiddandruff
    liquiddandruff committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    94ceca5 View commit details
    Browse the repository at this point in the history

  2. attempt to update converter script

    @liquiddandruff
    liquiddandruff committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    7ddccff View commit details
    Browse the repository at this point in the history