diff options
| -rw-r--r-- | build.gradle | 17 | ||||
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/ShowFullscreenMessageActivity.java | 4 | ||||
| -rw-r--r-- | src/main/res/layout/activity_fullscreen_message.xml | 5 |
3 files changed, 14 insertions, 12 deletions
diff --git a/build.gradle b/build.gradle index ba28140ef..2c37fdcf6 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ dependencies { standardPushCompile 'com.google.android.gms:play-services-gcm:10.2.1' compile 'org.sufficientlysecure:openpgp-api:10.0' compile 'com.soundcloud.android:android-crop:1.0.1@aar' - compile 'com.android.support:support-v13:25.2.0' + compile 'com.android.support:support-v13:25.3.0' compile 'org.bouncycastle:bcprov-jdk15on:1.56' compile 'org.bouncycastle:bcmail-jdk15on:1.56' compile 'org.jitsi:org.otr4j:0.22' @@ -50,16 +50,17 @@ dependencies { compile 'jetty:javax.servlet:5.1.12' compile 'com.google.code.gson:gson:2.7' compile 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2' - compile 'com.android.support:appcompat-v7:25.2.0' + compile 'com.android.support:appcompat-v7:25.3.0' compile 'com.android.support:multidex:1.0.1' + compile 'com.android.support:support-v4:25.3.0' compile 'com.github.bumptech.glide:glide:3.7.0' - compile 'com.github.chrisbanes:PhotoView:1.3.1' + compile 'com.github.chrisbanes:PhotoView:2.0.0' compile 'com.github.rtoshiro.fullscreenvideoview:fullscreenvideoview:1.1.2' - compile 'com.google.android.gms:play-services-location:10.2.0' - compile 'com.google.android.gms:play-services-maps:10.2.0' - compile 'pub.devrel:easypermissions:0.2.1' + compile 'com.google.android.gms:play-services-location:10.2.1' + compile 'com.google.android.gms:play-services-maps:10.2.1' + compile 'pub.devrel:easypermissions:0.3.0' compile 'com.wefika:flowlayout:0.4.1' - compile 'com.googlecode.ez-vcard:ez-vcard:0.10.1' + compile 'com.googlecode.ez-vcard:ez-vcard:0.10.2' compile 'com.vanniktech:emoji-ios:0.4.0' } @@ -75,7 +76,7 @@ android { buildToolsVersion "25.0.2" defaultConfig { - minSdkVersion 14 + minSdkVersion 15 targetSdkVersion 25 versionCode 192 diff --git a/src/main/java/de/pixart/messenger/ui/ShowFullscreenMessageActivity.java b/src/main/java/de/pixart/messenger/ui/ShowFullscreenMessageActivity.java index 26921c136..ca5ff3de1 100644 --- a/src/main/java/de/pixart/messenger/ui/ShowFullscreenMessageActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ShowFullscreenMessageActivity.java @@ -22,6 +22,8 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.drawable.GlideDrawable; import com.bumptech.glide.request.animation.GlideAnimation; import com.bumptech.glide.request.target.GlideDrawableImageViewTarget; +import com.github.chrisbanes.photoview.PhotoView; +import com.github.chrisbanes.photoview.PhotoViewAttacher; import com.github.rtoshiro.view.video.FullscreenVideoLayout; import java.io.File; @@ -32,8 +34,6 @@ import java.io.InputStream; import de.pixart.messenger.Config; import de.pixart.messenger.R; import de.pixart.messenger.utils.ExifHelper; -import uk.co.senab.photoview.PhotoView; -import uk.co.senab.photoview.PhotoViewAttacher; import static de.pixart.messenger.persistance.FileBackend.close; diff --git a/src/main/res/layout/activity_fullscreen_message.xml b/src/main/res/layout/activity_fullscreen_message.xml index a4d30f902..b97117c8b 100644 --- a/src/main/res/layout/activity_fullscreen_message.xml +++ b/src/main/res/layout/activity_fullscreen_message.xml @@ -7,9 +7,10 @@ <include android:id="@+id/toolbar" - layout="@layout/tool_bar"></include> + layout="@layout/tool_bar"> + </include> - <uk.co.senab.photoview.PhotoView + <com.github.chrisbanes.photoview.PhotoView android:id="@id/message_image_view" android:layout_width="match_parent" android:layout_height="match_parent" |