aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2019-12-30 19:06:49 -0800
committerGitHub <noreply@github.com>2019-12-30 19:06:49 -0800
commit7a007420e74e6bd4e08bde123e6e163eefc18b92 (patch)
tree9ce26231d57fbe7636a3d7de7db2d02c18167e47
parent9cdb19178a17ba009c953d63c6a777b37ea0bd79 (diff)
downloadkau-7a007420e74e6bd4e08bde123e6e163eefc18b92.tar.gz
kau-7a007420e74e6bd4e08bde123e6e163eefc18b92.tar.bz2
kau-7a007420e74e6bd4e08bde123e6e163eefc18b92.zip
Update Versions (#238)
* Downgrade material * Downgrade appcompat * Downgrade other related projects * Remove aboutlibrary ui dependencies * Update versions back
-rw-r--r--about/build.gradle2
-rw-r--r--about/src/main/res/layout/kau_about_section_main.xml2
-rw-r--r--about/src/main/res/layout/kau_iitem_library.xml10
-rw-r--r--buildSrc/src/main/kotlin/kau/Dependencies.kt2
-rw-r--r--buildSrc/src/main/kotlin/kau/Versions.kt10
-rw-r--r--sample/src/main/res/layout/permission_checkbox.xml8
6 files changed, 17 insertions, 17 deletions
diff --git a/about/build.gradle b/about/build.gradle
index 274ef5c..46e076f 100644
--- a/about/build.gradle
+++ b/about/build.gradle
@@ -12,7 +12,7 @@ dependencies {
implementation project(':core-ui')
implementation project(':fastadapter')
- api Dependencies.aboutLibraries
+ api Dependencies.aboutLibrariesCore
}
apply from: '../artifacts.gradle'
diff --git a/about/src/main/res/layout/kau_about_section_main.xml b/about/src/main/res/layout/kau_about_section_main.xml
index 7ea0415..3400b34 100644
--- a/about/src/main/res/layout/kau_about_section_main.xml
+++ b/about/src/main/res/layout/kau_about_section_main.xml
@@ -37,7 +37,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
- android:layout_margin="@dimen/activity_horizontal_margin" />
+ android:layout_margin="@dimen/kau_activity_horizontal_margin" />
</FrameLayout>
diff --git a/about/src/main/res/layout/kau_iitem_library.xml b/about/src/main/res/layout/kau_iitem_library.xml
index 4dd5155..cb3053b 100644
--- a/about/src/main/res/layout/kau_iitem_library.xml
+++ b/about/src/main/res/layout/kau_iitem_library.xml
@@ -24,7 +24,7 @@
android:ellipsize="end"
android:gravity="start"
android:lines="1"
- android:textSize="@dimen/textSizeLarge_openSource"
+ android:textSize="20sp"
android:textStyle="normal"
app:layout_constraintEnd_toStartOf="@+id/lib_item_author"
app:layout_constraintStart_toStartOf="parent"
@@ -39,7 +39,7 @@
android:layout_height="wrap_content"
android:gravity="end"
android:lines="1"
- android:textSize="@dimen/textSizeSmall_openSource"
+ android:textSize="14sp"
android:textStyle="normal"
app:layout_constraintBottom_toBottomOf="@id/lib_item_name"
app:layout_constraintEnd_toEndOf="parent"
@@ -63,7 +63,7 @@
android:maxLines="20"
android:paddingBottom="@dimen/kau_spacing_normal"
android:paddingTop="@dimen/kau_spacing_normal"
- android:textSize="@dimen/textSizeSmall_openSource"
+ android:textSize="14sp"
android:textStyle="normal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -88,7 +88,7 @@
android:layout_weight="1"
android:gravity="start"
android:maxLines="1"
- android:textSize="@dimen/textSizeSmall_openSource"
+ android:textSize="14sp"
android:textStyle="normal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/lib_item_license"
@@ -105,7 +105,7 @@
android:layout_weight="1"
android:gravity="end"
android:maxLines="1"
- android:textSize="@dimen/textSizeSmall_openSource"
+ android:textSize="14sp"
android:textStyle="normal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/buildSrc/src/main/kotlin/kau/Dependencies.kt b/buildSrc/src/main/kotlin/kau/Dependencies.kt
index f7faeb0..caf2f6e 100644
--- a/buildSrc/src/main/kotlin/kau/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/kau/Dependencies.kt
@@ -68,7 +68,7 @@ object Dependencies {
const val iconicsCommunity =
"com.mikepenz:community-material-typeface:${Versions.iconicsCommunity}-kotlin@aar"
- const val aboutLibraries = "com.mikepenz:aboutlibraries:${Versions.aboutLibraries}"
+ const val aboutLibrariesCore = "com.mikepenz:aboutlibraries-core:${Versions.aboutLibraries}"
const val blurry = "jp.wasabeef:blurry:${Versions.blurry}"
diff --git a/buildSrc/src/main/kotlin/kau/Versions.kt b/buildSrc/src/main/kotlin/kau/Versions.kt
index e816714..6e1d70b 100644
--- a/buildSrc/src/main/kotlin/kau/Versions.kt
+++ b/buildSrc/src/main/kotlin/kau/Versions.kt
@@ -24,7 +24,7 @@ object Versions {
const val cardView = "1.0.0"
// https://mvnrepository.com/artifact/androidx.constraintlayout/constraintlayout
- const val constraintLayout = "2.0.0-beta3"
+ const val constraintLayout = "2.0.0-beta4"
// https://mvnrepository.com/artifact/androidx.core/core-ktx
const val coreKtx = "1.2.0-rc01"
@@ -33,16 +33,16 @@ object Versions {
const val kotlin = "1.3.61"
// https://github.com/Kotlin/kotlinx.coroutines/releases
- const val coroutines = "1.3.2"
+ const val coroutines = "1.3.3"
// https://github.com/mikepenz/AboutLibraries/releases
- const val aboutLibraries = "7.0.4"
+ const val aboutLibraries = "7.1.0"
// https://github.com/wasabeef/Blurry/releases
const val blurry = "3.0.0"
// https://github.com/mikepenz/FastAdapter/releases
- const val fastAdapter = "4.1.1"
+ const val fastAdapter = "4.1.2"
// https://github.com/bumptech/glide/releases
const val glide = "4.10.0"
@@ -77,7 +77,7 @@ object Versions {
const val bugsnagPlugin="4.7.2"
// https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
- const val gradlePlugin = "3.6.0-beta05"
+ const val gradlePlugin = "3.6.0-rc01"
// https://github.com/dcendents/android-maven-gradle-plugin/releases
const val mavenPlugin = "2.1"
// https://github.com/Triple-T/gradle-play-publisher/releases
diff --git a/sample/src/main/res/layout/permission_checkbox.xml b/sample/src/main/res/layout/permission_checkbox.xml
index 6de8296..011359b 100644
--- a/sample/src/main/res/layout/permission_checkbox.xml
+++ b/sample/src/main/res/layout/permission_checkbox.xml
@@ -4,10 +4,10 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:orientation="horizontal"
- android:paddingBottom="@dimen/activity_vertical_margin"
- android:paddingEnd="@dimen/activity_horizontal_margin"
- android:paddingStart="@dimen/activity_horizontal_margin"
- android:paddingTop="@dimen/activity_vertical_margin">
+ android:paddingBottom="@dimen/kau_activity_vertical_margin"
+ android:paddingEnd="@dimen/kau_activity_horizontal_margin"
+ android:paddingStart="@dimen/kau_activity_horizontal_margin"
+ android:paddingTop="@dimen/kau_activity_vertical_margin">
<TextView
android:id="@+id/perm_text"