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

App compat setters with base classes #135

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Sample app module (#7)
* add sample app module to project

* update travis config

* move buildscript section to parent
  • Loading branch information
sgrekov authored and Mishkun committed Sep 2, 2019
commit 765467a7fb8c0579c479f8300091d50728de5051
15 changes: 10 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,28 @@
language: android
sudo: required
jdk: oraclejdk8

env:
global:
- GRADLE_OPTS=-Xmx512m
- ANDROID_API_LEVEL=28
- ANDROID_BUILD_TOOLS_VERSION=28.0.3
- ANDROID_ABI=armeabi-v7a

android:
components:
- tools
- build-tools-27.0.3
- android-27
- platform-tools
- tools
- extra-android-m2repository
licenses:
- 'android-sdk-preview-license-52d11cd2'
- 'android-sdk-license-.+'
- 'google-gdk-license-.+'

before_install:
- yes | sdkmanager "platforms;android-28"

jdk:
- oraclejdk8
- yes | sdkmanager "build-tools;28.0.3"

script:
- ./gradlew assemble anvil:check --stacktrace
9 changes: 1 addition & 8 deletions anvil-appcompat-v7/build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
buildscript {
dependencies {
classpath "com.android.tools.build:gradle:$agp_version"
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.5'
}
}

apply plugin: 'com.android.library'
apply plugin: 'trikita.anvilgen'
apply from: "$rootProject.projectDir/copyDeps.gradle"
Expand All @@ -21,7 +14,7 @@ android {
minSdkVersion 15
targetSdkVersion 27

missingDimensionStrategy 'api', 'sdk15'
missingDimensionStrategy 'api', 'sdk21'
}

lintOptions {
Expand Down
7 changes: 0 additions & 7 deletions anvil-cardview-v7/build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
buildscript {
dependencies {
classpath "com.android.tools.build:gradle:$agp_version"
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.5'
}
}

apply plugin: 'com.android.library'
apply plugin: 'trikita.anvilgen'
apply from: "$rootProject.projectDir/copyDeps.gradle"
Expand Down
7 changes: 0 additions & 7 deletions anvil-design/build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
buildscript {
dependencies {
classpath "com.android.tools.build:gradle:$agp_version"
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.5'
}
}

apply plugin: 'com.android.library'
apply plugin: 'trikita.anvilgen'
apply from: "$rootProject.projectDir/copyDeps.gradle"
Expand Down
7 changes: 0 additions & 7 deletions anvil-gridlayout-v7/build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
buildscript {
dependencies {
classpath "com.android.tools.build:gradle:$agp_version"
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.5'
}
}

apply plugin: 'com.android.library'
apply plugin: 'trikita.anvilgen'
apply from: "$rootProject.projectDir/copyDeps.gradle"
Expand Down
7 changes: 0 additions & 7 deletions anvil-recyclerview-v7/build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
buildscript {
dependencies {
classpath "com.android.tools.build:gradle:$agp_version"
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.5'
}
}

apply plugin: 'com.android.library'
apply plugin: 'trikita.anvilgen'
apply from: "$rootProject.projectDir/copyDeps.gradle"
Expand Down
9 changes: 1 addition & 8 deletions anvil-support-v4/build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
buildscript {
dependencies {
classpath "com.android.tools.build:gradle:$agp_version"
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.5'
}
}

apply plugin: 'com.android.library'
apply plugin: 'trikita.anvilgen'
apply from: "$rootProject.projectDir/copyDeps.gradle"
Expand All @@ -21,7 +14,7 @@ android {
minSdkVersion 15
targetSdkVersion 27

missingDimensionStrategy 'api', 'sdk15'
missingDimensionStrategy 'api', 'sdk21'
}

lintOptions {
Expand Down
7 changes: 0 additions & 7 deletions anvil/build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
buildscript {
dependencies {
classpath "com.android.tools.build:gradle:$agp_version"
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.5'
}
}

apply plugin: 'com.android.library'
apply plugin: 'trikita.anvilgen'

Expand Down
17 changes: 17 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
buildscript {
dependencies {
classpath "com.android.tools.build:gradle:3.3.2"
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.5'
}

repositories {
google()
jcenter()
}
}

subprojects {
ext {
mockito_version = '2.23.0'
Expand All @@ -6,6 +18,11 @@ subprojects {
}

buildscript {
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.31"
classpath "com.android.tools.build:gradle:$agp_version"
}

repositories {
google()
jcenter()
Expand Down
1 change: 1 addition & 0 deletions sample/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
40 changes: 40 additions & 0 deletions sample/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'

android {
compileSdkVersion 27

defaultConfig {
applicationId "trikita.anvil.sample"
minSdkVersion 21
targetSdkVersion 27
versionCode 1
versionName "1.0"

missingDimensionStrategy 'api', 'sdk21'
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}

}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.31"
implementation "com.android.support:appcompat-v7:27.1.1"
implementation project(":anvil")
implementation project(":anvil-support-v4")
implementation project(":anvil-appcompat-v7")


testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
}
21 changes: 21 additions & 0 deletions sample/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
21 changes: 21 additions & 0 deletions sample/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="trikita.anvil.sample">

<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>

</manifest>
56 changes: 56 additions & 0 deletions sample/src/main/java/trikita/anvil/sample/MainActivity.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
package trikita.anvil.sample

import android.os.Bundle
import android.support.v7.app.AppCompatActivity
import android.widget.LinearLayout
import trikita.anvil.BaseDSL.MATCH
import trikita.anvil.BaseDSL.WRAP
import trikita.anvil.BaseDSL.dip
import trikita.anvil.BaseDSL.padding
import trikita.anvil.BaseDSL.size
import trikita.anvil.DSL.button
import trikita.anvil.DSL.frameLayout
import trikita.anvil.DSL.linearLayout
import trikita.anvil.DSL.onClick
import trikita.anvil.DSL.orientation
import trikita.anvil.DSL.text
import trikita.anvil.DSL.textView
import trikita.anvil.RenderableView


class MainActivity : AppCompatActivity() {

var ticktock = 0

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(object : RenderableView(this) {
override fun view() {
linearLayout {
size(MATCH, MATCH)
padding(dip(8))
orientation(LinearLayout.VERTICAL)

textView {
size(MATCH, WRAP)
text("Tick-tock: $ticktock")
}

frameLayout {
size(MATCH, WRAP)

button {
size(WRAP, WRAP)
text("Tick")
onClick { v ->
ticktock++
}
}
}

}
}
})
}

}
34 changes: 34 additions & 0 deletions sample/src/main/res/drawable-v24/ic_launcher_foreground.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:fillType="evenOdd"
android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
android:strokeWidth="1"
android:strokeColor="#00000000">
<aapt:attr name="android:fillColor">
<gradient
android:endX="78.5885"
android:endY="90.9159"
android:startX="48.7653"
android:startY="61.0927"
android:type="linear">
<item
android:color="#44000000"
android:offset="0.0" />
<item
android:color="#00000000"
android:offset="1.0" />
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
</vector>
Loading