Skip to content
This repository was archived by the owner on Sep 16, 2019. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1880 commits
Select commit Hold shift + click to select a range
7e2658d
Use ic_menu_alarm and change it's colour to white
kaaholst Sep 26, 2019
93e7be2
Don't use vector drawable for the undo bar
kaaholst Sep 27, 2019
488086b
Merge branch 'develop' into json
kaaholst Oct 1, 2019
b8d93ee
Prepare for release 1.5.3.
kaaholst Sep 28, 2019
d558a30
Merge branch 'release-1.5.3'
kaaholst Oct 4, 2019
e27318e
Merge branch 'release-1.5.3' into develop
kaaholst Oct 4, 2019
91e0a73
Merge branch 'develop' into json
kaaholst Oct 4, 2019
8d51d1d
Upgrade gradle plugin
kaaholst Oct 7, 2019
549b17d
Migrate to AndroidX
kaaholst Oct 8, 2019
9f264fa
disconnect in onTaskRemoved
kaaholst Oct 11, 2019
f1c2bc3
Call startForeground immediately after startForegroundService
kaaholst Oct 11, 2019
08edd91
Artist - Album for notifications
kaaholst Oct 17, 2019
0ff22c9
Disconnect button in notification
kaaholst Oct 18, 2019
6803887
Merge branch 'develop' into json
kaaholst Oct 18, 2019
1672961
Restore disconnect icon
kaaholst Oct 19, 2019
7197905
Discopnnect button for pre lollipop notifications
kaaholst Oct 22, 2019
98dc9d1
Merge branch 'develop' into json
kaaholst Oct 22, 2019
2eab8cf
Add settings and advanced settings nodes
kaaholst Oct 28, 2019
2717f12
Prepare for release 1.5.4
kaaholst Oct 23, 2019
d0131d0
Merge branch 'release-1.5.4'
kaaholst Oct 28, 2019
4d3d425
Merge branch 'release-1.5.4' into develop
kaaholst Oct 28, 2019
18c5b52
Merge branch 'develop' into json
kaaholst Oct 28, 2019
a832e86
Home menu items follows display settings
kaaholst Nov 1, 2019
c015cd5
cleanup
kaaholst Nov 4, 2019
2f79617
Add French translation
kaaholst Nov 5, 2019
94dee46
Ignore lint ImpliedQuantity
kaaholst Nov 6, 2019
4143721
Merge branch 'develop' into json
kaaholst Nov 6, 2019
338755f
Remove unsused resources
kaaholst Nov 8, 2019
fe82123
Fix bug from remove resources
kaaholst Nov 8, 2019
fa72d1d
Danish translations
kaaholst Nov 8, 2019
785469d
Vector drawables - WIP
kaaholst Nov 12, 2019
4078d03
Undo button as vector drawable
kaaholst Nov 12, 2019
348dc4a
Vector drawables for pre API 22
kaaholst Nov 13, 2019
7af5bc4
Use app:srcCompat
kaaholst Nov 13, 2019
17ef56c
Use drawableLeftCompat
kaaholst Nov 13, 2019
1890432
Fix android:gravity=center bug on pre API 22
kaaholst Nov 16, 2019
964ce13
Workaround a bug in WebView on appcompat 1.1.0 API 21
kaaholst Nov 16, 2019
00afb7b
Don't use AppCompatDelegate.setCompatVectorFromResourcesEnabled
kaaholst Nov 16, 2019
40c88da
cleanup
kaaholst Nov 16, 2019
e7e7e7d
Remove Util.setAlpha
kaaholst Nov 16, 2019
7a7e3d6
Move theme settings to View menu
kaaholst Nov 17, 2019
c237f03
Set list style in onResume
kaaholst Nov 18, 2019
37caa78
Support menu status messages
kaaholst Nov 25, 2019
2a14120
Fix register pages in onItemsReceived
kaaholst Nov 29, 2019
40edbf1
Upgrade gradle plugin
kaaholst Nov 29, 2019
9fe1d6a
Support choice items
kaaholst Dec 1, 2019
f2064ed
Do not post volume change the first time volume is
kaaholst Dec 1, 2019
95a55b4
HttpUrlConnection follow redirect
kaaholst Dec 2, 2019
0099b9c
Move view settings to slim settings menu
kaaholst Dec 3, 2019
6c0ad8c
Remove unused server strings
kaaholst Dec 7, 2019
8f664d0
Embed server strings
kaaholst Dec 9, 2019
0689c22
Grid layout now default for normal size screen
kaaholst Dec 11, 2019
dd1c843
Create android.yml
kaaholst Dec 11, 2019
c1112d9
Merge branch 'develop' into json
kaaholst Dec 11, 2019
deb6400
Support Window icon
kaaholst Dec 13, 2019
765a964
Default theme is now DARK
kaaholst Dec 13, 2019
4d3e925
Don't show connect dialog on login completed
kaaholst Dec 15, 2019
a64171e
Remove obsolete connection states
kaaholst Dec 16, 2019
f07a70d
Move home menu to connection state
kaaholst Dec 18, 2019
2a8c695
Add missing home menu icons
kaaholst Dec 19, 2019
25a8d58
Use <item_fields>.<window_fields>.<icon_id|icon>
kaaholst Dec 21, 2019
1336e5e
Override server based window style to PLAY_LIST
kaaholst Dec 22, 2019
210428e
Retain top level window when activity is recreated
kaaholst Dec 23, 2019
00eb627
Use server based window styles
kaaholst Dec 26, 2019
db6adbd
Show parent view
kaaholst Dec 27, 2019
da233ad
Properly retain UI state on activity recreate
kaaholst Dec 28, 2019
490efe9
Split multi line slim item text
kaaholst Dec 28, 2019
c3001a4
Remove crashlytics
kaaholst Dec 29, 2019
da6a870
Remove google analytics
kaaholst Dec 29, 2019
197015d
Upgrade gradle plugin
kaaholst Dec 29, 2019
a44492c
Upgrade 3 party libraries
kaaholst Dec 29, 2019
f5df8da
Bump min SDK version to 19 - Android 4.4
kaaholst Dec 29, 2019
d567b05
Context menu icon is now the overflow menu icon
kaaholst Dec 30, 2019
0849e92
Fix AlarmSettingsDialog on activity recreate
kaaholst Jan 1, 2020
2adb151
Remove obsolete connect menu item and button
kaaholst Jan 1, 2020
9fe1418
Reconnect to mysqueezebox.com after registration
kaaholst Jan 7, 2020
1ff2c0f
Discover http port of local servers
kaaholst Jan 11, 2020
191f7fc
Remove info icon from connection error message
kaaholst Jan 13, 2020
b7256a4
Make pixel density specific artwork for
kaaholst Jan 13, 2020
4bb0e3d
Fix artwork background
kaaholst Jan 13, 2020
40f6307
Implement checkbox field of item including
kaaholst Jan 14, 2020
1c1ef57
Parcel checkbox fields of Item
kaaholst Jan 14, 2020
4d6340d
Implement radio field of item
kaaholst Jan 16, 2020
10109a2
cleanup
kaaholst Jan 16, 2020
605d4f9
Implement slider items
kaaholst Jan 20, 2020
4576865
Vector drawables for av icons
kaaholst Jan 21, 2020
29d2d1d
Implement Input.initialText
kaaholst Jan 22, 2020
d5a4bf4
Switch from ContextMenu to PopupMenu
kaaholst Jan 29, 2020
421d582
Input type time
kaaholst Feb 4, 2020
8217abb
Move AlarmSettingsDialog to itemlist package
kaaholst Feb 5, 2020
8e31311
Disable context menu in NowPlayingFragment when
kaaholst Feb 7, 2020
345aba5
Enable extras menu
kaaholst Feb 8, 2020
36fb115
Use runOnUiThread instead of our own Handler
kaaholst Feb 8, 2020
7ab4869
Radial Volume Panel
kaaholst Feb 11, 2020
24feed0
VolumePanel and current playlist from Now Playing
kaaholst Feb 14, 2020
da2ec1c
Don't show the item to go to players if in PlayersActivity
kaaholst Feb 14, 2020
a4de3e0
VolumeBar reset timeout on touch movement
kaaholst Feb 14, 2020
c008d10
Vector graphics
kaaholst Feb 15, 2020
11157a7
Merge branch 'develop' into radial_volume_panel
kaaholst Feb 15, 2020
7b8c5e4
Versioncode 72
kaaholst Feb 15, 2020
d225444
Slide up now playing and current playlist activities
kaaholst Feb 16, 2020
615aa6a
Versioncode 72
kaaholst Feb 15, 2020
d86a687
Style Volume Panel
kaaholst Feb 16, 2020
b9188f3
VolumeBar dont timeout when trscking touch
kaaholst Feb 16, 2020
1b66b98
Fix now playing layout
kaaholst Feb 17, 2020
9ec5525
Prepare for release 2.0.0
kaaholst Nov 6, 2019
09fe89e
Merge branch 'release-2.0.0'
kaaholst Feb 18, 2020
3c607ab
Merge branch 'master' into develop
kaaholst Feb 18, 2020
02770e4
Merge branch 'develop' into radial_volume_panel
kaaholst Feb 18, 2020
0c3b312
Option to easy switch between list and grid layouts
kaaholst Feb 18, 2020
b14cc1f
Make sure the option to switch list layout reflects
kaaholst Feb 19, 2020
ee4acc5
Fix bug in the previous commit
kaaholst Feb 19, 2020
efd70dc
Merge branch 'develop' into radial_volume_panel
kaaholst Feb 19, 2020
8e2bd28
Ignore icon based showBrieflies in NowPlayingActivity
kaaholst Feb 19, 2020
672d1ad
Handle invalid server address
kaaholst Feb 22, 2020
165b249
Substitute FloatLabelLayout with material design
kaaholst Feb 22, 2020
536d4a1
NPE protect open context menu in NowPlayingFragment
kaaholst Feb 22, 2020
38cacbd
Enable crossfade on image cache fade in
kaaholst Feb 24, 2020
52b7fa2
Move hint to TextInputLayout
kaaholst Feb 26, 2020
5f6ea3e
Add Host request-header field
kaaholst Feb 27, 2020
f19b27d
Show next and play buttons in notification
kaaholst Feb 27, 2020
04ee4bd
Cancel pending LMS requests in onPause
kaaholst Mar 1, 2020
fd00481
Fix leaked window exception
kaaholst Mar 1, 2020
ea729f0
Seperate list laypout settings for home menu items
kaaholst Mar 1, 2020
19adeb3
Move theme settings to preferences
kaaholst Mar 2, 2020
0d020c2
Update README.md
kaaholst Mar 2, 2020
d63f5ba
Prepare for release 2.0.1.
kaaholst Mar 3, 2020
2382a43
Merge branch 'develop' into radial_volume_panel
kaaholst Mar 3, 2020
d62d82f
Merge branch 'release-2.0.1'
kaaholst Mar 3, 2020
86ce9d0
Merge branch 'release-2.0.1' into develop
kaaholst Mar 3, 2020
356e143
Merge branch 'develop' into radial_volume_panel
kaaholst Mar 3, 2020
ad09a72
Upgrade gradle and build tools
kaaholst Mar 4, 2020
6246377
Merge branch 'develop' into radial_volume_panel
kaaholst Mar 7, 2020
6b02be3
Go back to list layout for normal size screen
kaaholst Mar 7, 2020
026adac
Merge branch 'radial_volume_panel' into develop
kaaholst Mar 7, 2020
2305259
Remove players and alarm menu items from ActionBar
kaaholst Mar 7, 2020
a133276
Slightly faster animations for now playoing and
kaaholst Mar 8, 2020
17d4cde
Globalsearch shortcut in ActionBar
kaaholst Mar 10, 2020
0fbbc9c
Restore download framework
kaaholst Mar 12, 2020
28283f3
Support mapping of the go action and
kaaholst Mar 15, 2020
7a6b8d3
Fix the _quantity action parameter
kaaholst Mar 19, 2020
a69098f
Handle isContextMenu like squeezeplay
kaaholst Mar 20, 2020
76bfbd5
Properly handle home menu vs browse item layouts
kaaholst Mar 21, 2020
7975f69
Show secondary parent text in header
kaaholst Mar 21, 2020
e4515c4
Swipe down to dismiss now playing screen
kaaholst Mar 22, 2020
3efb764
Remove PARENT_ACTIVITY meta data from the manifest
kaaholst Mar 22, 2020
0ef1c19
Now playing and current playlist navigation
kaaholst Mar 23, 2020
a908853
Use home icon as action bar home icon
kaaholst Mar 23, 2020
1ecfb6d
Restore download url
kaaholst Mar 25, 2020
7a0ec55
Merge branch 'develop' into download
kaaholst Mar 27, 2020
4eb9109
Move server strings to own files
kaaholst Mar 28, 2020
b868785
WIP - Implement player preferences
kaaholst Apr 1, 2020
18957b9
Make sure events are posted at the intended rate
kaaholst Apr 1, 2020
d0d27dc
Replace the deprecated AsyncTask
kaaholst Apr 4, 2020
2b94ee6
Slightly increase timeout scanning for servers
kaaholst Apr 4, 2020
35e282c
Update player state and post event if
kaaholst Apr 4, 2020
1b5f0de
Fix option dialog with long texts
kaaholst Apr 6, 2020
af0afc6
Mark untranslatable strings
kaaholst Apr 12, 2020
d15a703
Update support info
kaaholst Apr 13, 2020
b7db017
versioncode 75
kaaholst Apr 14, 2020
d477f95
Image for button for input field follows app theme
kaaholst Apr 14, 2020
77737cb
Refresh button for server scan follows app theme
kaaholst Apr 14, 2020
921efb1
Fix warning from pre-launch report
kaaholst Apr 17, 2020
da08155
Material themes
kaaholst Apr 18, 2020
d94ebd1
Theme ActionBar
kaaholst Apr 25, 2020
b3513f0
Custom view for action bar
kaaholst Apr 26, 2020
562bd03
Elevated ActionBar for dark theme
kaaholst Apr 26, 2020
e6b1df1
Merge branch 'develop' into download
kaaholst Apr 27, 2020
3cd245f
Upgrade gradle plugin
kaaholst Apr 27, 2020
c270080
Merge branch 'develop' into download
kaaholst Apr 27, 2020
730cd15
Prepare for release 2.1.0.
kaaholst Apr 12, 2020
08cb44a
color theming
kaaholst May 2, 2020
c75ca99
versionCode 82
kaaholst May 2, 2020
808e095
Theme volume panel
kaaholst May 3, 2020
c66deec
getDimensionPixelSize instead of getDisplayMetrics
kaaholst May 3, 2020
8bd3d71
Merge branch 'develop' into download
kaaholst May 3, 2020
862cade
Vector graphics and theme attributes
kaaholst May 6, 2020
241f107
Victor graphics
kaaholst May 9, 2020
42fe6d0
Merge branch 'release-2.1.0'
kaaholst May 9, 2020
8f112b5
Different insets for item graphics
kaaholst May 12, 2020
8e2a0e8
Victor graphics
kaaholst May 13, 2020
4b2ee7f
Merge branch 'release-2.1.0' into develop
kaaholst May 13, 2020
0942292
Merge branch 'develop' into download
kaaholst May 13, 2020
2ea4d45
Handle global current playlist actions local
kaaholst May 16, 2020
129ef9f
Download of current playlist items
kaaholst May 23, 2020
6d4b26e
Remove test code to fetch menu items recursively
kaaholst May 23, 2020
8a8175f
Remove redundant substring parameter
kaaholst May 23, 2020
44bab39
Move download command to Item
kaaholst May 25, 2020
aa1a332
Refactor to reflect we use SqueezePlay interface
kaaholst May 26, 2020
6d925f2
Unify slim command handling in SlimCommand
kaaholst May 26, 2020
a5ed14e
Use icon_album_noart as default icon for now
kaaholst May 27, 2020
8d1c617
Fix sw600dp/now_playing_fragment_mini
kaaholst May 29, 2020
d12c00b
Upgrade gradle plugin
kaaholst Jun 1, 2020
30e5b82
configure java 8 support
kaaholst Jun 1, 2020
9873146
Substitute some anonymous implementations with
kaaholst Jun 1, 2020
d259c49
Fix sw600dp/now_playing_fragment_mini
kaaholst May 29, 2020
ba9bc72
Configure multidex for api < 21
kaaholst Jun 3, 2020
3e0f946
Set volume panel background colors in code
kaaholst Jun 3, 2020
9cbd2f1
Merge branch 'nik_develop' into develop
kaaholst Jun 3, 2020
e0e5be3
Added home screen widget; refactored ItemView/Activity to reuse on co…
idontusenumbers May 27, 2020
a38568d
Moved the remote button images to the java side; updated to upstream …
idontusenumbers Jun 6, 2020
588b30f
Fix processing of partial JSON payloads from LMS
syphr42 Jun 7, 2020
21985f2
Added preset buttons to widget
idontusenumbers Jun 6, 2020
c2cf39a
Refactored remote so buttons are customizable
idontusenumbers Jun 8, 2020
3779c2d
Merge branch 'idontusenumbers-add-homescreen-widget' into develop
kaaholst Jun 10, 2020
19577d7
Merge pull request #644 from syphr42/fix-partial-data-error
kaaholst Jun 10, 2020
caa2cf4
Move tint from vector drawable to style
kaaholst Jun 16, 2020
39909a4
remove getTag
kaaholst Jun 17, 2020
95d9c84
Support download of myMusic
kaaholst Jun 20, 2020
a64c3dd
Parcelable downloadAction so we can access it
kaaholst Jun 22, 2020
6fe28eb
Fixed minor typo of headings in privacy policy
sjalander Jul 9, 2020
ccb5020
Support scoped storage for download
kaaholst Aug 6, 2020
7a12e40
Trottle download requests
kaaholst Aug 10, 2020
7b97eff
Merge pull request #646 from sjalander/topic/privacy-policy
kaaholst Aug 17, 2020
b92a63f
Move common player menu items to playermenu.xml
kaaholst Aug 19, 2020
5812bad
Cleanup SqueezeService.java
kaaholst Aug 19, 2020
f9434cf
Cleanup NowPlayingFragment.java
kaaholst Aug 19, 2020
c19414b
Support resizeableActivity
kaaholst Aug 31, 2020
aa75bae
Support Right to Left Layout
kaaholst Aug 31, 2020
9cd95b1
Localized toasts for player not found for
kaaholst Sep 2, 2020
917ab33
Home screen widget auto connect to server
kaaholst Sep 3, 2020
f662df3
Widget - Shortcuts for NowPlaying and current playlist
kaaholst Sep 4, 2020
5b4b4af
Widget button select activity follows app theme
kaaholst Sep 4, 2020
5384b77
widget - fix Danish translations
kaaholst Sep 4, 2020
78207bb
Autoconnect if not manually disconnected
kaaholst Sep 6, 2020
406a915
Larger cover art on Now Playing layout
kaaholst Sep 6, 2020
1f30e90
versioncode 83
kaaholst Sep 7, 2020
9ca0077
Smaller cover art on Now Playing for small screens
kaaholst Sep 7, 2020
9dc5c12
Prepare for release 2.2.0.
kaaholst Sep 6, 2020
b843659
Merge branch 'release-2.2.0'
kaaholst Sep 12, 2020
7b1b0b6
Merge branch 'release-2.2.0' into develop
kaaholst Sep 12, 2020
3dfb32d
Change page size and remove the initial loading of
kaaholst Sep 24, 2020
953e6f8
Download confirmation and option to disable downloads
kaaholst Sep 28, 2020
ffad423
Use RecyclerView.ViewHolder
kaaholst Sep 8, 2020
81994cf
Unselect other radio buttons
kaaholst Oct 5, 2020
4026c6a
Fix possible NPE in JiveItem.getTitlesParams
kaaholst Oct 18, 2020
c4d7244
Current playlist control
kaaholst Oct 20, 2020
15c817c
Fix possible NPE showing async context menu
kaaholst Oct 21, 2020
7989405
Fix reported index error in OnItemSelectedListener
kaaholst Oct 21, 2020
f37f7ff
Fix possible NPE in OnSwipeListener
kaaholst Oct 24, 2020
811dc60
Fix bug in Reflection.genericTypeResolver
kaaholst Sep 15, 2020
fa2167b
Upgrade gradle, build tools and dependencies
kaaholst Oct 25, 2020
d92cff5
Version code 85
kaaholst Oct 25, 2020
551544e
Upgrade play publisher plugin
kaaholst Oct 25, 2020
3d58bf3
Use androidx PrerefenceManager
kaaholst Oct 26, 2020
490efb6
Fix ClassCastException in CurrentPlaylistItemView.onIcon
kaaholst Oct 27, 2020
f9f97f7
Version code 87
kaaholst Oct 29, 2020
e564e55
Add mime type when insert downloaded file into
kaaholst Oct 30, 2020
962b71d
Prepare for release 2.2.1.
kaaholst Oct 24, 2020
0f60349
Merge branch 'release-2.2.1'
kaaholst Nov 8, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 0 additions & 8 deletions .classpath

This file was deleted.

17 changes: 17 additions & 0 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Android CI

on: [push]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- name: set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Build with Gradle
run: ./gradlew build
18 changes: 15 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,22 @@
.\#*
*~
*.apk
build
bin
gen
out
local.properties
build.properties
src/com/danga/squeezer/IServiceCallback.java
src/com/danga/squeezer/ISqueezeService.java
src/com/danga/squeezer/R.java
squeezer.properties
crashlytics.properties
key.json
key.p12
.classpath
/ant.properties
.settings/
*.iml
*.patch
.idea
.gradle
com_crashlytics_export_strings.xml
.directory
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "libs/eventbus"]
path = libs/eventbus
url = https://github.com/yuzeh/EventBus.git
5 changes: 0 additions & 5 deletions .settings/org.eclipse.jdt.core.prefs

This file was deleted.

10 changes: 10 additions & 0 deletions .tx/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[main]
host = https://www.transifex.com

[squeezer.stringsxml]
file_filter = Squeezer/src/main/res/values-<lang>/strings.xml
lang_map = da_DK:da, de_DE:de, en_GB: en-rGB, nl_NL:nl
source_file = Squeezer/src/main/res/values/strings.xml
source_lang = en
type = ANDROID

33 changes: 0 additions & 33 deletions AndroidManifest.xml

This file was deleted.

138 changes: 138 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
# How to contribute

Your contributions to Squeezer are very welcome. Exactly how to do that
depends on what you want to do.

## Reporting bugs and feature requests

Please use the
[issues page](https://github.com/nikclayton/android-squeezer/issues) to
report bugs or suggest new features.

It's appreciated if you take the time to see if someone else has already
reported it, and if so, add a comment to their note.

## Translations

The easiest way to contribute, especially if you are not a programmer,
is to help translate Squeezer's interface in to different languages.

There's more information on how to do that at
[Translating Squeezer](https://github.com/nikclayton/android-squeezer/wiki/Translating-Squeezer).

## Small bug fixes

If you've discovered a bug and want to fix it, or you'd like to have a go
at fixing a bug that's already been reported, please go right ahead.

You can also review the
[list of open bugs](https://github.com/nikclayton/android-squeezer/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+label%3Abug)
if you want inspiration for something to work on.

Please see the [Co-ordination](#Co-ordination) section if you think the
fix is going to be particularly complex, or if it touches lots of
files. The [How to contribute code](#How-to-contribute-code) section
has technical details on how to contribute code.

## Larger features

Contributing larger features to Squeezer is also very welcome. For these
please review the [Co-ordination](#Co-ordination) section, and let us
know what you plan on working on, so we don't end up duplicating too much
effort.

Please see the [How to contribute code](#How-to-contribute-code) section
for technical details.

## Co-ordination

There's a mailing list, android-squeezer@googlegroups.com.

To subscribe, go to the
[web interface](https://groups.google.com/forum/#!forum/android-squeezer).

Say "Hi", and let us know what you'd like to work on.

## How to contribute code

This guide assumes you have already downloaded and installed the Android
SDK, in to a directory referred to as $SDK.

### Fetch the code

Follow [GitHub's instructions](https://help.github.com/articles/fork-a-repo)
for forking the repository.

### Checkout the code

We (roughly) follow the branching model laid out in the
[A successful Git branching model](http://nvie.com/posts/a-successful-git-branching-model/)
blog post.

Specifically:

* The `master` branch is generally kept pristine. No development work
happens here.

* The `develop` branch is for small bug fixes or other cleanups that need
no more than a single commit to complete.

* All other work happens on separate branches, branched from `develop`.

* When those branches are complete and ready for release they are merged on
`develop`.

* New releases are prepared by creating a release branch from `develop` and
working there, before merging changes from the release back to `develop`
and `master`.

### Starting work

Suppose you want to start work on contributing a new feature. After fetching
the repository checkout a new local branch from develop with:

git checkout -b new-branch-name develop

Then work on `new-branch-name`, pushing it up to GitHub as appropriate. Feel
free to have discussions on the mailing list as you're working.

### Keeping up to date with `develop`

As you're working other changes may be happening on the origin `develop`
branch. Please use `git rebase` to pull in changes from `develop` to ensure
your branch is up to date and that the future merge back in to `develop` is
straightforward. To do that (assuming you have no open changes on your
current branch):

```
git checkout develop # Checkout the develop branch
git pull # Fetch the most recent code
git checkout - # Checkout the previous branch
git rebase develop # Rebase current branch from develop
```

### Android Studio configuration

* Run Android Studio

* If you have no projects open then choose "Import project" from the dialog
that appears.

If you already have a project open then choose File > Import Project...

* In the "Select File or Directory to Import" dialog that appears, navigate
to the directory that you fetched the Squeezer source code in to and
select the build.gradle file that ships with Squeezer.

* In the "Import Project from Gradle" dialog tick "Use auto-import" and
make sure that "Use gradle wrapper (recommended)" is selected.

* Copy `ide/intellij/codestyles/AndroidStyle.xml` to Android Studio's config
directory.

- Linux: `~/.AndroidStudioPreview/config/codestyles`
- OS X: `~/Library/Preferences/AndroidStudioPreview/codestyles`
- Windows: `~/.AndroidStudioPreview/config/codestyles`

* Go to Settings (or Preferences in Mac OS X) > Code Style > Java, select
"AndroidStyle", as well as Code Style > XML and select "AndroidStyle".
Loading