Remove Activity usage.

Pull retention magic from Maven.
Rename resources.

README.md

@@ -13,8 +13,6 @@ This is a nice and simple color picker for Android. It allows to show any number
 
 ## Example code
 
-### Use as a dialog
-
 To show the dialog, just get an instance, add a number of palettes and call the show method.
 ```java
 		ColorPickerDialogFragment d = new ColorPickerDialogFragment();
@@ -43,31 +41,6 @@ The calling activity or fragment should implement `ColorPickerDialogFragment.Col
 			// handle cancelled color picker dialog
 		}
 ```
-### Use via Intent
-
-Alternatively you can use the picker via `Intent`. To do so just include the following dependency
-
-```
-implementation "com.github.dmfs.color-picker:colorpicker-activity:1.1"
-```
-
-and call the dialog like:
-```java
-		ColorPickerActivity.start(context, CODE_PICK_COLOR);
-```
-This will call an intent with the action `org.openintents.action.PICK_COLOR` allowing the user to use his preferred color picker (if it supports the Open Intent).
-
-In `onActivityResult(int, int, Intent)` you can get the picked color like this:
-```java
-		@Override
-		protected void onActivityResult(int code, int result, Intent data)
-		{
-			if (result == RESULT_OK && code == CODE_PICK_COLOR)
-			{
-				Integer color = ColorPickerActivity.getColor(data);
-			}
-		}
-```
 
 ## Screen shots
 
@@ -84,4 +57,4 @@ In `onActivityResult(int, int, Intent)` you can get the picked color like this:
 
 ## License
 
-Copyright (c) dmfs GmbH 2017, licensed under Apache 2 (see `LICENSE`).
+Copyright (c) dmfs GmbH 2018, licensed under Apache 2 (see `LICENSE`).

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.2.1'
     }
 }
 

colorpicker/build.gradle

@@ -20,6 +20,8 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:26.1.0'
     implementation 'com.android.support:support-v4:26.1.0'
     implementation 'com.github.dmfs.bolts:color-bolts:2b1b95d'
-    compile files('libs/android-retention-magic-1.2.2.jar')
+    implementation 'com.github.dmfs:retention-magic:1.3'
+
+    // TODO: replace or covert to Gradle project so we can pull it from Maven
     compile files('libs/drawablepagertabstrip.jar')
 }

colorpicker/src/main/AndroidManifest.xml

@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.dmfs.android.colorpicker">
-
-</manifest>
+<manifest package="org.dmfs.android.colorpicker"/>

colorpicker/src/main/java/org/dmfs/android/colorpicker/ColorPickerDialogFragment.java

@@ -141,7 +141,7 @@ public void setTitle(int title)
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
     {
-        View view = inflater.inflate(R.layout.org_dmfs_colorpickerdialog_fragment, container);
+        View view = inflater.inflate(R.layout.dmfs_colorpickerdialog_fragment, container);
         mPager = view.findViewById(R.id.pager);
         mPagerAdapter = new PalettesPagerAdapter(getResources(), getChildFragmentManager(), mPalettes);
         mPagerAdapter.notifyDataSetChanged();
@@ -175,7 +175,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState)
         if (Build.VERSION.SDK_INT >= 21)
         {
             // set a background with round corners
-            result.getWindow().setBackgroundDrawable(ContextCompat.getDrawable(getContext(), R.drawable.colorpicker_dialog_background));
+            result.getWindow().setBackgroundDrawable(ContextCompat.getDrawable(getContext(), R.drawable.dmfs_colorpicker_dialog_background));
             // ensure we still have the right drop shadow in place
             ViewCompat.setElevation(result.getWindow().getDecorView(), 24);
         }

colorpicker/src/main/java/org/dmfs/android/colorpicker/PaletteFragment.java

@@ -69,7 +69,7 @@ public View onCreateView(final LayoutInflater inflater, ViewGroup container, Bun
 		/*
          * TODO: build the layout programmatically to get rid of the resources, so we can distribute this in a single jar
 		 */
-        final ViewGroup rootView = (ViewGroup) inflater.inflate(R.layout.org_dmfs_colorpickerdialog_palette_grid, container, false);
+        final ViewGroup rootView = (ViewGroup) inflater.inflate(R.layout.dmfs_colorpickerdialog_palette_grid, container, false);
         final GridView gridview = (GridView) rootView.findViewById(android.R.id.content);
 
         mAdapter = new PaletteGridAdapter(getActivity(), mPalette);