Skip to content

Commit

Permalink
Merge pull request mikepenz#2663 from mikepenz/develop
Browse files Browse the repository at this point in the history
develop -> main
  • Loading branch information
mikepenz authored Oct 18, 2020
2 parents 016b1ea + a7267cb commit c4c1bd6
Show file tree
Hide file tree
Showing 6 changed files with 63 additions and 17 deletions.
28 changes: 28 additions & 0 deletions .github/config/configuration.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"categories": [
{
"title": "## 🚀 Features",
"labels": [
"feature"
]
},
{
"title": "## 🐛 Fixes",
"labels": [
"fix"
]
},
{
"title": "## 🧪 Tests",
"labels": [
"test"
]
},
{
"title": "## 💬 Other",
"labels": [
"other"
]
}
]
}
13 changes: 13 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 100

- name: Validate gradle wrapper
uses: gradle/wrapper-validation-action@v1
Expand Down Expand Up @@ -99,10 +101,21 @@ jobs:
name: "App-Artifacts"
path: artifacts/*

- name: Build Changelog
id: github_release
uses: mikepenz/release-changelog-builder-action@v1
if: startsWith(github.ref, 'refs/tags/')
with:
configuration: ".github/config/configuration.json"
ignorePreReleases: ${{ !contains(github.ref, '-') }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Release
uses: softprops/action-gh-release@91409e712cf565ce9eff10c87a8d1b11b81757ae
if: startsWith(github.ref, 'refs/tags/')
with:
body: ${{steps.github_release.outputs.changelog}}
prerelease: ${{ contains(github.ref, '-rc') || contains(github.ref, '-b') || contains(github.ref, '-a') }}
files: artifacts/*
env:
Expand Down
10 changes: 7 additions & 3 deletions Dangerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,15 @@ File.open("settings.gradle", "r") do |file_handle|

# AndroidLint
androidLintFile = String.new(gradleModule + "/build/reports/lint-results.xml")

if File.file?(androidLintFile)
androidLintDebugFile = String.new(gradleModule + "/build/reports/lint-results-debug.xml")
if File.file?(androidLintFile) || File.file?(androidLintDebugFile)
android_lint.skip_gradle_task = true
android_lint.severity = "Warning"
android_lint.report_file = androidLintFile
if File.file?(androidLintFile)
android_lint.report_file = androidLintFile
else
android_lint.report_file = androidLintDebugFile
end
android_lint.filtering = true
android_lint.lint(inline_mode: true)
end
Expand Down
10 changes: 5 additions & 5 deletions MIGRATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@

- Ground up refactor of the way the `MaterialDrawer` is used and integrated into the app.
- Please consider carefully before upgrading to this version.
- Prior to v8 the `Drawer` would automatically inject the `DrawerLayout` into the layout hierarchy, apply window flags, and take over control of the `ActionbarDrawerToggle`.
- This may seemed convenient for easy usecases, but created big problems for more advanced implementations where taking over window insets is expected
- v8 will no longer do any of this, and gives back all the control to the developer, no more unexpected layout flags, chagnes to the layout hierarchy or anything similar.
- Prior to v8 the `Drawer` would automatically inject the `DrawerLayout` into the layout hierarchy, apply window flags, and take over control of the `ActionBarDrawerToggle`.
- This may seem convenient for easy usecases, but created big problems for more advanced implementations where taking over window insets is expected
- v8 will no longer do any of this, and gives back all the control to the developer, no more unexpected layout flags, changes to the layout hierarchy or anything similar.
- The core principle behind v8 is to offer just the UI and give back all control to developers.
- Additionally v8 eliminates dependencies on `Materialize`, `Android-Iconics`
- v8 also now comes with better theming support and better dark mode support
- As v8 is ground up different in the way it is set up it is recommended to re-read the README and check out the sample again
- Basic upgrade procedure:
- Add `DrawerLayout` into your layout
- Add `MaterialDrawerSliderView` as child to the `DrawerLayout`
- Find the reference to the `MaterialDrawerSliderView` in your `Activit` / `Fragment`
- Find the reference to the `MaterialDrawerSliderView` in your `Activity` / `Fragment`
- Use the `MaterialDrawerSliderView` to fill the list / do updates
- Basic upgrade prodedure for the `AccountHeader`:
- Create a instance of the `AccountHeaderView`
- Create an instance of the `AccountHeaderView`
- Attach to the slider via `attachToSliderView(slider)`
- Additionally v8 is more optimized for Kotlin meaning all legacy `with(*)` methods were replaced (kept as extension functions as legacy support) with properties

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@

## Latest releases 🛠

- Kotlin && New | [v8.1.6](https://github.com/mikepenz/MaterialDrawer/tree/v8.1.6)
- Kotlin && New | [v8.1.7](https://github.com/mikepenz/MaterialDrawer/tree/v8.1.7)
- Kotlin | [v7.0.0](https://github.com/mikepenz/MaterialDrawer/tree/v7.0.0) | (Builder approach like v6.x)
- Java && AndroidX | [v6.1.2](https://github.com/mikepenz/MaterialDrawer/tree/v6.1.2)
- Java && AppCompat | [v6.0.9](https://github.com/mikepenz/MaterialDrawer/tree/v6.0.9)
Expand Down
17 changes: 9 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ buildscript {

ext {
release = [
versionName: "8.1.6",
versionCode: 8016
versionName: "8.1.7",
versionCode: 8017
]

setup = [
Expand All @@ -20,28 +20,29 @@ buildscript {
recyclerView : '1.1.0',
core : '1.3.0',
material : '1.2.1',
appcompat : '1.1.0',
appcompat : '1.2.0',
drawerlayout : '1.1.1',
constraintLayout : '2.0.1',
constraintLayout : '2.0.2',
cardview : '1.0.0',
kotlin : "1.4.10",
fastadapter : "5.2.3",
fastadapter : "5.2.4",
iconics : "5.0.3",
aboutLibs : "8.3.1",
navigation : "2.3.0",
aboutLibs : "8.4.2",
navigation : "2.3.1",
detekt : '1.14.1',
slidingpaneLayout : "1.1.0",
swiperefreshLayout: "1.1.0"
]
}

repositories {
maven { url "https://plugins.gradle.org/m2/" }
google()
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.android.tools.build:gradle:4.1.0'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
Expand Down

0 comments on commit c4c1bd6

Please sign in to comment.