Skip to content

Commit d47f9bf

Browse files
Merge pull request #115 from Polidea/update_to_3.1.0
Update to 3.1.0
2 parents 20c146a + 019cd75 commit d47f9bf

11 files changed

+30
-13
lines changed

CockpitCore/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ plugins {
1616
}
1717

1818
group 'com.polidea.cockpit'
19-
version '3.0.1'
19+
version '3.1.0'
2020

2121
repositories {
2222
google()

CockpitPlugin/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
buildscript {
22
ext.kotlin_version = '1.3.10'
3-
ext.cockpit_core_version = '3.0.1'
3+
ext.cockpit_core_version = '3.1.0'
44
repositories {
55
maven {
66
url "https://plugins.gradle.org/m2/"
@@ -21,7 +21,7 @@ plugins {
2121
}
2222

2323
group = 'com.polidea.cockpit'
24-
version = '3.0.1'
24+
version = '3.1.0'
2525

2626
sourceCompatibility = 1.7
2727

README.md

+22-7
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ It consists of three parts:
1212
- Android library containing classes to manage and display those params,
1313
- CockpitCore module containing classes common for plugin and the library.
1414

15-
<img src="https://github.com/Polidea/Cockpit/blob/master/images/cockpit-3.0.gif" width="270" height="480">
15+
<img src="https://github.com/Polidea/Cockpit/blob/a5d9b822b7bccbebf1800a5cc9a25f67429a7a92/images/cockpit-3.1.0.gif" width="270" height="480">
1616

1717
Each defined value is called `param`. The set of params is called `cockpit`.
1818

@@ -33,9 +33,9 @@ showDescription: true
3333
After you've built your project, `Cockpit.java` file will get generated for you. You can use it like any other code in your project.
3434

3535
<p float="left">
36-
<img src="https://github.com/Polidea/Cockpit/blob/master/images/cockpit-full.png" width="216" height="384" />
37-
<img src="https://github.com/Polidea/Cockpit/blob/master/images/cockpit-half.png" width="216" height="384" />
38-
<img src="https://github.com/Polidea/Cockpit/blob/master/images/cockpit-list.png" width="216" height="384" />
36+
<img src="https://github.com/Polidea/Cockpit/blob/a5d9b822b7bccbebf1800a5cc9a25f67429a7a92/images/cockpit-full.png" width="216" height="384" />
37+
<img src="https://github.com/Polidea/Cockpit/blob/a5d9b822b7bccbebf1800a5cc9a25f67429a7a92/images/cockpit-half.png" width="216" height="384" />
38+
<img src="https://github.com/Polidea/Cockpit/blob/a5d9b822b7bccbebf1800a5cc9a25f67429a7a92/images/cockpit-list.png" width="216" height="384" />
3939
</p>
4040

4141
### Documentation
@@ -141,6 +141,21 @@ fontColor:
141141
group: "Header"
142142
```
143143

144+
> You can create **paged subgroups** as well. To define a paged subgroup, use slashes in group name. If you begin your subgroup's name with `/`, it will be placed inside `Default` group. You can embed the subgroups as deep as you see fit. To navigate between the subgroups, use home button on the action bar or `NAVIGATE TO` button.
145+
146+
The following snippet will create group named `Display` with subgroup `Header` and parameters `fontSize` and `fontColor` inside.
147+
```
148+
fontSize:
149+
description: "Font size"
150+
value: 18
151+
group: "Display/Header"
152+
fontColor:
153+
type: color
154+
description: "Font color"
155+
value: "#223344"
156+
group: "Display/Header"
157+
```
158+
144159
#### Generating Cockpit
145160

146161
CockpitPlugin will generate `Cockpit.java` file for you.
@@ -198,15 +213,15 @@ Then add CockpitPlugin classpath into your `buildscript#dependencies`:
198213
```
199214
buildscript {
200215
dependencies {
201-
classpath "gradle.plugin.com.polidea.cockpit:CockpitPlugin:3.0.1"
216+
classpath "gradle.plugin.com.polidea.cockpit:CockpitPlugin:3.1.0"
202217
}
203218
}
204219
```
205220
Last thing is to add Cockpit library dependency:
206221

207222
```
208223
dependencies {
209-
debugImplementation 'com.polidea.cockpit:cockpit:3.0.1'
224+
debugImplementation 'com.polidea.cockpit:cockpit:3.1.0'
210225
}
211226
```
212227

@@ -259,7 +274,7 @@ To get it to work, you need to disable configuration on demand in your Android S
259274

260275
## License
261276
```
262-
Copyright 2018 Polidea
277+
Copyright 2018-2019 Polidea
263278
264279
Licensed under the Apache License, Version 2.0 (the "License");
265280
you may not use this file except in compliance with the License.

gradle.properties

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ GROUP=com.polidea.cockpit
2020
POM_ARTIFACT_ID=cockpit
2121
POM_NAME=Cockpit
2222
POM_PACKAGING=aar
23-
VERSION_NAME=3.0.1
23+
VERSION_NAME=3.1.0
2424

2525
POM_DESCRIPTION=Cockpit is an Android library providing a way to easily define a set of parameters that can be accessed and changed by the developers via built-in compact UI at runtime.
2626

@@ -39,6 +39,8 @@ POM_DEVELOPER_ID2=piwonski
3939
POM_DEVELOPER_NAME2=Wojciech Piwonski
4040
POM_DEVELOPER_ID3=MarcinKornacki
4141
POM_DEVELOPER_NAME3=Marcin Kornacki
42+
POM_DEVELOPER_ID4=mikolak
43+
POM_DEVELOPER_NAME4=Mikolaj Kojdecki
4244

4345
android.useAndroidX=true
4446
android.enableJetifier=true

gradle/dependencies.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
ext {
2-
cockpit_core_version = '3.0.1'
2+
cockpit_core_version = '3.1.0'
33
}

images/cockpit-3.0.gif

-7.68 MB
Binary file not shown.

images/cockpit-3.1.0.gif

5.76 MB
Loading

images/cockpit-full.png

100755100644
-7.88 KB
Loading

images/cockpit-half.png

-279 KB
Loading

images/cockpit-list.png

-242 KB
Loading

sample/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ android {
2727
minSdkVersion 21
2828
targetSdkVersion 28
2929
versionCode 2
30-
versionName "3.0.1"
30+
versionName "3.1.0"
3131

3232
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3333

0 commit comments

Comments
 (0)