extracted LandscapeView to a library

ZieIony · May 14, 2017 · 9418752 · 9418752
1 parent c842cdf
commit 9418752
Show file tree

Hide file tree

Showing 25 changed files with 243 additions and 268 deletions.
diff --git a/app/app.iml b/app/app.iml
@@ -99,25 +99,26 @@
     <orderEntry type="library" exported="" scope="TEST" name="hamcrest-library-1.3" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="hamcrest-integration-1.3" level="project" />
     <orderEntry type="library" exported="" name="constraint-layout-1.0.1" level="project" />
-    <orderEntry type="library" exported="" name="support-core-ui-25.3.0" level="project" />
-    <orderEntry type="library" exported="" name="support-core-utils-25.3.0" level="project" />
+    <orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="jsr305-2.0.1" level="project" />
-    <orderEntry type="library" exported="" name="support-fragment-25.3.0" level="project" />
+    <orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="espresso-core-2.2.2" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="exposed-instrumentation-api-publish-0.5" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="rules-0.5" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="javax.annotation-api-1.2" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="javax.inject-1" level="project" />
-    <orderEntry type="library" exported="" name="support-compat-25.3.0" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-25.3.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="javawriter-2.1.1" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
-    <orderEntry type="library" exported="" name="support-media-compat-25.3.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
     <orderEntry type="library" exported="" name="constraint-layout-solver-1.0.1" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-25.3.0" level="project" />
-    <orderEntry type="library" exported="" name="animated-vector-drawable-25.3.0" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-25.3.0" level="project" />
-    <orderEntry type="library" exported="" name="support-vector-drawable-25.3.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
+    <orderEntry type="module" module-name="lib" exported="" />
   </component>
 </module>
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,10 +2,10 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion "25.0.3"
     defaultConfig {
         applicationId "tk.zielony.landscapeview"
-        minSdkVersion 9
+        minSdkVersion 14
         targetSdkVersion 25
         versionCode 1
         versionName "1.0"
@@ -20,11 +20,12 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile fileTree(include: ['*.jar'], dir: 'libs')
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:25.3.0'
+    compile 'com.android.support:appcompat-v7:25.3.1'
     compile 'com.android.support.constraint:constraint-layout:1.0.1'
     testCompile 'junit:junit:4.12'
+    compile project(':lib')
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="tk.zielony.landscapeview">
+    package="tk.zielony.landscapeview.test">
 
     <application
         android:allowBackup="true"

diff --git a/app/src/main/java/tk/zielony/landscapeview/ArgbEvaluator.java b/app/src/main/java/tk/zielony/landscapeview/ArgbEvaluator.java
diff --git a/app/src/main/java/tk/zielony/landscapeview/MathUtils.java b/app/src/main/java/tk/zielony/landscapeview/MathUtils.java
diff --git a/...k/zielony/landscapeview/MainActivity.java → ...lony/landscapeview/test/MainActivity.java b/...k/zielony/landscapeview/MainActivity.java → ...lony/landscapeview/test/MainActivity.java
@@ -1,4 +1,4 @@
-package tk.zielony.landscapeview;
+package tk.zielony.landscapeview.test;
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;

diff --git a/...k/zielony/landscapeview/ResizeLayout.java → ...lony/landscapeview/test/ResizeLayout.java b/...k/zielony/landscapeview/ResizeLayout.java → ...lony/landscapeview/test/ResizeLayout.java
@@ -1,4 +1,4 @@
-package tk.zielony.landscapeview;
+package tk.zielony.landscapeview.test;
 
 import android.content.Context;
 import android.support.annotation.AttrRes;

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<tk.zielony.landscapeview.ResizeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="tk.zielony.landscapeview.MainActivity">
+<tk.zielony.landscapeview.test.ResizeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                            xmlns:tools="http://schemas.android.com/tools"
+                                            android:layout_width="match_parent"
+                                            android:layout_height="match_parent"
+                                            tools:context="tk.zielony.landscapeview.test.MainActivity">
 
     <tk.zielony.landscapeview.LandscapeView
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
-</tk.zielony.landscapeview.ResizeLayout>
+</tk.zielony.landscapeview.test.ResizeLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -3,9 +3,4 @@
     <color name="colorPrimary">#3F51B5</color>
     <color name="colorPrimaryDark">#303F9F</color>
     <color name="colorAccent">#FF4081</color>
-    <color name="landscapeView_sunColor">#ffffff</color>
-    <color name="landscapeView_fogColor">#e0f2f1</color>
-    <color name="landscapeView_cloudColor">#ffe0f2f1</color>
-    <color name="landscapeView_skyColor">#b2dfdb</color>
-    <color name="landscapeView_landscapeColor">#0d47a1</color>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
diff --git a/lib/.gitignore b/lib/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -0,0 +1,23 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 25
+    buildToolsVersion "25.0.3"
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 25
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+compile 'com.android.support:support-annotations:25.3.1'
+}