Commit 77d6fc72 authored by Ricki Hirner's avatar Ricki Hirner

Fix Android 4.4 compatibility; version code bump

parent f50f86c1
Pipeline #57599822 passed with stage
in 5 minutes and 8 seconds
...@@ -19,7 +19,7 @@ android { ...@@ -19,7 +19,7 @@ android {
defaultConfig { defaultConfig {
applicationId "at.bitfire.davdroid" applicationId "at.bitfire.davdroid"
versionCode 282 versionCode 283
buildConfigField "long", "buildTime", System.currentTimeMillis() + "L" buildConfigField "long", "buildTime", System.currentTimeMillis() + "L"
buildConfigField "boolean", "customCerts", "true" buildConfigField "boolean", "customCerts", "true"
...@@ -84,7 +84,7 @@ dependencies { ...@@ -84,7 +84,7 @@ dependencies {
implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.multidex:multidex:2.0.1'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"
implementation 'androidx.appcompat:appcompat:1.0.2' implementation 'androidx.appcompat:appcompat:1.1.0-alpha04'
implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.fragment:fragment-ktx:1.0.0' implementation 'androidx.fragment:fragment-ktx:1.0.0'
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
......
...@@ -662,8 +662,8 @@ class AccountActivity: AppCompatActivity(), Toolbar.OnMenuItemClickListener, Pop ...@@ -662,8 +662,8 @@ class AccountActivity: AppCompatActivity(), Toolbar.OnMenuItemClickListener, Pop
} }
class ContactsPermissionsCalculator( class ContactsPermissionsCalculator(
val context: Context, private val context: Context,
val addressBooks: LiveData<List<Collection>> private val addressBooks: LiveData<List<Collection>>
): MediatorLiveData<Boolean>() { ): MediatorLiveData<Boolean>() {
companion object { companion object {
...@@ -698,8 +698,8 @@ class AccountActivity: AppCompatActivity(), Toolbar.OnMenuItemClickListener, Pop ...@@ -698,8 +698,8 @@ class AccountActivity: AppCompatActivity(), Toolbar.OnMenuItemClickListener, Pop
} }
class CalendarPermissionsCalculator( class CalendarPermissionsCalculator(
val context: Context, private val context: Context,
val serviceId: LiveData<Long> private val serviceId: LiveData<Long>
): MediatorLiveData<List<String>>() { ): MediatorLiveData<List<String>>() {
companion object { companion object {
......
...@@ -28,13 +28,6 @@ ...@@ -28,13 +28,6 @@
android:padding="@dimen/activity_margin" android:padding="@dimen/activity_margin"
android:animateLayoutChanges="true"> android:animateLayoutChanges="true">
<ProgressBar
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:indeterminate="true"
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
android:visibility="@{(model.calDavServiceId == null &amp;&amp; model.cardDavServiceId == null) ? View.VISIBLE : View.GONE}"/>
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -77,7 +70,7 @@ ...@@ -77,7 +70,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawableLeft="@drawable/ic_error_dark" app:drawableLeftCompat="@drawable/ic_error_dark"
android:drawablePadding="8dp" android:drawablePadding="8dp"
android:text="@string/account_contact_permissions_required"/> android:text="@string/account_contact_permissions_required"/>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
...@@ -131,7 +124,7 @@ ...@@ -131,7 +124,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawableLeft="@drawable/ic_error_dark" app:drawableLeftCompat="@drawable/ic_error_dark"
android:drawablePadding="8dp" android:drawablePadding="8dp"
android:text="@string/account_calendar_permissions_required"/> android:text="@string/account_calendar_permissions_required"/>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
......
Subproject commit 28d43522912849cf6a0ed7ccacba20be0f648b82 Subproject commit 4d704a6f08e683652b93486e02d92bdd0c78b397
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment