Skip to content

Commit

Permalink
update build version
Browse files Browse the repository at this point in the history
  • Loading branch information
lany192 committed Oct 16, 2018
1 parent 808fed1 commit 8c24e26
Show file tree
Hide file tree
Showing 11 changed files with 77 additions and 44 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

defaultConfig {
...
renderscriptTargetApi 27
renderscriptTargetApi 28
renderscriptSupportModeEnabled true
...
}
Expand Down
12 changes: 7 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 27
compileSdkVersion 28
defaultConfig {
applicationId "com.github.lany192.blurdialog.sample"
minSdkVersion 14
targetSdkVersion 27
minSdkVersion 16
targetSdkVersion 28
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
renderscriptTargetApi 27
renderscriptTargetApi 28
renderscriptSupportModeEnabled true
}
buildTypes {
Expand All @@ -25,7 +25,9 @@ dependencies {
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
implementation 'com.android.support:appcompat-v7:27.0.2'
implementation 'com.github.lany192:Box:2.4.3'
implementation 'com.jakewharton:butterknife:8.8.1'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
testImplementation 'junit:junit:4.12'
implementation project(':library')
}
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
package="com.github.lany192.blurdialog.sample">

<application
android:name=".MyApp"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,29 +1,37 @@
package com.github.lany192.blurdialog.sample;

import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.View;

public class MainActivity extends AppCompatActivity {
private final String TAG = "MainActivity";
import com.lany.box.activity.BaseActivity;

import butterknife.OnClick;

public class MainActivity extends BaseActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
findViewById(R.id.button).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
SampleDialogFragment dialogFragment = SampleDialogFragment.newInstance();
dialogFragment.show(getSupportFragmentManager(), TAG);
}
});
findViewById(R.id.button2).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
SampleBottomDialogFragment dialogFragment = SampleBottomDialogFragment.newInstance();
dialogFragment.show(getSupportFragmentManager(), TAG);
}
});
protected boolean hasBackBtn() {
return false;
}

@Override
protected int getLayoutId() {
return R.layout.activity_main;
}

@Override
protected void init(Bundle bundle) {

}

@OnClick(R.id.button)
void buttonClicked() {
SampleDialogFragment dialogFragment = SampleDialogFragment.newInstance();
dialogFragment.show(getSupportFragmentManager(), TAG);
}

@OnClick(R.id.button2)
void button2Clicked() {
SampleBottomDialogFragment dialogFragment = SampleBottomDialogFragment.newInstance();
dialogFragment.show(getSupportFragmentManager(), TAG);
}
}
14 changes: 14 additions & 0 deletions app/src/main/java/com/github/lany192/blurdialog/sample/MyApp.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.github.lany192.blurdialog.sample;

import android.app.Application;

import com.lany.box.Box;

public class MyApp extends Application {

@Override
public void onCreate() {
super.onCreate();
Box.of().init(this, BuildConfig.DEBUG);
}
}
13 changes: 9 additions & 4 deletions app/src/main/res/layout/bottom_dialog_layout.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,30 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:minHeight="200dp"
android:orientation="vertical"
android:padding="16dp">

<TextView
android:id="@+id/textView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="50dp"
android:text="TextView" />

<Button
android:id="@+id/button3"
android:layout_width="match_parent"
android:layout_marginTop="8dp"
android:background="@android:color/black"
android:text="@android:string/ok"
android:layout_height="wrap_content"
android:text="ok" />
android:textColor="@android:color/white" />

<Button
android:id="@+id/sdfsd"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="cancel" />
android:layout_marginTop="8dp"
android:background="@android:color/black"
android:text="@android:string/cancel"
android:textColor="@android:color/white" />
</LinearLayout>
6 changes: 3 additions & 3 deletions app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#3F51B5</color>
<color name="colorPrimaryDark">#303F9F</color>
<color name="colorAccent">#FF4081</color>
<color name="colorPrimary">#303030</color>
<color name="colorPrimaryDark">#303030</color>
<color name="colorAccent">#303030</color>
</resources>
2 changes: 1 addition & 1 deletion app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<resources>

<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
Expand Down
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.novoda:bintray-release:0.5.0'
}
}
Expand All @@ -15,6 +15,8 @@ allprojects {
repositories {
jcenter()
google()
maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
maven { url "https://jitpack.io" }
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Dec 21 10:36:36 CST 2017
#Tue Oct 16 11:10:42 CST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
13 changes: 7 additions & 6 deletions library/build.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 27
compileSdkVersion 28

defaultConfig {
minSdkVersion 14
targetSdkVersion 27
minSdkVersion 16
targetSdkVersion 28
versionCode 1
versionName "1.0"

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

renderscriptTargetApi 27
renderscriptTargetApi 28
renderscriptSupportModeEnabled true

}
Expand All @@ -29,6 +29,7 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations'
})
testImplementation 'junit:junit:4.12'
implementation 'com.android.support:appcompat-v7:27.0.2'
implementation 'com.android.support:appcompat-v7:28.0.0'
}
apply from: '../bintray.gradle'

//apply from: '../bintray.gradle'

0 comments on commit 8c24e26

Please sign in to comment.