Skip to content

Commit

Permalink
-updated sdks
Browse files Browse the repository at this point in the history
-added ability to scroll whole view (entire week, for example) like a ViewPager.
-made default first day of week to be the one of the calendar.
  • Loading branch information
AndroidDeveloperLB authored and hermansje committed May 15, 2018
1 parent 3f94c1c commit 0f2acef
Show file tree
Hide file tree
Showing 5 changed files with 75 additions and 74 deletions.
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
buildscript {
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.android.tools.build:gradle:3.2.0-alpha13'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -19,5 +20,6 @@ allprojects {

repositories {
jcenter()
google()
}
}
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sun Aug 06 18:02:35 CEST 2017
#Mon May 07 11:03:02 IDT 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
13 changes: 6 additions & 7 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,20 @@ repositories {
}

android {
compileSdkVersion 25
buildToolsVersion '25.0.2'
compileSdkVersion 27

defaultConfig {
minSdkVersion 9
targetSdkVersion 25
minSdkVersion 14
targetSdkVersion 27
}
}

configurations {
javadocDeps
}
dependencies {
compile 'com.android.support:appcompat-v7:25.1.0'
javadocDeps 'com.android.support:appcompat-v7:25.1.0'
compile 'com.android.support:appcompat-v7:27.1.1'
javadocDeps 'com.android.support:appcompat-v7:27.1.1'
}

apply from: 'gradle-mvn-push.gradle'
apply from: 'gradle-mvn-push.gradle'
121 changes: 61 additions & 60 deletions library/src/main/res/values/attrs.xml
Original file line number Diff line number Diff line change
@@ -1,69 +1,70 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<declare-styleable name="WeekView">
<attr name="allDayEventHeight" format="dimension" />
<attr name="autoLimitTime" format="boolean" />
<attr name="columnGap" format="dimension" />
<attr name="dayBackgroundColor" format="color" />
<attr name="allDayEventHeight" format="dimension"/>
<attr name="autoLimitTime" format="boolean"/>
<attr name="columnGap" format="dimension"/>
<attr name="dayBackgroundColor" format="color"/>
<attr name="dayNameLength" format="enum">
<enum name="length_short" value="1" />
<enum name="length_long" value="2" />
<enum name="length_short" value="1"/>
<enum name="length_long" value="2"/>
</attr>
<attr name="eventCornerRadius" format="dimension" />
<attr name="eventMarginVertical" format="dimension" />
<attr name="eventPadding" format="dimension" />
<attr name="eventTextColor" format="color" />
<attr name="eventTextSize" format="dimension" />
<attr name="eventCornerRadius" format="dimension"/>
<attr name="eventMarginVertical" format="dimension"/>
<attr name="eventPadding" format="dimension"/>
<attr name="eventTextColor" format="color"/>
<attr name="eventTextSize" format="dimension"/>
<attr name="firstDayOfWeek" format="enum">
<enum name="sunday" value="1" />
<enum name="monday" value="2" />
<enum name="tuesday" value="3" />
<enum name="wednesday" value="4" />
<enum name="thursday" value="5" />
<enum name="friday" value="6" />
<enum name="saturday" value="7" />
<enum name="sunday" value="1"/>
<enum name="monday" value="2"/>
<enum name="tuesday" value="3"/>
<enum name="wednesday" value="4"/>
<enum name="thursday" value="5"/>
<enum name="friday" value="6"/>
<enum name="saturday" value="7"/>
</attr>
<attr name="futureBackgroundColor" format="color" />
<attr name="futureWeekendBackgroundColor" format="color" />
<attr name="headerColumnBackground" format="color" />
<attr name="headerColumnPadding" format="dimension" />
<attr name="headerColumnTextColor" format="color" />
<attr name="headerRowBackgroundColor" format="color" />
<attr name="headerRowPadding" format="dimension" />
<attr name="horizontalFlingEnabled" format="boolean" />
<attr name="hourHeight" format="dimension" />
<attr name="hourSeparatorColor" format="color" />
<attr name="hourSeparatorHeight" format="dimension" />
<attr name="maxHourHeight" format="dimension" />
<attr name="maxTime" format="integer" />
<attr name="minHourHeight" format="dimension" />
<attr name="minTime" format="integer" />
<attr name="minOverlappingMinutes" format="integer" />
<attr name="newEventColor" format="color" />
<attr name="newEventId" format="integer" />
<attr name="newEventIdentifier" format="string" />
<attr name="newEventIconResource" format="integer" />
<attr name="newEventLengthInMinutes" format="integer" />
<attr name="newEventTimeResolutionInMinutes" format="integer" />
<attr name="noOfVisibleDays" format="integer" />
<attr name="nowLineColor" format="color" />
<attr name="nowLineThickness" format="dimension" />
<attr name="overlappingEventGap" format="dimension" />
<attr name="pastBackgroundColor" format="color" />
<attr name="pastWeekendBackgroundColor" format="color" />
<attr name="scrollDuration" format="integer" />
<attr name="showDistinctPastFutureColor" format="boolean" />
<attr name="showDistinctWeekendColor" format="boolean" />
<attr name="showFirstDayOfWeekFirst" format="boolean" />
<attr name="showNowLine" format="boolean" />
<attr name="textSize" format="dimension" />
<attr name="timeColumnResolution" format="integer" />
<attr name="todayBackgroundColor" format="color" />
<attr name="todayHeaderTextColor" format="color" />
<attr name="verticalFlingEnabled" format="boolean" />
<attr name="xScrollingSpeed" format="float" />
<attr name="zoomFocusPoint" format="fraction" />
<attr name="zoomFocusPointEnabled" format="boolean" />
<attr name="dropListenerEnabled" format="boolean" />
<attr name="futureBackgroundColor" format="color"/>
<attr name="futureWeekendBackgroundColor" format="color"/>
<attr name="headerColumnBackground" format="color"/>
<attr name="headerColumnPadding" format="dimension"/>
<attr name="headerColumnTextColor" format="color"/>
<attr name="headerRowBackgroundColor" format="color"/>
<attr name="headerRowPadding" format="dimension"/>
<attr name="horizontalFlingEnabled" format="boolean"/>
<attr name="hourHeight" format="dimension"/>
<attr name="hourSeparatorColor" format="color"/>
<attr name="hourSeparatorHeight" format="dimension"/>
<attr name="maxHourHeight" format="dimension"/>
<attr name="maxTime" format="integer"/>
<attr name="minHourHeight" format="dimension"/>
<attr name="minTime" format="integer"/>
<attr name="minOverlappingMinutes" format="integer"/>
<attr name="newEventColor" format="color"/>
<attr name="newEventId" format="integer"/>
<attr name="newEventIdentifier" format="string"/>
<attr name="newEventIconResource" format="integer"/>
<attr name="newEventLengthInMinutes" format="integer"/>
<attr name="newEventTimeResolutionInMinutes" format="integer"/>
<attr name="noOfVisibleDays" format="integer"/>
<attr name="nowLineColor" format="color"/>
<attr name="nowLineThickness" format="dimension"/>
<attr name="overlappingEventGap" format="dimension"/>
<attr name="pastBackgroundColor" format="color"/>
<attr name="pastWeekendBackgroundColor" format="color"/>
<attr name="scrollDuration" format="integer"/>
<attr name="showDistinctPastFutureColor" format="boolean"/>
<attr name="showDistinctWeekendColor" format="boolean"/>
<attr name="showFirstDayOfWeekFirst" format="boolean"/>
<attr name="showNowLine" format="boolean"/>
<attr name="textSize" format="dimension"/>
<attr name="timeColumnResolution" format="integer"/>
<attr name="todayBackgroundColor" format="color"/>
<attr name="todayHeaderTextColor" format="color"/>
<attr name="verticalFlingEnabled" format="boolean"/>
<attr name="xScrollingSpeed" format="float"/>
<attr name="zoomFocusPoint" format="fraction"/>
<attr name="zoomFocusPointEnabled" format="boolean"/>
<attr name="dropListenerEnabled" format="boolean"/>
<attr name="isScrollNumberOfVisibleDays" format="boolean"/>
</declare-styleable>
</resources>
7 changes: 3 additions & 4 deletions sample/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 25
buildToolsVersion '25.0.2'
compileSdkVersion 27

defaultConfig {
applicationId "com.alamkanak.weekview"
minSdkVersion 14
targetSdkVersion 25
targetSdkVersion 27
versionCode 1
versionName "1.0"
}
Expand All @@ -22,6 +21,6 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile project(':library')
compile 'com.android.support:appcompat-v7:25.1.0'
compile 'com.android.support:appcompat-v7:27.1.1'
compile 'com.squareup.retrofit:retrofit:1.9.0'
}

0 comments on commit 0f2acef

Please sign in to comment.