Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
InstiApp
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
RAHUL SHARMA
InstiApp
Commits
e2164ffa
Commit
e2164ffa
authored
Sep 30, 2018
by
Sajal Narang
Committed by
GitHub
Sep 30, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #212 from pulsejet/patch22
Update dependencies, make support libraries consistent
parents
f8806e8a
69b450c0
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
13 deletions
+14
-13
app/build.gradle
app/build.gradle
+6
-5
app/src/main/java/com/mrane/navigation/SlidingUpPanelLayout.java
.../main/java/com/mrane/navigation/SlidingUpPanelLayout.java
+1
-1
app/src/main/java/com/mrane/zoomview/SubsamplingScaleImageView.java
...in/java/com/mrane/zoomview/SubsamplingScaleImageView.java
+4
-4
build.gradle
build.gradle
+1
-1
gradle/wrapper/gradle-wrapper.properties
gradle/wrapper/gradle-wrapper.properties
+2
-2
No files found.
app/build.gradle
View file @
e2164ffa
apply
plugin:
'com.android.application'
apply
plugin:
'com.android.application'
android
{
android
{
compileSdkVersion
2
7
compileSdkVersion
2
8
buildToolsVersion
'2
7.0.3
'
buildToolsVersion
'2
8.0.2
'
defaultConfig
{
defaultConfig
{
applicationId
"app.insti"
applicationId
"app.insti"
manifestPlaceholders
'appAuthRedirectScheme'
:
'https'
manifestPlaceholders
'appAuthRedirectScheme'
:
'https'
minSdkVersion
21
minSdkVersion
21
targetSdkVersion
2
7
targetSdkVersion
2
8
versionCode
17
versionCode
17
versionName
"1.0.12"
versionName
"1.0.12"
testInstrumentationRunner
"android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android.support.test.runner.AndroidJUnitRunner"
...
@@ -23,7 +23,7 @@ android {
...
@@ -23,7 +23,7 @@ android {
}
}
ext
{
ext
{
supportLibVersion
=
'2
7.1
.0'
supportLibVersion
=
'2
8.0
.0'
playServicesVersion
=
'15.0.1'
playServicesVersion
=
'15.0.1'
retrofitVersion
=
'2.3.0'
retrofitVersion
=
'2.3.0'
okhttpVersion
=
'3.11.0'
okhttpVersion
=
'3.11.0'
...
@@ -34,8 +34,9 @@ ext {
...
@@ -34,8 +34,9 @@ ext {
dependencies
{
dependencies
{
implementation
fileTree
(
dir:
'libs'
,
include:
[
'*.jar'
])
implementation
fileTree
(
dir:
'libs'
,
include:
[
'*.jar'
])
implementation
'com.google.firebase:firebase-messaging:17.
1.0
'
implementation
'com.google.firebase:firebase-messaging:17.
3.2
'
implementation
"com.android.support:design:${supportLibVersion}"
implementation
"com.android.support:design:${supportLibVersion}"
implementation
"com.android.support:exifinterface:${supportLibVersion}"
implementation
"com.android.support:support-v4:${supportLibVersion}"
implementation
"com.android.support:support-v4:${supportLibVersion}"
implementation
"com.google.android.gms:play-services-location:${playServicesVersion}"
implementation
"com.google.android.gms:play-services-location:${playServicesVersion}"
implementation
"com.squareup.retrofit2:retrofit:${retrofitVersion}"
implementation
"com.squareup.retrofit2:retrofit:${retrofitVersion}"
...
...
app/src/main/java/com/mrane/navigation/SlidingUpPanelLayout.java
View file @
e2164ffa
...
@@ -751,7 +751,7 @@ public class SlidingUpPanelLayout extends ViewGroup {
...
@@ -751,7 +751,7 @@ public class SlidingUpPanelLayout extends ViewGroup {
@Override
@Override
protected
boolean
drawChild
(
Canvas
canvas
,
View
child
,
long
drawingTime
)
{
protected
boolean
drawChild
(
Canvas
canvas
,
View
child
,
long
drawingTime
)
{
boolean
result
;
boolean
result
;
final
int
save
=
canvas
.
save
(
Canvas
.
CLIP_SAVE_FLAG
);
final
int
save
=
canvas
.
save
();
if
(
isSlidingEnabled
()
&&
mSlideableView
!=
child
)
{
if
(
isSlidingEnabled
()
&&
mSlideableView
!=
child
)
{
// Clip against the slider; no sense drawing what will immediately be covered,
// Clip against the slider; no sense drawing what will immediately be covered,
...
...
app/src/main/java/com/mrane/zoomview/SubsamplingScaleImageView.java
View file @
e2164ffa
...
@@ -32,7 +32,7 @@ import android.graphics.Point;
...
@@ -32,7 +32,7 @@ import android.graphics.Point;
import
android.graphics.PointF
;
import
android.graphics.PointF
;
import
android.graphics.Rect
;
import
android.graphics.Rect
;
import
android.graphics.RectF
;
import
android.graphics.RectF
;
import
android.media.ExifInterface
;
import
android.
support.
media.ExifInterface
;
import
android.os.AsyncTask
;
import
android.os.AsyncTask
;
import
android.os.Build.VERSION
;
import
android.os.Build.VERSION
;
import
android.os.Handler
;
import
android.os.Handler
;
...
@@ -1493,7 +1493,7 @@ public class SubsamplingScaleImageView extends View {
...
@@ -1493,7 +1493,7 @@ public class SubsamplingScaleImageView extends View {
* guaranteed to be on screen.
* guaranteed to be on screen.
*
*
* @param sCenter Target center point
* @param sCenter Target center point
* @return {@link AnimationBuilder} instance.
Call {@link com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView.AnimationBuilder#start()} to start the anim.
* @return {@link AnimationBuilder} instance.
*/
*/
public
AnimationBuilder
animateCenter
(
PointF
sCenter
)
{
public
AnimationBuilder
animateCenter
(
PointF
sCenter
)
{
if
(!
isImageReady
())
{
if
(!
isImageReady
())
{
...
@@ -1507,7 +1507,7 @@ public class SubsamplingScaleImageView extends View {
...
@@ -1507,7 +1507,7 @@ public class SubsamplingScaleImageView extends View {
* beyond the panning limits, the image is automatically panned during the animation.
* beyond the panning limits, the image is automatically panned during the animation.
*
*
* @param scale Target scale.
* @param scale Target scale.
* @return {@link AnimationBuilder} instance.
Call {@link com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView.AnimationBuilder#start()} to start the anim.
* @return {@link AnimationBuilder} instance.
*/
*/
public
AnimationBuilder
animateScale
(
float
scale
)
{
public
AnimationBuilder
animateScale
(
float
scale
)
{
if
(!
isImageReady
())
{
if
(!
isImageReady
())
{
...
@@ -1521,7 +1521,7 @@ public class SubsamplingScaleImageView extends View {
...
@@ -1521,7 +1521,7 @@ public class SubsamplingScaleImageView extends View {
* beyond the panning limits, the image is automatically panned during the animation.
* beyond the panning limits, the image is automatically panned during the animation.
*
*
* @param scale Target scale.
* @param scale Target scale.
* @return {@link AnimationBuilder} instance.
Call {@link com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView.AnimationBuilder#start()} to start the anim.
* @return {@link AnimationBuilder} instance.
*/
*/
public
AnimationBuilder
animateScaleAndCenter
(
float
scale
,
PointF
sCenter
)
{
public
AnimationBuilder
animateScaleAndCenter
(
float
scale
,
PointF
sCenter
)
{
if
(!
isImageReady
())
{
if
(!
isImageReady
())
{
...
...
build.gradle
View file @
e2164ffa
...
@@ -9,7 +9,7 @@ buildscript {
...
@@ -9,7 +9,7 @@ buildscript {
}
}
dependencies
{
dependencies
{
classpath
'com.android.tools.build:gradle:3.
1.3
'
classpath
'com.android.tools.build:gradle:3.
2.0
'
classpath
'com.google.gms:google-services:3.2.0'
classpath
'com.google.gms:google-services:3.2.0'
// NOTE: Do not place your application dependencies here; they belong
// NOTE: Do not place your application dependencies here; they belong
...
...
gradle/wrapper/gradle-wrapper.properties
View file @
e2164ffa
#
Wed Mar 28 12:02:24
IST 2018
#
Sun Sep 30 20:09:22
IST 2018
distributionBase
=
GRADLE_USER_HOME
distributionBase
=
GRADLE_USER_HOME
distributionPath
=
wrapper/dists
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-4.
4
-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-4.
6
-all.zip
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment