Use FAB from support design library

pull/281/head
Alex Baker 9 years ago
parent 9dccfc05d5
commit 7726472a02

1
.gitignore vendored

@ -4,3 +4,4 @@
build/
*.apk
local.properties
Thumbs.db

@ -88,8 +88,7 @@ dependencies {
compile group: 'com.jakewharton', name: 'butterknife', version: '6.0.0'
compile group: 'com.android.support', name: 'support-v4', version: '22.1.1'
compile group: 'com.android.support', name: 'appcompat-v7', version: '22.1.1'
compile group: 'com.android.support', name: 'design', version: '22.2.0'
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.7'
compile group: 'joda-time', name: 'joda-time', version: '2.6', transitive: false
@ -97,13 +96,11 @@ dependencies {
compile group: 'com.rubiconproject.oss', name: 'jchronic', version: '0.2.6', transitive: false
compile group: 'org.scala-saddle', name: 'google-rfc-2445', version: '20110304', transitive: false
compile group: 'net.i2p.android.ext', name: 'floatingactionbutton', version: '1.8.0'
compile (group: 'com.github.flavienlaurent.datetimepicker', name: 'library', version: '0.0.2') {
exclude group: 'com.android.support', module: 'support-v4'
}
googleplayCompile group: 'com.google.android.gms', name: 'play-services-location', version: '7.3.0'
googleplayCompile group: 'com.google.android.gms', name: 'play-services-location', version: '7.5.0'
compile(group: 'com.google.apis', name: 'google-api-services-tasks', version: 'v1-rev33-1.18.0-rc') {
exclude group: 'org.apache.httpcomponents', module: 'httpclient'

Binary file not shown.

After

Width:  |  Height:  |  Size: 256 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 320 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 405 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 222 B

@ -4,7 +4,6 @@
** See the file "LICENSE" for the full license governing this code.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:fab="http://schemas.android.com/apk/res-auto"
android:id="@+id/taskListParent"
android:background="?attr/asContentBackground"
android:layout_width="fill_parent"
@ -16,17 +15,14 @@
<!-- Body goes here -->
<net.i2p.android.ext.floatingactionbutton.AddFloatingActionButton
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:src="?attr/fab_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
fab:fab_colorNormal="?attr/fab_background"
fab:fab_colorPressed="?attr/fab_background_pressed"
fab:fab_plusIconColor="?attr/fab_plus"
fab:fab_stroke_visible="false"
android:layout_marginBottom="16dp"
android:layout_marginRight="16dp"
android:layout_marginEnd="16dp" />

@ -48,9 +48,7 @@
<attr name="drawer_text" format="color"/>
<attr name="importance_background_selected" format="reference"/>
<attr name="asFilterRowSelected" format="reference"/>
<attr name="fab_background" format="color" />
<attr name="fab_background_pressed" format="color" />
<attr name="fab_plus" format="color" />
<attr name="fab_icon" format="reference"/>
<declare-styleable name="DateAndTimePicker">
<attr name="shortcutLabels" format="reference" />

@ -8,7 +8,7 @@
<style name="Tasks" parent="AppThemeBase">
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primary_dark</item>
<!--<item name="colorAccent">@android:color/holo_purple</item>-->
<item name="colorAccent">@color/primary</item>
<item name="android:windowBackground">@android:color/white</item>
<item name="asDueDateOverdueColor">#ee5555</item>
@ -63,15 +63,13 @@
<item name="ic_action_alarm">@drawable/ic_action_alarm</item>
<item name="ic_action_reload">@drawable/ic_action_reload</item>
<item name="ic_action_calendar_month">@drawable/ic_action_calendar_month</item>
<item name="fab_background">?attr/asAbBackgroundColor</item>
<item name="fab_background_pressed">#476472</item>
<item name="fab_plus">@android:color/white</item>
<item name="fab_icon">@drawable/ic_action_add_light</item>
</style>
<style name="Tasks.Dark">
<item name="colorPrimary">@android:color/black</item>
<item name="colorPrimaryDark">@android:color/black</item>
<item name="colorAccent">@android:color/white</item>
<item name="android:windowBackground">@android:color/black</item>
<item name="drawer_background">@color/drawer_background_dark</item>
<item name="drawer_background_selected">@color/drawer_background_selected_dark</item>
@ -99,10 +97,7 @@
<item name="ic_action_calendar_month">@drawable/ic_action_calendar_month_white</item>
<item name="ic_action_cancel">@drawable/ic_action_cancel_white</item>
<item name="asDueDateColor">#c3c3c3</item>
<item name="fab_background">@android:color/white</item>
<item name="fab_background_pressed">#e6e6e6</item>
<item name="fab_plus">@android:color/black</item>
<item name="fab_icon">@drawable/ic_action_add_black</item>
</style>
<style name="TasksDialog" parent="@android:style/Theme.Dialog">
@ -171,7 +166,7 @@
<item name="android:background">#323331</item>
</style>
<style name="ReminderDialog" parent="@android:style/Theme.Dialog">
<style name="ReminderDialog" parent="Theme.AppCompat.Dialog">
<item name="android:windowFrame">@null</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowBackground">@drawable/reminder_dialog_inset_background</item>

Loading…
Cancel
Save