Navigation Menu

Skip to content

Commit

Permalink
preparing release 2.0.0 and rebranding from invite to avast
Browse files Browse the repository at this point in the history
  • Loading branch information
David Vavra committed Dec 30, 2014
1 parent 5b9217f commit 23f07ce
Show file tree
Hide file tree
Showing 30 changed files with 398 additions and 443 deletions.
12 changes: 7 additions & 5 deletions build.gradle
@@ -1,6 +1,6 @@
buildscript {
repositories {
mavenCentral()
jcenter()
}

dependencies {
Expand All @@ -9,12 +9,14 @@ buildscript {
}

allprojects {
version = VERSION_NAME
group = GROUP

repositories {
mavenCentral()
jcenter()
}
}

ext {
VERSION_NAME = "2.0.0"
VERSION_CODE = 5
}

apply plugin: 'android-reporting'
4 changes: 2 additions & 2 deletions demo/build.gradle
Expand Up @@ -8,10 +8,10 @@ android {
minSdkVersion 8
targetSdkVersion 21
versionName project.VERSION_NAME
versionCode Integer.parseInt(project.VERSION_CODE)
versionCode project.VERSION_CODE
}
}

dependencies {
compile project(':library')
compile "com.avast:android-styled-dialogs:2.0.0"
}
2 changes: 1 addition & 1 deletion demo/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="eu.inmite.demo.dialogs">
package="com.avast.dialogs">

<application
android:label="@string/app_name"
Expand Down
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package eu.inmite.demo.dialogs;
package com.avast.dialogs;

import java.text.DateFormat;
import java.util.Date;
Expand All @@ -24,16 +24,18 @@
import android.view.View;
import android.widget.Toast;

import eu.inmite.android.lib.dialogs.*;
import com.avast.android.dialogs.fragment.*;
import com.avast.android.dialogs.iface.IDateDialogListener;
import com.avast.android.dialogs.iface.IListDialogListener;
import com.avast.android.dialogs.iface.ISimpleDialogCancelListener;
import com.avast.android.dialogs.iface.ISimpleDialogListener;

public class DemoActivity extends ActionBarActivity implements
ISimpleDialogListener,
IDateDialogListener,
ISimpleDialogCancelListener,
IListDialogListener {

public static final String EXTRA_THEME = "theme";

private static final int REQUEST_PROGRESS = 1;

DemoActivity c = this;
Expand Down
Expand Up @@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package eu.inmite.demo.dialogs;
package com.avast.dialogs;

import android.support.v4.app.FragmentActivity;
import android.view.LayoutInflater;
import android.view.View;

import eu.inmite.android.lib.dialogs.BaseDialogFragment;
import eu.inmite.android.lib.dialogs.ISimpleDialogListener;
import eu.inmite.android.lib.dialogs.SimpleDialogFragment;
import com.avast.android.dialogs.core.BaseDialogFragment;
import com.avast.android.dialogs.fragment.SimpleDialogFragment;
import com.avast.android.dialogs.iface.ISimpleDialogListener;

/**
* Sample implementation of eu.inmite.android.lib.dialogs.BaseDialogFragment - custom view by extending {@link SimpleDialogFragment}.
* Sample implementation of custom dialog by extending {@link SimpleDialogFragment}.
*
* @author David Vávra (david@inmite.eu)
*/
Expand Down
Binary file modified demo/src/main/res/drawable-hdpi/ic_launcher.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed demo/src/main/res/drawable-ldpi/ic_launcher.png
Binary file not shown.
Binary file modified demo/src/main/res/drawable-mdpi/ic_launcher.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/src/main/res/drawable-xhdpi/ic_launcher.png 100644 → 100755
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions demo/src/main/res/values/styles.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>

<style name="Button">
<item name="android:layout_width">match_parent</item>
Expand All @@ -8,6 +8,5 @@
<item name="android:layout_marginBottom">@dimen/grid_1</item>
<item name="android:layout_marginLeft">@dimen/grid_2</item>
<item name="android:layout_marginRight">@dimen/grid_2</item>
<item name="android:textAllCaps" tools:ignore="NewApi">true</item>
</style>
</resources>
14 changes: 0 additions & 14 deletions gradle.properties

This file was deleted.

Empty file modified gradlew 100644 → 100755
Empty file.
53 changes: 53 additions & 0 deletions library/android-release-aar.gradle
@@ -0,0 +1,53 @@
// ./gradlew clean build generateRelease
apply plugin: 'maven'

def groupId = project.PUBLISH_GROUP_ID
def artifactId = project.PUBLISH_ARTIFACT_ID
def version = project.PUBLISH_VERSION

def localReleaseDest = "${buildDir}/release/${version}"

task androidJavadocs(type: Javadoc) {
source = android.sourceSets.main.java.srcDirs
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
}

task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
classifier = 'javadoc'
from androidJavadocs.destinationDir
}

task androidSourcesJar(type: Jar) {
classifier = 'sources'
from android.sourceSets.main.java.srcDirs
}

uploadArchives {
repositories.mavenDeployer {
pom.groupId = groupId
pom.artifactId = artifactId
pom.version = version
// Add other pom properties here if you want (developer details / licenses)
repository(url: "file://${localReleaseDest}")
}
}

task zipRelease(type: Zip) {
from localReleaseDest
destinationDir buildDir
archiveName "release-${version}.zip"
}

task generateRelease << {
println "Release ${version} can be found at ${localReleaseDest}/"
println "Release ${version} zipped can be found ${buildDir}/release-${version}.zip"
}

generateRelease.dependsOn(uploadArchives)
generateRelease.dependsOn(zipRelease)


artifacts {
archives androidSourcesJar
//archives androidJavadocs doesn't work for some reason
}
11 changes: 6 additions & 5 deletions library/build.gradle
@@ -1,7 +1,9 @@
apply plugin: 'com.android.library'

repositories {
mavenCentral()
ext {
PUBLISH_GROUP_ID = 'com.avast'
PUBLISH_ARTIFACT_ID = 'android-styled-dialogs'
PUBLISH_VERSION = '2.0.0'
}

android {
Expand All @@ -12,13 +14,12 @@ android {
minSdkVersion 8
targetSdkVersion 21
versionName project.VERSION_NAME
versionCode Integer.parseInt(project.VERSION_CODE)
versionCode project.VERSION_CODE
}
}

dependencies {
compile 'com.android.support:appcompat-v7:21.0.3'
}

// Used to push in maven
apply from: '../maven_push.gradle'
apply from: 'android-release-aar.gradle'
2 changes: 1 addition & 1 deletion library/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="eu.inmite.android.lib.dialogs" />
<manifest package="com.avast.android.dialogs" />
@@ -1,4 +1,4 @@
package eu.inmite.android.lib.dialogs;
package com.avast.android.dialogs.core;

import android.content.Context;
import android.os.Bundle;
Expand All @@ -11,7 +11,7 @@
*
* @author Tomas Vondracek
*/
abstract class BaseDialogBuilder<T extends BaseDialogBuilder<T>> {
public abstract class BaseDialogBuilder<T extends BaseDialogBuilder<T>> {

public final static String ARG_REQUEST_CODE = "request_code";
public final static String ARG_CANCELABLE_ON_TOUCH_OUTSIDE = "cancelable_oto";
Expand Down
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package eu.inmite.android.lib.dialogs;
package com.avast.android.dialogs.core;

import android.app.Dialog;
import android.content.Context;
Expand All @@ -30,6 +30,8 @@
import android.view.ViewGroup;
import android.widget.*;

import com.avast.android.dialogs.R;

/**
* Base dialog fragment for all your dialogs, stylable and same design on Android 2.2+.
*
Expand Down

0 comments on commit 23f07ce

Please sign in to comment.