wbrawner/PassAndroid
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bump Material Dialogs and JSR305 version

Browse source
This commit is contained in:
ligi 2015-03-08 23:57:11 +01:00
parent 197b1791b0
commit cea1436737
2 changed files with 90 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build.gradle
View file

@ -111,7 +111,7 @@ dependencies {
compile 'com.android.support:cardview-v7:21.0.0'
compile 'com.melnykov:floatingactionbutton:1.2.0'
compile 'com.afollestad:material-dialogs:0.6.3.3'
compile 'com.afollestad:material-dialogs:0.6.3.4'
compile 'org.ligi:AXT:0.33'
compile 'org.ligi:tracedroid:1.4'
@ -119,7 +119,8 @@ dependencies {
compile 'com.squareup.okhttp:okhttp:2.2.0'
compile 'fr.nicolaspomepuy:discreetapprate:2.0.3@aar'
compile 'com.larswerkman:HoloColorPicker:1.4'
compile 'com.google.code.findbugs:jsr305:2.0.1'
compile 'com.google.code.findbugs:jsr305:3.0.0'
androidTestCompile 'com.google.code.findbugs:jsr305:3.0.0'
//compile 'fr.baloomba:viewpagerindicator:2.4.2'
compile('com.mcxiaoke.viewpagerindicator:library:2.4.1') {

176
src/main/res/layout/pass_list_item.xml
View file

@ -1,118 +1,116 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:android.support.v7.cardview="http://schemas.android.com/apk/res-auto"
android:id="@+id/pass_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android.support.v7.cardview:cardMaxElevation="@dimen/card_longclick_elevation_half"
xmlns:tools="http://schemas.android.com/tools"
xmlns:android.support.v7.cardview="http://schemas.android.com/apk/res-auto"
android:id="@+id/pass_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android.support.v7.cardview:cardMaxElevation="@dimen/card_longclick_elevation_half"
android:orientation="vertical">
android:orientation="vertical">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/pass_top"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:id="@+id/pass_top"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/icon"
android:layout_width="@dimen/pass_icon_size"
android:layout_height="@dimen/pass_icon_size"
android:layout_margin="8dp"
android:src="@drawable/ic_launcher"/>
android:id="@+id/icon"
android:layout_width="@dimen/pass_icon_size"
android:layout_height="@dimen/pass_icon_size"
android:layout_margin="8dp"
android:src="@drawable/ic_launcher" />
<LinearLayout
android:layout_width="0dip"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:orientation="vertical">
android:paddingRight="4dp"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:textColorSecondary"
tools:text="12.10.2013 17:00" />
<TextView
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="4dp"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:textColorSecondary"
tools:text="12.10.2013 17:00"/>
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="4dp"
android:textAppearance="?android:attr/textAppearanceMedium"
tools:text="Title"/>
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="4dp"
android:textAppearance="?android:attr/textAppearanceMedium"
tools:text="Title" />
</LinearLayout>
<org.ligi.passandroid.ui.views.CategoryIndicatorView
android:id="@+id/categoryView"
android:layout_width="48dp"
android:layout_height="74dp"
android:layout_gravity="center"
android:layout_margin="8dp"/>
android:id="@+id/categoryView"
android:layout_width="48dp"
android:layout_height="74dp"
android:layout_gravity="center"
android:layout_margin="8dp" />
<!-- <include layout="@layout/category_indicator" /> -->
</LinearLayout>
<View
android:id="@+id/actions_separator"
android:layout_width="match_parent"
android:layout_height="2dip"
android:layout_below="@id/pass_top"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:background="#dfdfdf"
android:padding="7dp"/>
android:id="@+id/actions_separator"
android:layout_width="match_parent"
android:layout_height="2dip"
android:layout_below="@id/pass_top"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:background="#dfdfdf"
android:padding="7dp" />
<TextView
android:id="@+id/navigateTo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/actions_separator"
android:layout_gravity="center_vertical"
android:background="@drawable/clickable_bg"
android:clickable="true"
android:drawableLeft="@drawable/ic_place_grey600_18dp"
android:padding="8dp"
android:text="@string/pass_directions" />
<TextView
android:id="@+id/addCalendar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_below="@id/actions_separator"
android:layout_gravity="center_vertical"
android:background="@drawable/clickable_bg"
android:clickable="true"
android:drawableRight="@drawable/ic_today_grey600_18dp"
android:padding="8dp"
android:text="@string/pass_to_calendar" />
<LinearLayout
android:id="@+id/buttonContainer"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_below="@id/actions_separator">
<TextView
android:id="@+id/navigateTo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@drawable/clickable_bg"
android:clickable="true"
android:drawableLeft="@drawable/ic_place_grey600_18dp"
android:padding="8dp"
android:text="@string/pass_directions"/>
<View
android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1"/>
<TextView
android:id="@+id/addCalendar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@drawable/clickable_bg"
android:clickable="true"
android:drawableRight="@drawable/ic_today_grey600_18dp"
android:padding="8dp"
android:text="@string/pass_to_calendar"/>
</LinearLayout>
<LinearLayout
android:id="@+id/passExtrasContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/buttonContainer"
android:orientation="vertical"/>
android:id="@+id/passExtrasContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/addCalendar"
android:orientation="vertical" />
</RelativeLayout>