Skip to content

Commit

Permalink
Removed android in package name (breaking change)
Browse files Browse the repository at this point in the history
  • Loading branch information
JoanZapata committed Aug 9, 2015
1 parent f28f2fe commit 5c8d699
Show file tree
Hide file tree
Showing 28 changed files with 67 additions and 66 deletions.
19 changes: 10 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ Include the modules you need and declare them in your `Application`.

```gradle
dependencies {
compile 'com.joanzapata.android.iconify:android-iconify-fontawesome:2.0.0'
compile 'com.joanzapata.android.iconify:android-iconify-entypo:2.0.0'
compile 'com.joanzapata.android.iconify:android-iconify-typicons:2.0.0'
compile 'com.joanzapata.iconify:android-iconify-fontawesome:2.0.0'
compile 'com.joanzapata.iconify:android-iconify-entypo:2.0.0'
compile 'com.joanzapata.iconify:android-iconify-typicons:2.0.0'
}
```

Expand All @@ -42,7 +42,7 @@ public class MyApplication extends Application {
If you need to put an icon on a ```TextView``` or a ```Button```, use the ```{ }``` syntax. The icons act exactly like the text, so you can apply shadow, size and color on them!

```xml
<IconTextView
<com.joanzapata.iconify.widget.IconTextView
android:text="I {fa-heart-o} to {fa-code} on {fa-android}"
android:shadowColor="#22000000"
android:shadowDx="3"
Expand Down Expand Up @@ -73,20 +73,21 @@ menu.findItem(R.id.share).setIcon(

## Migration from 1.X.X

Iconify 2 introduces some breaking changes, here's the full list:
Iconify 2.X.X introduces breaking changes, here's the full list:

**In build file**

- `compile 'com.joanzapata.android:android-iconify:1.X.X'` -> `compile 'com.joanzapata.android.iconify:android-iconify-fontawesome:2.X.X'`
- `compile 'com.joanzapata.android:android-iconify:1.X.X'` -> `compile 'com.joanzapata.iconify:android-iconify-fontawesome:2.X.X'`

**In layouts**

- `android.widget.IconButton` -> `com.joanzapata.android.iconify.views.IconButton`
- `android.widget.IconTextView` -> `com.joanzapata.android.iconify.views.IconTextView`
- `android.widget.IconToggleButton` -> `com.joanzapata.android.iconify.views.IconToggleButton`
- `android.widget.IconButton` -> `com.joanzapata.iconify.views.IconButton`
- `android.widget.IconTextView` -> `com.joanzapata.iconify.views.IconTextView`
- `android.widget.IconToggleButton` -> `com.joanzapata.iconify.views.IconToggleButton`

**In code**

- `com.joanzapata.android.iconify...` -> `com.joanzapata.iconify...`
- `Iconify.IconValue.fa_something` -> `FontAwesomeIcons.fa_something`
- Nothing in `Application` class -> `Iconify.with(new FontAwesomeModule())`

Expand Down
2 changes: 1 addition & 1 deletion android-iconify-entypo/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="com.joanzapata.android.iconify.entypo">
<manifest package="com.joanzapata.iconify.entypo">

</manifest>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.joanzapata.android.iconify.fonts;
package com.joanzapata.iconify.fonts;

import com.joanzapata.android.iconify.Icon;
import com.joanzapata.iconify.Icon;

public enum EntypoIcons implements Icon {
entypo_github('\ue600'),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.joanzapata.android.iconify.fonts;
package com.joanzapata.iconify.fonts;

import com.joanzapata.android.iconify.Icon;
import com.joanzapata.android.iconify.IconFontDescriptor;
import com.joanzapata.iconify.Icon;
import com.joanzapata.iconify.IconFontDescriptor;

public class EntypoModule implements IconFontDescriptor {

Expand Down
2 changes: 1 addition & 1 deletion android-iconify-fontawesome/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="com.joanzapata.android.iconify.fontawesome">
<manifest package="com.joanzapata.iconify.fontawesome">

</manifest>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.joanzapata.android.iconify.fonts;
package com.joanzapata.iconify.fonts;

import com.joanzapata.android.iconify.Icon;
import com.joanzapata.iconify.Icon;

public enum FontAwesomeIcons implements Icon {
fa_500px('\uf26e'),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.joanzapata.android.iconify.fonts;
package com.joanzapata.iconify.fonts;

import com.joanzapata.android.iconify.Icon;
import com.joanzapata.android.iconify.IconFontDescriptor;
import com.joanzapata.iconify.Icon;
import com.joanzapata.iconify.IconFontDescriptor;

public class FontAwesomeModule implements IconFontDescriptor {

Expand Down
2 changes: 1 addition & 1 deletion android-iconify-sample/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.joanzapata.android.iconify.sample">
package="com.joanzapata.iconify.sample">

<application
android:name=".SampleApplication"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.joanzapata.android.iconify.sample;
package com.joanzapata.iconify.sample;

import android.content.Context;
import android.support.v4.view.PagerAdapter;
Expand All @@ -7,8 +7,8 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.joanzapata.android.iconify.IconFontDescriptor;
import com.joanzapata.android.iconify.sample.utils.AndroidUtils;
import com.joanzapata.iconify.IconFontDescriptor;
import com.joanzapata.iconify.sample.utils.AndroidUtils;

public class FontIconsViewPagerAdapter extends PagerAdapter {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.joanzapata.android.iconify.sample;
package com.joanzapata.iconify.sample;

import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
Expand All @@ -7,7 +7,7 @@
import android.widget.TextView;
import butterknife.Bind;
import butterknife.ButterKnife;
import com.joanzapata.android.iconify.Icon;
import com.joanzapata.iconify.Icon;

public class IconAdapter extends RecyclerView.Adapter<IconAdapter.ViewHolder> {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.joanzapata.android.iconify.sample;
package com.joanzapata.iconify.sample;

import android.os.Bundle;
import android.support.design.widget.TabLayout;
Expand All @@ -7,10 +7,10 @@
import android.support.v7.widget.Toolbar;
import butterknife.Bind;
import butterknife.ButterKnife;
import com.joanzapata.android.iconify.IconFontDescriptor;
import com.joanzapata.android.iconify.fonts.EntypoModule;
import com.joanzapata.android.iconify.fonts.FontAwesomeModule;
import com.joanzapata.android.iconify.fonts.TypiconsModule;
import com.joanzapata.iconify.IconFontDescriptor;
import com.joanzapata.iconify.fonts.EntypoModule;
import com.joanzapata.iconify.fonts.FontAwesomeModule;
import com.joanzapata.iconify.fonts.TypiconsModule;

public class MainActivity extends AppCompatActivity {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.joanzapata.android.iconify.sample;
package com.joanzapata.iconify.sample;

import android.app.Application;
import com.joanzapata.android.iconify.Iconify;
import com.joanzapata.android.iconify.fonts.EntypoModule;
import com.joanzapata.android.iconify.fonts.FontAwesomeModule;
import com.joanzapata.android.iconify.fonts.TypiconsModule;
import com.joanzapata.iconify.Iconify;
import com.joanzapata.iconify.fonts.EntypoModule;
import com.joanzapata.iconify.fonts.FontAwesomeModule;
import com.joanzapata.iconify.fonts.TypiconsModule;

public class SampleApplication extends Application {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.joanzapata.android.iconify.sample.utils;
package com.joanzapata.iconify.sample.utils;

import android.content.Context;
import android.graphics.Point;
Expand Down
2 changes: 1 addition & 1 deletion android-iconify-sample/src/main/res/layout/item_icon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">

<com.joanzapata.android.iconify.views.IconTextView
<com.joanzapata.iconify.widget.IconTextView
android:id="@+id/icon"
android:textSize="18sp"
android:textColor="@color/text_primary"
Expand Down
2 changes: 1 addition & 1 deletion android-iconify-typicons/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="com.joanzapata.android.iconify.typicons">
<manifest package="com.joanzapata.android.typicons">

</manifest>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.joanzapata.android.iconify.fonts;
package com.joanzapata.iconify.fonts;

import com.joanzapata.android.iconify.Icon;
import com.joanzapata.iconify.Icon;

public enum TypiconsIcons implements Icon {
typcn_adjust_brightness('\ue000'),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.joanzapata.android.iconify.fonts;
package com.joanzapata.iconify.fonts;

import com.joanzapata.android.iconify.Icon;
import com.joanzapata.android.iconify.IconFontDescriptor;
import com.joanzapata.iconify.Icon;
import com.joanzapata.iconify.IconFontDescriptor;

public class TypiconsModule implements IconFontDescriptor {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.joanzapata.android.iconify;
package com.joanzapata.iconify;

/**
* Icon represents one icon in an icon font.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.joanzapata.android.iconify;
package com.joanzapata.iconify;

import android.content.Context;
import android.graphics.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.joanzapata.android.iconify;
package com.joanzapata.iconify;

/**
* An IconFontDescriptor defines a TTF font file
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.joanzapata.android.iconify;
package com.joanzapata.iconify;

import android.content.Context;
import android.widget.TextView;
import com.joanzapata.android.iconify.internal.IconFontDescriptorWrapper;
import com.joanzapata.android.iconify.internal.ParsingUtil;
import com.joanzapata.iconify.internal.IconFontDescriptorWrapper;
import com.joanzapata.iconify.internal.ParsingUtil;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.joanzapata.android.iconify.internal;
package com.joanzapata.iconify.internal;

import android.graphics.Paint;
import android.graphics.Typeface;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.joanzapata.android.iconify.internal;
package com.joanzapata.iconify.internal;

import android.content.Context;
import android.graphics.Typeface;
import com.joanzapata.android.iconify.Icon;
import com.joanzapata.android.iconify.IconFontDescriptor;
import com.joanzapata.iconify.Icon;
import com.joanzapata.iconify.IconFontDescriptor;

import java.util.HashMap;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.joanzapata.android.iconify.internal;
package com.joanzapata.iconify.internal;

import android.content.Context;
import android.text.SpannableString;
import android.text.Spanned;
import android.util.SparseArray;
import com.joanzapata.android.iconify.Icon;
import com.joanzapata.iconify.Icon;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.joanzapata.android.iconify.views;
package com.joanzapata.iconify.widget;

import android.content.Context;
import android.util.AttributeSet;
import android.widget.Button;
import com.joanzapata.android.iconify.Iconify;
import com.joanzapata.iconify.Iconify;

public class IconButton extends Button {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.joanzapata.android.iconify.views;
package com.joanzapata.iconify.widget;

import android.content.Context;
import android.util.AttributeSet;
import android.widget.TextView;
import com.joanzapata.android.iconify.Iconify;
import com.joanzapata.iconify.Iconify;

public class IconTextView extends TextView {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.joanzapata.android.iconify.views;
package com.joanzapata.iconify.widget;

import android.content.Context;
import android.util.AttributeSet;
import android.widget.ToggleButton;
import com.joanzapata.android.iconify.Iconify;
import com.joanzapata.iconify.Iconify;

public class IconToggleButton extends ToggleButton {

Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GROUP=com.joanzapata.android.iconify
VERSION_NAME=2.0.0
VERSION_CODE=20000
GROUP=com.joanzapata.iconify
VERSION_NAME=2.0.1
VERSION_CODE=20001
POM_DESCRIPTION=Evolutive integration of popular icon fonts for Android

POM_URL=https://github.com/JoanZapata/android-iconify/
Expand Down

0 comments on commit 5c8d699

Please sign in to comment.