Skip to content

Commit 8187528

Browse files
authored
Merge pull request #137 from leinardi/feature/#11-fab-size
Feature/#11 fab size
2 parents 663b18e + 06212cd commit 8187528

File tree

4 files changed

+23
-61
lines changed

4 files changed

+23
-61
lines changed

.idea/codeStyles/Project.xml

Lines changed: 15 additions & 56 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# Change Log
2+
## [3.2.0] - 2019-09-10
3+
- Fix #11: Re-enabling FAB size
4+
25
## [3.1.0] - 2019-09-10
36
- fixed #113: Main FAB opened image is not centered when using Theme.MaterialComponents
4-
- fixed #101: Add ability to Disable Main Fab"
7+
- fixed #101: Add ability to Disable Main Fab
58
- API changes:
69
- fixed #111: added option to tint Main FAB icon (`setMainFabClosedIconColor()` and `setMainFabOpenedIconColor()`)
710
- migrated Sample project to Kotlin

library/src/main/java/com/leinardi/android/speeddial/SpeedDialActionItem.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,8 @@ public FabWithLabelView createFabWithLabelView(Context context) {
147147
return fabWithLabelView;
148148
}
149149

150-
// Disabled due to https://issuetracker.google.com/issues/77303906
151150
@FloatingActionButton.Size
152-
/* public */ int getFabSize() {
151+
public int getFabSize() {
153152
return mFabSize;
154153
}
155154

@@ -271,8 +270,7 @@ public SpeedDialActionItem create() {
271270
return new SpeedDialActionItem(this);
272271
}
273272

274-
// Disabled due to https://issuetracker.google.com/issues/77303906
275-
/* public */ Builder setFabSize(@FloatingActionButton.Size int fabSize) {
273+
public Builder setFabSize(@FloatingActionButton.Size int fabSize) {
276274
mFabSize = fabSize;
277275
return this;
278276
}

sample/src/main/java/com/leinardi/android/speeddial/sample/MainActivity.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import android.view.Menu
2424
import android.view.MenuItem
2525
import androidx.appcompat.content.res.AppCompatResources
2626
import androidx.core.content.res.ResourcesCompat
27+
import com.google.android.material.floatingactionbutton.FloatingActionButton
2728
import com.leinardi.android.speeddial.SpeedDialActionItem
2829
import com.leinardi.android.speeddial.SpeedDialView
2930
import com.leinardi.android.speeddial.sample.usecases.BaseUseCaseActivity
@@ -64,6 +65,7 @@ class MainActivity : BaseUseCaseActivity() {
6465

6566
speedDialView.addActionItem(SpeedDialActionItem.Builder(R.id.fab_long_label, R.drawable
6667
.ic_lorem_ipsum)
68+
.setFabSize(FloatingActionButton.SIZE_NORMAL)
6769
.setLabel("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor " +
6870
"incididunt ut labore et dolore magna aliqua.")
6971
.create())

0 commit comments

Comments
 (0)