From 529e0996f01ea9beb58efabec1eca9f40071a176 Mon Sep 17 00:00:00 2001 From: Vipul Asri Date: Sun, 29 Sep 2019 18:49:13 +0530 Subject: [PATCH 1/6] UPDATE: library dependency --- timelineview/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/timelineview/build.gradle b/timelineview/build.gradle index 47b3f16..0df8fc6 100644 --- a/timelineview/build.gradle +++ b/timelineview/build.gradle @@ -42,7 +42,7 @@ android { } dependencies { - implementation 'androidx.annotation:annotation:1.1.0' + api 'androidx.annotation:annotation:1.1.0' } apply from: 'https://raw.githubusercontent.com/vipulasri/BintrayHelper/master/install.gradle' From dd0d96d7e7d9bc333d29440650dac326ac491f15 Mon Sep 17 00:00:00 2001 From: Vipul Asri Date: Sun, 29 Sep 2019 19:01:36 +0530 Subject: [PATCH 2/6] UPDATE: library v1.1.1 --- README.md | 24 ++++++++++++++++++++++-- timelineview/build.gradle | 6 +++--- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 462089e..3a3a5c7 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ For information : checkout [Example Screen Code](https://github.com/vipulasri/Ti ``` gradle dependencies { - implementation 'com.github.vipulasri:timelineview:1.1.0' + implementation 'com.github.vipulasri:timelineview:1.1.1' } ``` @@ -38,7 +38,7 @@ dependencies { com.github.vipulasri timelineview - 1.1.0 + 1.1.1 pom ``` @@ -100,6 +100,26 @@ If you Watch this repository, GitHub will send you an email every time I publish true sets the marker in center of line if `true` + + app:markerPaddingLeft="0dp" + 0dp + sets the marker left padding, applicable only with horizontal orientation + + + app:markerPaddingTop="0dp" + 0dp + sets the marker top padding, applicable only with vertical orientation + + + app:markerPaddingRight="0dp" + 0dp + sets the marker right padding, applicable only with horizontal orientation + + + app:markerPaddingBottom="0dp" + 0dp + sets the marker bottom padding, applicable only with vertical orientation + app:startLineColor="@color/primarColor" Dark Grey Line diff --git a/timelineview/build.gradle b/timelineview/build.gradle index 0df8fc6..87ecdb4 100644 --- a/timelineview/build.gradle +++ b/timelineview/build.gradle @@ -7,7 +7,7 @@ ext { groupId = 'com.github.vipulasri' libraryName = 'TimelineView' artifact = 'timelineview' - libraryVersion = '1.1.0' + libraryVersion = '1.1.1' libraryDescription = 'Android Timeline View Library (Using RecyclerView) is simple implementation used to display view like Tracking of shipment/order, steppers etc.' siteUrl = 'https://github.com/vipulasri/Timeline-View' @@ -28,8 +28,8 @@ android { defaultConfig { minSdkVersion versions.minSdk targetSdkVersion versions.targetSdk - versionCode 7 - versionName "1.1.0" + versionCode 8 + versionName "1.1.1" } buildTypes { From e5ad615c957a5b1b47a1691e1b2bad066ccdd672 Mon Sep 17 00:00:00 2001 From: Vipul Asri Date: Sun, 29 Sep 2019 19:37:51 +0530 Subject: [PATCH 3/6] UPDATE: sample version update --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index cce718c..4b86f17 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { applicationId "com.github.vipulasri.timelineview.sample" minSdkVersion versions.minSdk targetSdkVersion versions.targetSdk - versionCode 3 + versionCode 4 versionName "1.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true From ee969a959a92ef56c644303ec8f878e67875d021 Mon Sep 17 00:00:00 2001 From: Vipul Asri Date: Tue, 8 Oct 2019 19:05:29 +0530 Subject: [PATCH 4/6] ADD: funding.yml --- .github/FUNDING.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..de436e8 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,12 @@ +# These are supported funding model platforms + +github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] +patreon: # Replace with a single Patreon username +open_collective: # Replace with a single Open Collective username +ko_fi: # Replace with a single Ko-fi username +tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel +community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry +liberapay: # Replace with a single Liberapay username +issuehunt: # Replace with a single IssueHunt username +otechie: # Replace with a single Otechie username +custom: ['https://www.paypal.me/vipulasri'] From 5660cccd1571db418e487d34a2d2412f88fd6aac Mon Sep 17 00:00:00 2001 From: Fabrizio Destro <7031675+dexpota@users.noreply.github.com> Date: Sat, 19 Oct 2019 11:43:37 +0200 Subject: [PATCH 5/6] Fix issue #63 --- .../vipulasri/timelineview/TimelineView.java | 48 +++++++++++-------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/timelineview/src/main/java/com/github/vipulasri/timelineview/TimelineView.java b/timelineview/src/main/java/com/github/vipulasri/timelineview/TimelineView.java index 66c6b76..eb75b5a 100644 --- a/timelineview/src/main/java/com/github/vipulasri/timelineview/TimelineView.java +++ b/timelineview/src/main/java/com/github/vipulasri/timelineview/TimelineView.java @@ -195,41 +195,49 @@ private void initTimeline() { } } - if(mLineOrientation == LineOrientation.HORIZONTAL) { + if (mLineOrientation == LineOrientation.HORIZONTAL) { - if(mDrawStartLine) { + if (mDrawStartLine) { mStartLineStartX = pLeft; mStartLineStartY = mBounds.centerY(); mStartLineStopX = mBounds.left - mLinePadding; mStartLineStopY = mBounds.centerY(); } - if(mDrawEndLine) { - mEndLineStartX = mBounds.right + mLinePadding; - mEndLineStartY = mBounds.centerY(); - mEndLineStopX = getWidth(); - mEndLineStopY = mBounds.centerY(); + if (mDrawEndLine) { + if (mLineStyle == LineStyle.DASHED) { + mEndLineStartX = getWidth() - mLineStyleDashGap; + mEndLineStartY = mBounds.centerY(); + mEndLineStopX = mBounds.right + mLinePadding; + mEndLineStopY = mBounds.centerY(); + } else { + mEndLineStartX = mBounds.right + mLinePadding; + mEndLineStartY = mBounds.centerY(); + mEndLineStopX = getWidth(); + mEndLineStopY = mBounds.centerY(); + } } } else { - if(mDrawStartLine) { + if (mDrawStartLine) { mStartLineStartX = mBounds.centerX(); - - if(mLineStyle == LineStyle.DASHED) { - mStartLineStartY = pTop - mLineStyleDashLength; - } else { - mStartLineStartY = pTop; - } - + mStartLineStartY = pTop; mStartLineStopX = mBounds.centerX(); mStartLineStopY = mBounds.top - mLinePadding; } - if(mDrawEndLine) { - mEndLineStartX = mBounds.centerX(); - mEndLineStartY = mBounds.bottom + mLinePadding; - mEndLineStopX = mBounds.centerX(); - mEndLineStopY = getHeight(); + if (mDrawEndLine) { + if (mLineStyle == LineStyle.DASHED) { + mEndLineStartX = mBounds.centerX(); + mEndLineStartY = getHeight() - mLineStyleDashGap; + mEndLineStopX = mBounds.centerX(); + mEndLineStopY = mBounds.bottom + mLinePadding; + } else { + mEndLineStartX = mBounds.centerX(); + mEndLineStartY = mBounds.bottom + mLinePadding; + mEndLineStopX = mBounds.centerX(); + mEndLineStopY = getHeight(); + } } } From 86374cf111e4871b26ed10a10180f6e4b36e1a9b Mon Sep 17 00:00:00 2001 From: vipulasri Date: Sat, 19 Oct 2019 17:21:37 +0530 Subject: [PATCH 6/6] update: library v1.1.2 --- README.md | 13 +------------ timelineview/build.gradle | 6 +++--- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 3a3a5c7..a2a8ce7 100644 --- a/README.md +++ b/README.md @@ -28,21 +28,10 @@ For information : checkout [Example Screen Code](https://github.com/vipulasri/Ti ``` gradle dependencies { - implementation 'com.github.vipulasri:timelineview:1.1.1' + implementation 'com.github.vipulasri:timelineview:1.1.2' } ``` -**Using Maven** - -``` maven - - com.github.vipulasri - timelineview - 1.1.1 - pom - -``` - ### What's New See the project's Releases page for a list of versions with their change logs. diff --git a/timelineview/build.gradle b/timelineview/build.gradle index 87ecdb4..f4aad49 100644 --- a/timelineview/build.gradle +++ b/timelineview/build.gradle @@ -7,7 +7,7 @@ ext { groupId = 'com.github.vipulasri' libraryName = 'TimelineView' artifact = 'timelineview' - libraryVersion = '1.1.1' + libraryVersion = '1.1.2' libraryDescription = 'Android Timeline View Library (Using RecyclerView) is simple implementation used to display view like Tracking of shipment/order, steppers etc.' siteUrl = 'https://github.com/vipulasri/Timeline-View' @@ -28,8 +28,8 @@ android { defaultConfig { minSdkVersion versions.minSdk targetSdkVersion versions.targetSdk - versionCode 8 - versionName "1.1.1" + versionCode 9 + versionName "1.1.2" } buildTypes {