Skip to content

Commit

Permalink
Updated gradle file
Browse files Browse the repository at this point in the history
Code clean up
  • Loading branch information
romandanylyk committed Apr 30, 2018
1 parent 14b13ec commit d9b1f8b
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 120 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Expand Up @@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.android.tools.build:gradle:3.1.2'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.1'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
// NOTE: Do not place your application dependencies here; they belong
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Thu Oct 26 22:03:51 EEST 2017
#Mon Apr 30 21:23:45 EEST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
14 changes: 7 additions & 7 deletions pageindicatorview/build.gradle
Expand Up @@ -13,7 +13,7 @@ ext {
siteUrl = 'https://github.com/romandanylyk/PageIndicatorView'
gitUrl = 'https://github.com/romandanylyk/PageIndicatorView.git'

libraryVersion = '1.0.0'
libraryVersion = '1.0.1'

developerId = 'romandanylyk'
developerName = 'Roman Danylyk'
Expand All @@ -25,12 +25,12 @@ ext {
}

android {
compileSdkVersion 26
buildToolsVersion '26.0.2'
compileSdkVersion 27
buildToolsVersion '27.0.3'

defaultConfig {
minSdkVersion 14
targetSdkVersion 26
targetSdkVersion 27
versionCode 1
versionName "1.0"

Expand All @@ -49,9 +49,9 @@ dependencies {
repositories {
maven { url "https://maven.google.com" }
}
compile 'com.android.support:support-annotations:27.0.2'
compile 'com.android.support:support-compat:26.1.0'
compile 'com.android.support:support-core-ui:26.1.0'
compile 'com.android.support:support-annotations:27.1.1'
compile 'com.android.support:support-compat:27.1.1'
compile 'com.android.support:support-core-ui:27.1.1'
}

allprojects {
Expand Down
9 changes: 5 additions & 4 deletions sample/build.gradle
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 26
buildToolsVersion '26.0.2'
compileSdkVersion 27
buildToolsVersion '27.0.3'

defaultConfig {
applicationId "com.rd.pageindicatorview"
minSdkVersion 14
targetSdkVersion 26
targetSdkVersion 27
versionCode 1
versionName "1.0"
}
Expand All @@ -21,6 +21,7 @@ android {

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:26.1.0'
compile 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:recyclerview-v7:27.1.1'
compile project(':pageindicatorview')
}
@@ -1,7 +1,5 @@
package com.rd.pageindicatorview.home;

import android.app.FragmentManager;
import android.app.FragmentTransaction;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
Expand Down Expand Up @@ -70,12 +68,6 @@ private void initViews() {
pager.setAdapter(adapter);

pageIndicatorView = findViewById(R.id.pageIndicatorView);
findViewById(R.id.btnOpenFragment).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
openFragment();
}
});
}

@NonNull
Expand Down Expand Up @@ -108,12 +100,4 @@ private void updateIndicator() {
pageIndicatorView.setInteractiveAnimation(customization.isInteractiveAnimation());
pageIndicatorView.setAutoVisibility(customization.isAutoVisibility());
}

private void openFragment() {
FragmentManager manager = getFragmentManager();
FragmentTransaction transaction = manager.beginTransaction();
transaction.add(R.id.fragmentHolder, HomeFragment.getInstance(), "TAG");
transaction.addToBackStack(null);
transaction.commit();
}
}

This file was deleted.

7 changes: 0 additions & 7 deletions sample/src/main/res/layout/ac_home.xml
Expand Up @@ -34,13 +34,6 @@
attrs:piv_padding="12dp"
attrs:piv_radius="8dp" />

<Button
android:id="@+id/btnOpenFragment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="open framgnet"/>

<FrameLayout
android:id="@+id/fragmentHolder"
android:layout_width="match_parent"
Expand Down
28 changes: 0 additions & 28 deletions sample/src/main/res/layout/fr_home.xml

This file was deleted.

0 comments on commit d9b1f8b

Please sign in to comment.