diff --git a/app/src/beta/res/mipmap-hdpi/ic_launcher.png b/app/src/beta/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..56f5cc5f5efc490b410618b8b1aa28b16a373d1d Binary files /dev/null and b/app/src/beta/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/beta/res/mipmap-mdpi/ic_launcher.png b/app/src/beta/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..288e2a703b4f05b21b55ad49693dd1ae34fa6767 Binary files /dev/null and b/app/src/beta/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/beta/res/mipmap-xhdpi/ic_launcher.png b/app/src/beta/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..0a69007e9d6db2002eeaf2e44d07feae3c98ce44 Binary files /dev/null and b/app/src/beta/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/beta/res/mipmap-xxhdpi/ic_launcher.png b/app/src/beta/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..bcba70459015762ec70574a5b5e6238ba08fac40 Binary files /dev/null and b/app/src/beta/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/beta/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/beta/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..5e8cbc29bba2ee8df2f3e245bcca6cc79b95a226 Binary files /dev/null and b/app/src/beta/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/beta/res/values/colors.xml b/app/src/beta/res/values/colors.xml new file mode 100644 index 0000000000000000000000000000000000000000..7d2a197159792b49ac8d3cd031b62d688ecb572c --- /dev/null +++ b/app/src/beta/res/values/colors.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ QuasselDroid - Quassel client for Android + ~ Copyright (C) 2016 Janne Koschinski + ~ Copyright (C) 2016 Ken Børge Viktil + ~ Copyright (C) 2016 Magnus Fjell + ~ Copyright (C) 2016 Martin Sandsmark <martin.sandsmark@kde.org> + ~ + ~ This program is free software: you can redistribute it and/or modify it + ~ under the terms of the GNU General Public License as published by the Free + ~ Software Foundation, either version 3 of the License, or (at your option) + ~ any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License along + ~ with this program. If not, see <http://www.gnu.org/licenses/>. + --> + +<resources> + <color name="colorPrimary">#ea3415</color> + <color name="colorPrimaryDark">#c73218</color> +</resources> diff --git a/app/src/beta/res/values/strings.xml b/app/src/beta/res/values/strings.xml new file mode 100644 index 0000000000000000000000000000000000000000..361e8cfbd30670aa9670e47f452349c02dcdde1e --- /dev/null +++ b/app/src/beta/res/values/strings.xml @@ -0,0 +1,24 @@ +<!-- + ~ QuasselDroid - Quassel client for Android + ~ Copyright (C) 2016 Janne Koschinski + ~ Copyright (C) 2016 Ken Børge Viktil + ~ Copyright (C) 2016 Magnus Fjell + ~ Copyright (C) 2016 Martin Sandsmark <martin.sandsmark@kde.org> + ~ + ~ This program is free software: you can redistribute it and/or modify it + ~ under the terms of the GNU General Public License as published by the Free + ~ Software Foundation, either version 3 of the License, or (at your option) + ~ any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License along + ~ with this program. If not, see <http://www.gnu.org/licenses/>. + --> + +<resources> + <string name="appName">QuasselBeta</string> +</resources> diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher.png b/app/src/debug/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..f02f233b234fe04d3e7a1d5dce8795bf34a1332d Binary files /dev/null and b/app/src/debug/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher.png b/app/src/debug/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..340ff3d1c529e6369b13682158699d4b32f55526 Binary files /dev/null and b/app/src/debug/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..0030cbf7d5586f47799781df57c0c4149d15e274 Binary files /dev/null and b/app/src/debug/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..033fbd78ef7a3b28198bbb70d7c7adfd618c7d01 Binary files /dev/null and b/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..601e278f167ad46b52ec1f35f03e2f9cab08494e Binary files /dev/null and b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/debug/res/values/colors.xml b/app/src/debug/res/values/colors.xml new file mode 100644 index 0000000000000000000000000000000000000000..4da0869ba402d853ff2ab32eda1e4bca7ef6b101 --- /dev/null +++ b/app/src/debug/res/values/colors.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ QuasselDroid - Quassel client for Android + ~ Copyright (C) 2016 Janne Koschinski + ~ Copyright (C) 2016 Ken Børge Viktil + ~ Copyright (C) 2016 Magnus Fjell + ~ Copyright (C) 2016 Martin Sandsmark <martin.sandsmark@kde.org> + ~ + ~ This program is free software: you can redistribute it and/or modify it + ~ under the terms of the GNU General Public License as published by the Free + ~ Software Foundation, either version 3 of the License, or (at your option) + ~ any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License along + ~ with this program. If not, see <http://www.gnu.org/licenses/>. + --> + +<resources> + <color name="colorPrimary">#009688</color> + <color name="colorPrimaryDark">#088278</color> +</resources> diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml new file mode 100644 index 0000000000000000000000000000000000000000..e3c49d182ee7d46f319b0e0a0e3e7ea72e5e2bc6 --- /dev/null +++ b/app/src/debug/res/values/strings.xml @@ -0,0 +1,24 @@ +<!-- + ~ QuasselDroid - Quassel client for Android + ~ Copyright (C) 2016 Janne Koschinski + ~ Copyright (C) 2016 Ken Børge Viktil + ~ Copyright (C) 2016 Magnus Fjell + ~ Copyright (C) 2016 Martin Sandsmark <martin.sandsmark@kde.org> + ~ + ~ This program is free software: you can redistribute it and/or modify it + ~ under the terms of the GNU General Public License as published by the Free + ~ Software Foundation, either version 3 of the License, or (at your option) + ~ any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License along + ~ with this program. If not, see <http://www.gnu.org/licenses/>. + --> + +<resources> + <string name="appName">QuasselDebug</string> +</resources> diff --git a/app/src/main/res/drawable-hdpi/ic_scroll_down_dark.png b/app/src/main/res/drawable-hdpi/ic_scroll_down_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..7f6781bcaa655589357c311e364d171671333272 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_scroll_down_dark.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_scroll_down_dark.png b/app/src/main/res/drawable-mdpi/ic_scroll_down_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..f54abcd97c90cd222ff465af2ae67242913ebc0d Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_scroll_down_dark.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_scroll_down_dark.png b/app/src/main/res/drawable-xhdpi/ic_scroll_down_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..a4f169cfbd494beffab362b1eea18c656f7ad0d4 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_scroll_down_dark.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_scroll_down_dark.png b/app/src/main/res/drawable-xxhdpi/ic_scroll_down_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..a29a1632420655011886511e33a6e7c474d0b3fb Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_scroll_down_dark.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_scroll_down_dark.png b/app/src/main/res/drawable-xxxhdpi/ic_scroll_down_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..d05cc646319e8abefa84b1787ff6d2d0fc291c51 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_scroll_down_dark.png differ diff --git a/build.gradle b/build.gradle index 3792c8a3bcec18f004a161dda9c20d3861eff254..34c2e8ed817e1027ef7522dcb5e858ff894a4c60 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.2' + classpath 'com.android.tools.build:gradle:2.1.3' classpath 'me.tatarka:gradle-retrolambda:3.2.4' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2fa957fcb89558a4ef868c64d3de2c1f352dd8c1..5da39a2bb5135bb0a6f7b21ad9838e2c5c419827 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,27 +1,6 @@ -# -# QuasselDroid - Quassel client for Android -# Copyright (C) 2016 Janne Koschinski -# Copyright (C) 2016 Ken Børge Viktil -# Copyright (C) 2016 Magnus Fjell -# Copyright (C) 2016 Martin Sandsmark <martin.sandsmark@kde.org> -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation, either version 3 of the License, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see <http://www.gnu.org/licenses/>. -# - -#Sun Jan 24 11:43:20 CET 2016 +#Sat Sep 03 00:05:21 CEST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip