diff --git a/README.md b/README.md
index fd2e12d8a18f670ec0b08dd17a80143e8bf6ef8a..f06c7b8fd63d01d950050b402f8b374f8b2d87af 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# QuasselDroid-ng
-[](https://github.com/justjanne/QuasselDroid-ng/releases)
+[](https://github.com/justjanne/QuasselDroid-ng/releases)
Quassel is a distributed, decentralized IRC client, written using C++ and Qt.
QuasselDroid is a pure-java client for the Quassel core, allowing you to connect
@@ -8,7 +8,7 @@ to your Quassel core using your Android ™ phone.
*Inspired by and based on [QuasselDroid](https://github.com/sandsmark/QuasselDroid)*
-
+
## Warning
@@ -70,23 +70,68 @@ The older implementation is still available at <https://github.com/sandsmark/Qua
### QuasselDroid
-* [**Android Support**](http://developer.android.com/tools/support-library/index.html)
- Apache 2.0
-* [**Android App Architecture**](https://developer.android.com/topic/libraries/architecture/guide.html)
- Apache 2.0
-* [**ThreeTen Backport**](http://www.threeten.org/threetenbp/)
+* [**Android Architecture Components: Lifecycle**](https://android.googlesource.com/platform/frameworks/support/+/master/lifecycle)
+ Apache-2.0
+* [**Android Architecture Components: Paging**](https://android.googlesource.com/platform/frameworks/support/+/master/paging)
+ Apache-2.0
+* [**Android Architecture Components: Persistence**](https://android.googlesource.com/platform/frameworks/support/+/master/persistence)
+ Apache-2.0
+* [**Android Architecture Components: Room**](https://android.googlesource.com/platform/frameworks/support/+/master/persistence)
+ Apache-2.0
+* [**Android Sliding Up Panel**](https://github.com/umano/AndroidSlidingUpPanel)
+ Apache-2.0
+* [**Android Support Library**](https://android.googlesource.com/platform/frameworks/support/+/master)
+ Apache-2.0
+* [**Android Support Library: Constraint Layout**](https://android.googlesource.com/platform/frameworks/opt/sherpa/+/studio-3.0/constraintlayout)
+ Apache-2.0
+* [**atinject**](https://code.google.com/archive/p/atinject/)
+ Apache-2.0
+* [**AutoService**](https://github.com/google/auto/tree/master/service)
+ Apache-2.0
+* [**Better Link Movement Method**](https://github.com/Saketme/Better-Link-Movement-Method)
+ Apache-2.0
+* [**Butter Knife**](http://jakewharton.github.io/butterknife/)
+ Apache-2.0
+* [**Dagger 2**](https://google.github.io/dagger/)
+ Apache-2.0
+* [**Glide**](https://bumptech.github.io/glide/)
+ Apache-2.0
+* [**GlobTransformer**](https://bumptech.github.io/glide/)
+ CC BY-SA 3.0
+* [**Gson**](https://github.com/google/gson)
+ Apache-2.0
+* [**JavaPoet**](https://github.com/square/javapoet)
+ Apache-2.0
+* [**JetBrains Java Annotations**](https://github.com/JetBrains/java-annotations)
+ Apache-2.0
+* [**Kotlin Standard Library**](https://kotlinlang.org/)
+ Apache-2.0
+* [**LeakCanary**](https://github.com/square/leakcanary)
+ Apache-2.0
+* [**Material Design Icons: Community**](https://github.com/Templarian/MaterialDesign)
+ SIL Open Font License v1.1
+* [**Material Design Icons: Google**](https://github.com/google/material-design-icons)
+ Apache-2.0
+* [**Material Dialogs**](https://github.com/afollestad/material-dialogs)
+ MIT
+* [**MaterialProgressBar**](https://github.com/DreaminginCodeZH/MaterialProgressBar)
+ Apache-2.0
+* [**Quassel**](https://quassel-irc.org/)
+ GPLv3
+* [**Reactive Streams**](https://github.com/ReactiveX/RxJava)
+ CC0
+* [**RxJava**](https://github.com/ReactiveX/RxJava)
+ Apache-2.0
+* [**ThreeTen backport project**](http://www.threeten.org/threetenbp/)
BSD 3-clause
-* [**ButterKnife**](https://github.com/JakeWharton/butterknife/)
- Apache 2.0
-* [**ACRA**](https://github.com/JakeWharton/butterknife/)
- Apache 2.0
-### InvokerGenerator, a preprocessor included in this project
-
-* [**Google AutoService**](https://github.com/google/auto/tree/master/service)
- Apache 2.0
-* [**Square JavaPoet**](https://github.com/square/javapoet)
- Apache 2.0
+## Themes
+* [**Dracula**](https://draculatheme.com/)
+ MIT
+* [**Gruvbox**](https://github.com/morhetz/gruvbox)
+ MIT
+* [**Solarized**](http://ethanschoonover.com/solarized)
+ MIT
## License
diff --git a/app/sampledata/libraries.json b/app/sampledata/libraries.json
index c457e94e3e156a4a8f528510d7862a8b778f62b9..16a8be11d515fd7dc3df73ae30ff4cfae0b61d80 100644
--- a/app/sampledata/libraries.json
+++ b/app/sampledata/libraries.json
@@ -4,8 +4,8 @@
"name": "Android Architecture Components: Lifecycle",
"version": "1.1.1",
"license": {
- "shortName": "Apache-2.0",
- "fullName": "Apache License"
+ "short_name": "Apache-2.0",
+ "full_name": "Apache License"
},
"url": "https://android.googlesource.com/platform/frameworks/support/+/master/lifecycle"
},
@@ -13,52 +13,88 @@
"name": "Android Architecture Components: Paging",
"version": "1.0.0-alpha7",
"license": {
- "shortName": "Apache-2.0",
- "fullName": "Apache License"
+ "short_name": "Apache-2.0",
+ "full_name": "Apache License"
},
"url": "https://android.googlesource.com/platform/frameworks/support/+/master/paging"
},
+ {
+ "name": "Android Architecture Components: Persistence",
+ "version": "1.1.0-beta1",
+ "license": {
+ "short_name": "Apache-2.0",
+ "full_name": "Apache License"
+ },
+ "url": "https://android.googlesource.com/platform/frameworks/support/+/master/persistence"
+ },
{
"name": "Android Architecture Components: Room",
"version": "1.1.0-beta1",
"license": {
- "shortName": "Apache-2.0",
- "fullName": "Apache License"
+ "short_name": "Apache-2.0",
+ "full_name": "Apache License"
},
- "url": "https://android.googlesource.com/platform/frameworks/support/+/master/room"
+ "url": "https://android.googlesource.com/platform/frameworks/support/+/master/persistence"
},
{
"name": "Android Sliding Up Panel",
"version": "3.5.0",
"license": {
- "shortName": "Apache-2.0",
- "fullName": "Apache License"
- }
+ "short_name": "Apache-2.0",
+ "full_name": "Apache License"
+ },
+ "url": "https://github.com/umano/AndroidSlidingUpPanel"
},
{
"name": "Android Support Library",
"version": "27.1.0",
"license": {
- "shortName": "Apache-2.0",
- "fullName": "Apache License"
+ "short_name": "Apache-2.0",
+ "full_name": "Apache License"
},
"url": "https://android.googlesource.com/platform/frameworks/support/+/master"
},
+ {
+ "name": "Android Support Library: Constraint Layout",
+ "version": "1.1.0-beta6",
+ "license": {
+ "short_name": "Apache-2.0",
+ "full_name": "Apache License"
+ },
+ "url": "https://android.googlesource.com/platform/frameworks/opt/sherpa/+/studio-3.0/constraintlayout"
+ },
+ {
+ "name": "atinject",
+ "license": {
+ "short_name": "Apache-2.0",
+ "full_name": "Apache License"
+ },
+ "url": "https://code.google.com/archive/p/atinject/"
+ },
{
"name": "AutoService",
"version": "1.0-rc4",
"license": {
- "shortName": "Apache-2.0",
- "fullName": "Apache License"
+ "short_name": "Apache-2.0",
+ "full_name": "Apache License"
},
"url": "https://github.com/google/auto/tree/master/service"
},
+ {
+ "name": "Better Link Movement Method",
+ "version": "2.1.0",
+ "license": {
+ "short_name": "Apache-2.0",
+ "full_name": "Apache License"
+ },
+ "url": "https://github.com/Saketme/Better-Link-Movement-Method"
+ },
{
"name": "Butter Knife",
"version": "8.8.1",
"license": {
- "shortName": "Apache-2.0",
- "fullName": "Apache License"
+ "short_name": "Apache-2.0",
+ "full_name": "Apache License"
},
"url": "http://jakewharton.github.io/butterknife/"
},
@@ -66,26 +102,60 @@
"name": "Dagger 2",
"version": "2.15",
"license": {
- "shortName": "Apache-2.0",
- "fullName": "Apache License"
+ "short_name": "Apache-2.0",
+ "full_name": "Apache License"
},
"url": "https://google.github.io/dagger/"
},
+ {
+ "name": "Dracula",
+ "license": {
+ "short_name": "MIT",
+ "full_name": "The MIT License (MIT}"
+ },
+ "url": "https://draculatheme.com/"
+ },
+ {
+ "name": "Glide",
+ "version": "4.6.1",
+ "license": {
+ "short_name": "Apache-2.0",
+ "full_name": "Apache License"
+ },
+ "url": "https://bumptech.github.io/glide/"
+ },
+ {
+ "name": "GlobTransformer",
+ "version": "4.6.1",
+ "license": {
+ "short_name": "CC BY-SA 3.0",
+ "full_name": "Creative Commons Attribution-ShareAlike 3.0 Unported"
+ },
+ "url": "https://bumptech.github.io/glide/"
+ },
{
"name": "Gson",
"version": "2.8.2",
"license": {
- "shortName": "Apache-2.0",
- "fullName": "Apache License"
+ "short_name": "Apache-2.0",
+ "full_name": "Apache License"
},
"url": "https://github.com/google/gson"
},
+ {
+ "name": "Gruvbox",
+ "license": {
+ "short_name": "MIT",
+ "full_name": "The MIT License (MIT}"
+ },
+ "url": "https://github.com/morhetz/gruvbox"
+ },
{
"name": "JavaPoet",
"version": "1.10.0",
"license": {
- "shortName": "Apache-2.0",
- "fullName": "Apache License"
+ "short_name": "Apache-2.0",
+ "full_name": "Apache License"
},
"url": "https://github.com/square/javapoet"
},
@@ -93,8 +163,8 @@
"name": "JetBrains Java Annotations",
"version": "16.0.1",
"license": {
- "shortName": "Apache-2.0",
- "fullName": "Apache License"
+ "short_name": "Apache-2.0",
+ "full_name": "Apache License"
},
"url": "https://github.com/JetBrains/java-annotations"
},
@@ -102,8 +172,8 @@
"name": "Kotlin Standard Library",
"version": "1.2.40",
"license": {
- "shortName": "Apache-2.0",
- "fullName": "Apache License"
+ "short_name": "Apache-2.0",
+ "full_name": "Apache License"
},
"url": "https://kotlinlang.org/"
},
@@ -111,17 +181,34 @@
"name": "LeakCanary",
"version": "1.5.4",
"license": {
- "shortName": "Apache-2.0",
- "fullName": "Apache License"
+ "short_name": "Apache-2.0",
+ "full_name": "Apache License"
},
"url": "https://github.com/square/leakcanary"
},
+ {
+ "name": "Material Design Icons: Community",
+ "license": {
+ "short_name": "SIL Open Font License v1.1",
+ "full_name": "SIL OPEN FONT LICENSE"
+ },
+ "url": "https://github.com/Templarian/MaterialDesign"
+ },
+ {
+ "name": "Material Design Icons: Google",
+ "version": "3.0.1",
+ "license": {
+ "short_name": "Apache-2.0",
+ "full_name": "Apache License"
+ },
+ "url": "https://github.com/google/material-design-icons"
+ },
{
"name": "Material Dialogs",
"version": "0.9.6.0",
"license": {
- "shortName": "MIT",
- "fullName": "The MIT License (MIT}"
+ "short_name": "MIT",
+ "full_name": "The MIT License (MIT}"
},
"url": "https://github.com/afollestad/material-dialogs"
},
@@ -129,25 +216,51 @@
"name": "MaterialProgressBar",
"version": "1.4.2",
"license": {
- "shortName": "Apache-2.0",
- "fullName": "Apache License"
+ "short_name": "Apache-2.0",
+ "full_name": "Apache License"
},
"url": "https://github.com/DreaminginCodeZH/MaterialProgressBar"
},
+ {
+ "name": "Quassel",
+ "version": "0.13.0",
+ "license": {
+ "short_name": "GPLv3",
+ "full_name": "GNU GENERAL PUBLIC LICENSE"
+ },
+ "url": "https://quassel-irc.org/"
+ },
+ {
+ "name": "Reactive Streams",
+ "version": "1.0.2",
+ "license": {
+ "short_name": "CC0",
+ "full_name": "Creative Commons CC0 1.0 Universal"
+ },
+ "url": "https://github.com/ReactiveX/RxJava"
+ },
{
"name": "RxJava",
"version": "2.1.9",
"license": {
- "shortName": "Apache-2.0",
- "fullName": "Apache License"
+ "short_name": "Apache-2.0",
+ "full_name": "Apache License"
},
"url": "https://github.com/ReactiveX/RxJava"
},
+ {
+ "name": "Solarized",
+ "license": {
+ "short_name": "MIT",
+ "full_name": "The MIT License (MIT}"
+ },
+ "url": "http://ethanschoonover.com/solarized"
+ },
{
"name": "ThreeTen backport project",
"version": "1.3.6",
"license": {
- "shortName": "BSD 3-clause"
+ "short_name": "BSD 3-clause"
},
"url": "http://www.threeten.org/threetenbp/"
}
diff --git a/app/src/main/res/layout/widget_library.xml b/app/src/main/res/layout/widget_library.xml
index b32b7f9eae98a1582ddb3aa27a123c594d9e9b37..b9776813741587eb9f432feef3f6d25642edafbf 100644
--- a/app/src/main/res/layout/widget_library.xml
+++ b/app/src/main/res/layout/widget_library.xml
@@ -45,6 +45,6 @@
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?colorTextSecondary"
- tools:text="@sample/libraries.json/data/license/shortName" />
+ tools:text="@sample/libraries.json/data/license/short_name" />
</LinearLayout>
</LinearLayout>