Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/AndroidProjectSystem.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 26 additions & 0 deletions .idea/appInsightsSettings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions .idea/deploymentTargetSelector.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/markdown.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/migrations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions .idea/runConfigurations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 19 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 27
buildToolsVersion "28.0.2"
compileSdkVersion 34
buildToolsVersion "34.0.0"

defaultConfig {
applicationId "com.appeaser.sublimepicker"
minSdkVersion 14
targetSdkVersion 27
minSdkVersion 21
targetSdkVersion 34
versionCode 5
versionName "1.4"
}
Expand All @@ -17,10 +17,24 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
namespace "com.appeaser.sublimepicker"
}

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation project(':sublimepickerlibrary')
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'androidx.appcompat:appcompat:1.7.0'

constraints {
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22") {
because("kotlin-stdlib-jdk7 is now part of kotlin-stdlib")
}
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22") {
because("kotlin-stdlib-jdk8 is now part of kotlin-stdlib")
}
}
}
3 changes: 2 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@

<activity
android:name=".Sampler"
android:label="@string/app_name">
android:label="@string/app_name"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/appeaser/sublimepicker/Sampler.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
import android.graphics.PorterDuff;
import android.graphics.Typeface;
import android.os.Bundle;
import android.support.v4.app.DialogFragment;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import androidx.fragment.app.DialogFragment;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.style.StyleSpan;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
package com.appeaser.sublimepicker;

import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.DialogFragment;
import androidx.annotation.Nullable;
import androidx.fragment.app.DialogFragment;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
Expand Down Expand Up @@ -100,7 +100,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
}*/

mSublimePicker = (SublimePicker) getActivity()
.getLayoutInflater().inflate(R.layout.sublime_picker, container);
.getLayoutInflater().inflate(com.appeaser.sublimepickerlibrary.R.layout.sublime_picker, container);

// Retrieve SublimeOptions
Bundle arguments = getArguments();
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/sampler.xml
Original file line number Diff line number Diff line change
Expand Up @@ -334,11 +334,11 @@
android:background="@drawable/floating_button_shape"
android:contentDescription="launch sublime picker" />

<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />

</FrameLayout>
</FrameLayout>
12 changes: 2 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,11 @@

buildscript {
repositories {
jcenter()
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.4'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.+'
}
}

allprojects {
repositories {
jcenter()
google()
classpath 'com.android.tools.build:gradle:8.13.0'
}
}

Expand Down
5 changes: 4 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,7 @@
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
# org.gradle.parallel=true

android.useAndroidX=true
android.enableJetifier=true
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
25 changes: 24 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1,24 @@
include ':app', ':sublimepickerlibrary'
pluginManagement {
repositories {
google {
content {
includeGroupByRegex("com\\.android.*")
includeGroupByRegex("com\\.google.*")
includeGroupByRegex("androidx.*")
}
}
mavenCentral()
gradlePluginPortal()
}
}
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
google()
mavenCentral()
maven { url 'https://jitpack.io' }
}
}

//rootProject.name = "OfficePunch"
include(":app", ":sublimepickerlibrary")
64 changes: 10 additions & 54 deletions sublimepickerlibrary/build.gradle
Original file line number Diff line number Diff line change
@@ -1,47 +1,12 @@
buildscript {
repositories {
mavenCentral()
}

dependencies {
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
}
}

apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'

ext {
bintrayRepo = 'maven'
bintrayName = 'sublime-picker'

publishedGroupId = 'com.appeaser.sublimepickerlibrary'
libraryName = 'SublimePicker'
artifact = 'sublimepickerlibrary'

libraryDescription = 'A material-styled android view that provisions picking of a date, time & recurrence option, all from a single user-interface.'

siteUrl = 'https://github.com/vikramkakkar/SublimePicker'
gitUrl = 'https://github.com/vikramkakkar/SublimePicker.git'

libraryVersion = '2.1.2'

developerId = 'vikramkakkar'
developerName = 'Vikram Kakkar'
developerEmail = 'vikram.kakkar.85@gmail.com'

licenseName = 'The Apache Software License, Version 2.0'
licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
allLicenses = ["Apache-2.0"]
}

android {
compileSdkVersion 27
buildToolsVersion "28.0.2"
compileSdkVersion 34
buildToolsVersion "34.0.0"

defaultConfig {
minSdkVersion 14
targetSdkVersion 27
minSdkVersion 21
targetSdkVersion 34
versionCode 4
versionName "2.1.2"
}
Expand All @@ -53,24 +18,15 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
namespace "com.appeaser.sublimepickerlibrary"
}

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:support-v4:27.1.1'
implementation 'com.android.support:gridlayout-v7:27.1.1'
implementation 'com.android.support:support-annotations:27.1.1'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'androidx.gridlayout:gridlayout:1.0.0'
implementation 'androidx.annotation:annotation:1.8.2'
}

apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'

javadoc {
options {
encoding = 'UTF-8'
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import android.os.Build;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.text.TextUtils;
import android.text.format.DateUtils;
import android.util.AttributeSet;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import android.content.res.TypedArray;
import android.graphics.Color;
import android.graphics.PorterDuff;
import android.support.annotation.NonNull;
import android.support.v4.content.ContextCompat;
import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import android.util.TypedValue;
import android.view.View;
import android.widget.Button;
Expand Down
Loading