libraryVersion = '1.1' (first)

Pulimet · Sep 5, 2017 · b859265 · b859265
1 parent 2c1253f
commit b859265
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -30,4 +30,7 @@ dependencies {
     })
 
     compile 'net.alexandroid.utils:shpref:1.5'
+
+
+    compile project(':indicators')
 }
diff --git a/indicators/build.gradle b/indicators/build.gradle
@@ -36,8 +36,6 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
     }
 
     buildTypes {
@@ -52,11 +50,6 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.android.support:appcompat-v7:26.0.2'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.1', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-
 }
 
 

diff --git a/indicators/src/main/AndroidManifest.xml b/indicators/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="net.alexandroid.utils.indicators"/>
+<manifest package="net.alexandroid.utils.indicators"/>
diff --git a/...roid/utils/indicators/IndicatorsView.java → ...roid/utils/indicators/IndicatorsView.java b/...roid/utils/indicators/IndicatorsView.java → ...roid/utils/indicators/IndicatorsView.java
diff --git a/...src/main/res/drawable/circle_selected.xml → ...src/main/res/drawable/circle_selected.xml b/...src/main/res/drawable/circle_selected.xml → ...src/main/res/drawable/circle_selected.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="oval">
-    <solid android:color="@color/colorPrimary"/>
+    <solid android:color="#3F51B5"/>
     <stroke
         android:width="0.5dp"
         android:color="#77555555"/>

diff --git a/...c/main/res/drawable/circle_unselected.xml → ...c/main/res/drawable/circle_unselected.xml b/...c/main/res/drawable/circle_unselected.xml → ...c/main/res/drawable/circle_unselected.xml
diff --git a/app/src/main/res/values/attrs.xml → indicators/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml → indicators/src/main/res/values/attrs.xml
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,4 +30,7 @@ dependencies { @@
         })
         compile 'net.alexandroid.utils:shpref:1.5'
+        compile project(':indicators')
     }