Merge pull request #4 from wordpress-mobile/issue/git-subtree-ftw

git subtree ftw

.gitignore

@@ -21,6 +21,3 @@ gradle.properties
 
 # OS X
 .DS_Store
-
-# dependencies
-libs

WordPressNetworking/build.gradle

@@ -26,21 +26,14 @@ android {
     }
 }
 
-wordpress {
-    utils {
-        repo 'WordPress-Utils-Android'
-        subproject 'WordPressUtils'
-        artifact 'org.wordpress:wordpress-utils:1.0.+'
-    }
-    wpcomrest {
-        repo 'Automattic/android-wordpress-com-rest'
-        subproject 'WordPressComRest'
-        artifact 'com.automattic:wordpresscom-rest:1.0.0'
-    }
-}
-
 dependencies {
     compile 'com.mcxiaoke.volley:library:1.0.+'
+
+    debugCompile project(path:':libs:utils:WordPressUtils')
+    releaseCompile 'org.wordpress:wordpress-utils:1.0.2'
+
+    debugCompile project(path:':libs:wpcomrest:WordPressComRest')
+    releaseCompile 'com.automattic:wordpresscom-rest:1.0.0'
 }
 
 uploadArchives {

build.gradle

@@ -1,12 +0,0 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.automattic.android:gradle-wordpresslibraries:1.+'
-    }
-}
-
-allprojects {
-    apply plugin:'wordpress'
-}

libs/utils/.gitignore

@@ -0,0 +1,25 @@
+# generated files
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+tools/deploy-mvn-artifact.conf
+
+# Intellij project files
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# Gradle
+.gradle/
+gradle.properties
+
+# Idea
+.idea/workspace.xml
+*.iml
+
+# OS X
+.DS_Store
+
+# dependencies

libs/utils/WordPressUtils/build.gradle

@@ -0,0 +1,55 @@
+
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.12.+'
+    }
+}
+
+apply plugin: 'com.android.library'
+apply plugin: 'maven'
+
+repositories {
+    mavenCentral()
+    maven { url 'http://wordpress-mobile.github.io/WordPress-Android' }
+}
+
+dependencies {
+    compile 'commons-lang:commons-lang:2.6'
+    compile 'com.mcxiaoke.volley:library:1.0.+'
+    compile 'com.github.castorflex.smoothprogressbar:library:0.4.0'
+    compile 'org.wordpress:pulltorefresh-main:+@aar' // org.wordpress version includes some fixes
+    compile 'com.android.support:support-v13:19.0.+'
+}
+
+android {
+    defaultPublishConfig 'debug'
+
+    compileSdkVersion 19
+    buildToolsVersion "19.1.0"
+
+    defaultConfig {
+        applicationId "org.wordpress.android.util"
+        versionName "1.0.2"
+        versionCode 1
+        minSdkVersion 14
+        targetSdkVersion 19
+    }
+}
+
+uploadArchives {
+    repositories {
+        mavenDeployer {
+            def repo_url = ""
+            if (project.hasProperty("repository")) {
+                repo_url = project.repository
+            }
+            repository(url: repo_url)
+            pom.version = android.defaultConfig.versionName
+            pom.groupId = "org.wordpress"
+            pom.artifactId = "wordpress-utils"
+        }
+    }
+}

libs/utils/WordPressUtils/gradle.properties-example

@@ -0,0 +1 @@
+repository=file:///Users/max/work/automattic/WordPress-Android-gh-pages/

libs/utils/WordPressUtils/src/main/AndroidManifest.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  package="org.wordpress.android.util">
+
+</manifest>

libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AlertUtil.java

@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2011 wordpress.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.wordpress.android.util;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+
+public class AlertUtil {
+    /**
+     * Show Alert Dialog
+     * @param context
+     * @param titleId
+     * @param messageId
+     */
+    public static void showAlert(Context context, int titleId, int messageId) {
+        Dialog dlg = new AlertDialog.Builder(context)
+            .setTitle(titleId)
+            .setPositiveButton(android.R.string.ok, null)
+            .setMessage(messageId)
+            .create();
+
+        dlg.show();
+    }
+
+    /**
+     * Show Alert Dialog
+     * @param context
+     * @param titleId
+     * @param messageId
+     */
+    public static void showAlert(Context context, int titleId, String message) {
+        Dialog dlg = new AlertDialog.Builder(context)
+            .setTitle(titleId)
+            .setPositiveButton(android.R.string.ok, null)
+            .setMessage(message)
+            .create();
+
+        dlg.show();
+    }
+
+    /**
+     * Show Alert Dialog
+     * @param context
+     * @param titleId
+     * @param messageId
+     * @param positiveButtontxt
+     * @param positiveListener
+     * @param negativeButtontxt
+     * @param negativeListener
+     */
+    public static void showAlert(Context context, int titleId, int messageId,
+            CharSequence positiveButtontxt, DialogInterface.OnClickListener positiveListener,
+            CharSequence negativeButtontxt, DialogInterface.OnClickListener negativeListener) {
+        Dialog dlg = new AlertDialog.Builder(context)
+            .setTitle(titleId)
+            .setPositiveButton(positiveButtontxt, positiveListener)
+            .setNegativeButton(negativeButtontxt, negativeListener)
+            .setMessage(messageId)
+            .setCancelable(false)
+            .create();
+
+        dlg.show();
+    }
+
+    /**
+     * Show Alert Dialog
+     * @param context
+     * @param titleId
+     * @param messageId
+     * @param positiveButtontxt
+     * @param positiveListener
+     */
+    public static void showAlert(Context context, int titleId, String message,
+            CharSequence positiveButtontxt, DialogInterface.OnClickListener positiveListener) {
+        Dialog dlg = new AlertDialog.Builder(context)
+            .setTitle(titleId)
+            .setPositiveButton(positiveButtontxt, positiveListener)
+            .setMessage(message)
+            .setCancelable(false)
+            .create();
+
+        dlg.show();
+    }
+}
+