Skip to content

Commit

Permalink
Merge branch 'release-1.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
markormesher committed Jun 2, 2016
2 parents 2c481c9 + 2876315 commit 2ef357c
Show file tree
Hide file tree
Showing 5 changed files with 9,299 additions and 8 deletions.
11 changes: 10 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,15 @@ The view `v` passed in the callback can be safely cast to `FloatingActionButton`

:warning: See the note below on [click action priority](#note-click-action-priority).

### Accessing FAB Views

Some of the component views that make up the FAB can be accessed (useful for positioning [tooltips](https://github.com/markormesher/android-tooltips)) using the following methods:

|Method | Description|
|:--- | :---|
|`RelativeLayout getFabContainer()` | Gets the container layout used for the whole FAB arrangement.|
|`CardView getCardView()` | Gets the `CardView` used for the actual "button" of the FAB.|

### Speed-Dial Menus

The speed-dial menu can be enabled by creating a class that extends `SpeedDialMenuAdapter` and then calling `setAdapter(...)` on the FAB.
Expand All @@ -109,7 +118,7 @@ If the state or functionality has changed such that `getCount()` or `getViews(..

:warning: See the note below on [click action priority](#note-click-action-priority).

#### State Change Listeners
### Speed-Dial State Change Listeners

Two state change listeners are provided to monitor when the speed-dial menu opens or closes. These can be used as follows:

Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ buildscript {
}

def version = new Properties()
version['code'] = 8
version['name'] = '1.2.0'
version['code'] = 9
version['name'] = '1.2.1'

def secrets = getSecrets()

Expand Down
4 changes: 2 additions & 2 deletions fab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ buildscript {
}

def version = new Properties()
version['code'] = 8
version['name'] = '1.2.0'
version['code'] = 9
version['name'] = '1.2.1'

apply plugin: 'me.tatarka.retrolambda'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ public FloatingActionButton(Context context, AttributeSet attrs, int defStyleAtt
initView();
}

/*=======*
* Views *
*=======*/
/*==============*
* View Control *
*==============*/

private RelativeLayout fabContainer;
private CardView cardView;
Expand Down Expand Up @@ -209,6 +209,26 @@ public boolean isShown() {
return shown;
}

/*================*
* View Accessors *
*================*/

/**
* Gets the container layout used for the whole FAB arrangement.
* @return the container layout used for the whole FAB arrangement
*/
public RelativeLayout getFabContainer() {
return fabContainer;
}

/**
* Gets the {@code CardView} used for the actual "button" of the FAB.
* @return the {@code CardView} used for the actual "button" of the FAB
*/
public CardView getCardView() {
return cardView;
}

/*=============*
* Interaction *
*=============*/
Expand Down
Loading

0 comments on commit 2ef357c

Please sign in to comment.