Skip to content
This repository was archived by the owner on Aug 22, 2020. It is now read-only.

Commit

Permalink
Project: Update libraries & remove unused dependencies
Browse files Browse the repository at this point in the history
Signed-off-by: Fung Gwo <[email protected]>
  • Loading branch information
fython committed Mar 3, 2018
1 parent 50697a4 commit 171b5e5
Show file tree
Hide file tree
Showing 11 changed files with 55 additions and 30 deletions.
15 changes: 13 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,28 @@
ext {
supportLibraryVersion = '27.1.0'

minSdkVersion = 19
targetSdkVersion = 27
buildToolsVersion = "27.0.3"
versionCode = 4
versionName = "0.2.0"
}

buildscript {
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.0'
classpath 'com.android.tools.build:gradle:3.0.1'
}
}

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

Expand Down
16 changes: 8 additions & 8 deletions demo/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion TARGET_SDK_VERSION.toInteger()
buildToolsVersion BUILD_TOOLS_VERSION
compileSdkVersion rootProject.ext.targetSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
defaultConfig {
applicationId "moe.feng.common.view.breadcrumbs.demo"
minSdkVersion MIN_SDK_VERSION.toInteger()
targetSdkVersion TARGET_SDK_VERSION.toInteger()
versionCode VERSION_CODE.toInteger()
versionName VERSION_NAME
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode rootProject.ext.versionCode
versionName rootProject.ext.versionName
}
buildTypes {
release {
Expand All @@ -21,6 +21,6 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile project(':library')
compile 'com.android.support:appcompat-v7:26.0.0'
compile 'com.android.support:design:26.0.0'
compile "com.android.support:appcompat-v7:$supportLibraryVersion"
compile "com.android.support:design:$supportLibraryVersion"
}
7 changes: 1 addition & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
BUILD_TOOLS_VERSION=26.0.0
org.gradle.jvmargs=-Xmx1536m
VERSION_NAME=0.1.2
TARGET_SDK_VERSION=26
VERSION_CODE=3
MIN_SDK_VERSION=19
org.gradle.jvmargs=-Xmx1536m
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Mon Dec 28 10:00:20 PST 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip
15 changes: 7 additions & 8 deletions library/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion TARGET_SDK_VERSION.toInteger()
buildToolsVersion BUILD_TOOLS_VERSION
compileSdkVersion rootProject.ext.targetSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
defaultConfig {
minSdkVersion MIN_SDK_VERSION.toInteger()
targetSdkVersion TARGET_SDK_VERSION.toInteger()
versionCode VERSION_CODE.toInteger()
versionName VERSION_NAME
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode rootProject.ext.versionCode
versionName rootProject.ext.versionName
}
buildTypes {
release {
Expand All @@ -19,6 +19,5 @@ android {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:26.0.0'
compile 'com.android.support:recyclerview-v7:26.0.0'
compile "com.android.support:recyclerview-v7:$supportLibraryVersion"
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import android.support.annotation.IdRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v7.widget.ListPopupWindow;
import android.support.v7.widget.RecyclerView;
import android.view.*;
import android.widget.*;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import moe.feng.common.view.breadcrumbs.model.BreadcrumbItem;

import java.util.ArrayList;
import java.util.List;

public class BreadcrumbsView extends FrameLayout {

Expand Down
11 changes: 11 additions & 0 deletions library/src/main/res/layout-v21/breadcrumbs_view_item_arrow.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<ImageButton
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/btn_more"
android:layout_width="24dp"
android:layout_height="match_parent"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_chevron_right_black_24dp"
android:tint="?android:attr/textColorSecondary"/>
12 changes: 12 additions & 0 deletions library/src/main/res/layout-v21/breadcrumbs_view_item_text.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Button
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:padding="16dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorPrimary"
android:background="?android:attr/selectableItemBackgroundBorderless"
tools:text="Example"/>
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
android:layout_height="match_parent"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:background="?android:attr/selectableItemBackground"
android:src="@drawable/ic_chevron_right_black_24dp"
android:tint="?android:attr/textColorSecondary"/>
2 changes: 1 addition & 1 deletion library/src/main/res/layout/breadcrumbs_view_item_text.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
android:padding="16dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorPrimary"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:background="?android:attr/selectableItemBackground"
tools:text="Example"/>

0 comments on commit 171b5e5

Please sign in to comment.