Update libraries, build tools, and fix resulting broken build.

Includes fixing layout_behavior to androidx version.
guardianproject · Jan 24, 2019 · 77c333f · 77c333f
1 parent e0cedb0
commit 77c333f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0-alpha12'
+        classpath 'com.android.tools.build:gradle:3.5.0-alpha01'
     }
 
 }
@@ -110,14 +110,14 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.preference:preference:1.0.0'
-    implementation 'androidx.multidex:multidex:2.0.0'
-    implementation 'androidx.annotation:annotation:1.0.0'
+    implementation 'androidx.multidex:multidex:2.0.1'
+    implementation 'androidx.annotation:annotation:1.0.1'
     implementation 'com.google.android.material:material:1.0.0'
-    implementation 'com.wdullaer:materialdatetimepicker:3.6.4'
+    implementation 'com.wdullaer:materialdatetimepicker:4.1.1'
     implementation 'com.github.guardianproject:signal-cli-android:v0.6.0-android-beta-1'
     implementation 'com.github.satyan:sugar:1.5'
     implementation 'net.the4thdimension:audio-wife:1.0.3'
@@ -131,7 +131,7 @@ dependencies {
     implementation 'com.github.derlio:audio-waveform:v1.0.1'
     implementation 'org.firezenk:audiowaves:1.1@aar'
     implementation 'com.maxproj.simplewaveform:app:1.0.0'
-    implementation 'com.googlecode.libphonenumber:libphonenumber:8.9.14'
+    implementation 'com.googlecode.libphonenumber:libphonenumber:8.10.3'
     implementation('com.mikepenz:aboutlibraries:6.1.1@aar') {
         transitive = true
     }

diff --git a/src/main/java/org/havenapp/main/MonitorActivity.java b/src/main/java/org/havenapp/main/MonitorActivity.java
@@ -351,7 +351,7 @@ private void showTimeDelayDialog() {
 
         TimePickerDialog mTimePickerDialog = TimePickerDialog.newInstance(this, hours, minutes, seconds, true);
         mTimePickerDialog.enableSeconds(true);
-        mTimePickerDialog.show(getFragmentManager(), "TimePickerDialog");
+        mTimePickerDialog.show(getSupportFragmentManager(), "TimePickerDialog");
     }
 
     @Override

diff --git a/src/main/java/org/havenapp/main/SettingsFragment.java b/src/main/java/org/havenapp/main/SettingsFragment.java
@@ -484,9 +484,9 @@ private void showTimeDelayDialog(String configVideoLength) {
         TimePickerDialog mTimePickerDialog = TimePickerDialog.newInstance(this, hours, minutes, seconds, true);
         mTimePickerDialog.enableSeconds(true);
         if (configVideoLength.equalsIgnoreCase(PreferenceManager.CONFIG_TIME_DELAY)) {
-            mTimePickerDialog.show(mActivity.getFragmentManager(), "TimeDelayPickerDialog");
+            mTimePickerDialog.show(getFragmentManager(), "TimeDelayPickerDialog");
         } else {
-            mTimePickerDialog.show(mActivity.getFragmentManager(), "VideoLengthPickerDialog");
+            mTimePickerDialog.show(getFragmentManager(), "VideoLengthPickerDialog");
         }
     }
 

diff --git a/src/main/res/layout/activity_event.xml b/src/main/res/layout/activity_event.xml
@@ -39,7 +39,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:listitem="@layout/item_event"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"/>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"

diff --git a/src/main/res/layout/activity_list.xml b/src/main/res/layout/activity_list.xml
@@ -39,15 +39,15 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
         tools:listitem="@layout/item_event" />
 
     <ImageView
         android:id="@+id/empty_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:srcCompat="@drawable/empty_prompt"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"/>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"