Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support android X #215

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions android-iconify-entypo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_6
targetCompatibility JavaVersion.VERSION_1_6
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}

dependencies {
compile project(':android-iconify')
implementation project(':android-iconify')
}

apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
6 changes: 3 additions & 3 deletions android-iconify-fontawesome/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_6
targetCompatibility JavaVersion.VERSION_1_6
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}

dependencies {
compile project(':android-iconify')
implementation project(':android-iconify')
}

apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
6 changes: 3 additions & 3 deletions android-iconify-ionicons/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_6
targetCompatibility JavaVersion.VERSION_1_6
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}

dependencies {
compile project(':android-iconify')
implementation project(':android-iconify')
}

apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
6 changes: 3 additions & 3 deletions android-iconify-material-community/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_6
targetCompatibility JavaVersion.VERSION_1_6
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}

dependencies {
compile project(':android-iconify')
implementation project(':android-iconify')
}

apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
6 changes: 3 additions & 3 deletions android-iconify-material/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_6
targetCompatibility JavaVersion.VERSION_1_6
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}

dependencies {
compile project(':android-iconify')
implementation project(':android-iconify')
}

apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
6 changes: 3 additions & 3 deletions android-iconify-meteocons/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_6
targetCompatibility JavaVersion.VERSION_1_6
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}

dependencies {
compile project(':android-iconify')
implementation project(':android-iconify')
}

apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
93 changes: 49 additions & 44 deletions android-iconify-sample/build.gradle
Original file line number Diff line number Diff line change
@@ -1,66 +1,71 @@
buildscript {
dependencies {
classpath rootProject.ext.androidPlugin
}
dependencies {
classpath rootProject.ext.androidPlugin
}
}

apply plugin: 'com.android.application'

repositories {
jcenter()
google()
jcenter()
maven { url 'https://maven.google.com' }
}

android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
applicationId "com.joanzapata.android.icons.sample"
minSdkVersion 8
targetSdkVersion rootProject.ext.compileSdkVersion
versionCode VERSION_CODE.toInteger()
versionName VERSION_NAME
}
defaultConfig {
applicationId "com.joanzapata.android.icons.sample"
minSdkVersion 14
targetSdkVersion rootProject.ext.compileSdkVersion
versionCode VERSION_CODE.toInteger()
versionName VERSION_NAME
}

def password = project.hasProperty('ICONIFY_SAMPLE_KEYSTORE_PASSWORD') ?
project.property('ICONIFY_SAMPLE_KEYSTORE_PASSWORD') : ''
signingConfigs {
release {
storeFile file("keystore")
storePassword password
keyAlias "android-iconify"
keyPassword password
}
def password = project.hasProperty('ICONIFY_SAMPLE_KEYSTORE_PASSWORD') ?
project.property('ICONIFY_SAMPLE_KEYSTORE_PASSWORD') : ''
signingConfigs {
release {
storeFile file("keystore")
storePassword password
keyAlias "android-iconify"
keyPassword password
}
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_6
targetCompatibility JavaVersion.VERSION_1_6
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

buildTypes {
release {
minifyEnabled false
signingConfig signingConfigs.release
}
buildTypes {
release {
minifyEnabled false
signingConfig signingConfigs.release
}
}
}

dependencies {
compile 'com.android.support:appcompat-v7:22.2.1'
compile 'com.android.support:recyclerview-v7:22.2.1'
compile 'com.android.support:design:22.2.1'
compile 'com.jakewharton:butterknife:7.0.1'
implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha01'
implementation 'com.google.android.material:material:1.1.0-alpha02'
implementation 'com.jakewharton:butterknife:9.0.0'
annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0'

implementation project(':android-iconify-fontawesome')
implementation project(':android-iconify-typicons')
implementation project(':android-iconify-ionicons')
implementation project(':android-iconify-entypo')
implementation project(':android-iconify-material')
implementation project(':android-iconify-material-community')
implementation project(':android-iconify-meteocons')
implementation project(':android-iconify-weathericons')
implementation project(':android-iconify-simplelineicons')
implementation project(':android-iconify')

compile project(':android-iconify-fontawesome')
compile project(':android-iconify-typicons')
compile project(':android-iconify-ionicons')
compile project(':android-iconify-entypo')
compile project(':android-iconify-material')
compile project(':android-iconify-material-community')
compile project(':android-iconify-meteocons')
compile project(':android-iconify-weathericons')
compile project(':android-iconify-simplelineicons')
}

apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import android.app.Activity;
import android.content.Context;
import android.support.v4.view.PagerAdapter;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.viewpager.widget.PagerAdapter;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
package com.joanzapata.iconify.sample;

import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import butterknife.Bind;
import butterknife.ButterKnife;

import com.joanzapata.iconify.Icon;

import butterknife.BindView;
import butterknife.ButterKnife;

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

private final Icon[] icons;
Expand Down Expand Up @@ -39,8 +41,10 @@ public int getItemCount() {

public static class ViewHolder extends RecyclerView.ViewHolder {

@Bind(R.id.icon) TextView icon;
@Bind(R.id.name) TextView name;
@BindView(R.id.icon)
TextView icon;
@BindView(R.id.name)
TextView name;

public ViewHolder(View itemView) {
super(itemView);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
package com.joanzapata.iconify.sample;

import android.os.Bundle;
import android.support.design.widget.TabLayout;
import android.support.v4.view.ViewPager;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import butterknife.Bind;
import com.google.android.material.tabs.TabLayout;
import androidx.viewpager.widget.ViewPager;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;

import butterknife.BindView;
import butterknife.ButterKnife;

public class MainActivity extends AppCompatActivity {

@Bind(R.id.tabs) TabLayout tabLayout;
@Bind(R.id.toolbar) Toolbar toolbar;
@Bind(R.id.viewPager) ViewPager viewPager;
@BindView(R.id.tabs)
TabLayout tabLayout;
@BindView(R.id.toolbar)
Toolbar toolbar;
@BindView(R.id.viewPager)
ViewPager viewPager;

@Override
protected void onCreate(Bundle savedInstanceState) {
Expand Down
Loading