Skip to content

Commit 0df6c17

Browse files
iamareebjamaliamareebjamal
authored
chore: Release v1.10.0 (#2915)
chore: Release v1.10.0
2 parents 247df34 + 1efe999 commit 0df6c17

File tree

167 files changed

+1872
-2414
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

167 files changed

+1872
-2414
lines changed

‎.travis.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: android
22
jdk: oraclejdk8
3-
sudo: false
3+
sudo: true
44
dist: trusty
55

66
env:
@@ -85,5 +85,12 @@ after_success:
8585
- bash <(curl -s https://codecov.io/bash)
8686
- bash scripts/update-apk.sh
8787

88+
deploy:
89+
- provider: script
90+
skip_cleanup: true
91+
script: bash scripts/upload-gh-pages.sh
92+
on:
93+
all_branches: true
94+
8895
notifications:
8996
slack: fossasia:JgzycrBUs0nKnmJhsAxCB4bL

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ Before you begin, you should have already downloaded the Android Studio SDK and
108108
- Copy all the files from *"OpenCV-android-sdk/sdk/native/3rdparty"* to *"phimpme-android/app/src/main/3rdparty"* (create directory if it doesn't exist)
109109
- Copy all the files from *"OpenCV-android-sdk/sdk/native/libs"* to *"phimpme-android/app/src/main/jniLibs"* (create directory if it doesn't exist)
110110
- Copy all the files from *"OpenCV-android-sdk/sdk/native/jni/include"* to *"phimpme-android/app/src/main/jni/include"* (create directory if it doesn't exist)
111-
- Copy all the files from *"OpenCV-android-sdk/sdk/native/jni/staticlibs"* to *"phimpme-android/app/src/main/staticlibs"* (create directory if it doesn't exist)
111+
- Copy all the files from *"OpenCV-android-sdk/sdk/native/staticlibs"* to *"phimpme-android/app/src/main/staticlibs"* (create directory if it doesn't exist)
112112
- Now build your project. If your build fails then try deleting these build directories *"phimpme-android/app/.externalNativeBuild"* and *"phimpme-android/app/build"*, if they exist and run the build again.
113113

114114
7. If build error still persist, try replacing ndk with ndk version 18b from [ndk-archives](https://developer.android.com/ndk/downloads/older_releases) . Once all build errors have been resolved, you should be all set to build the app and test it.

‎app/build.gradle‎

Lines changed: 38 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ def LOCAL_KEY_PRESENT = project.hasProperty('SIGNING_KEY_FILE') && rootProject.f
2525
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
2626

2727
android {
28-
compileSdkVersion 28
29-
buildToolsVersion "28.0.3"
28+
compileSdkVersion 29
29+
buildToolsVersion "29.0.2"
3030

3131
defaultConfig {
3232
applicationId "org.fossasia.phimpme"
3333
minSdkVersion 21
34-
targetSdkVersion 28
35-
versionCode 12
36-
versionName '1.9.0'
34+
targetSdkVersion 29
35+
versionCode 13
36+
versionName '1.10.0'
3737
multiDexEnabled true
38-
testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
38+
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
3939
vectorDrawables.useSupportLibrary = true
4040
resConfigs "en"
4141
ndk {
@@ -45,6 +45,11 @@ android {
4545
renderscriptSupportModeEnabled true
4646
}
4747

48+
compileOptions {
49+
sourceCompatibility JavaVersion.VERSION_1_8
50+
targetCompatibility JavaVersion.VERSION_1_8
51+
}
52+
4853
signingConfigs {
4954
if (TRAVIS_BUILD) {
5055
release {
@@ -87,7 +92,6 @@ android {
8792

8893
configurations {
8994
implementation.exclude group: 'org.jetbrains', module: 'annotations'
90-
all*.exclude group: 'com.android.volley'
9195
}
9296

9397
lintOptions {
@@ -114,18 +118,8 @@ android {
114118
}
115119

116120
repositories {
117-
maven {
118-
url "https://dl.bintray.com/dasar/maven"
119-
}
120121
mavenCentral()
121-
maven {
122-
url 'https://github.com/uPhyca/stetho-realm/raw/master/maven-repo'
123-
}
124122
maven { url "https://jitpack.io" }
125-
126-
maven { url 'https://maven.fabric.io/public' }
127-
128-
maven { url "https://mvnrepository.com/artifact/com.box/box-android-sdk" }
129123
}
130124

131125
spotless {
@@ -137,31 +131,44 @@ spotless {
137131

138132
dependencies {
139133
implementation fileTree(include: ['*.jar'], dir: 'libs')
140-
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
134+
androidTestImplementation('com.android.support.test.espresso:espresso-core:3.1.0', {
141135
exclude group: 'com.android.support', module: 'support-annotations'
142136
})
137+
// Core library
138+
androidTestImplementation 'androidx.test:core:1.2.0'
139+
140+
// AndroidJUnitRunner and JUnit Rules
141+
androidTestImplementation 'androidx.test:runner:1.2.0'
142+
androidTestImplementation 'androidx.test:rules:1.2.0'
143143

144-
implementation 'com.mcxiaoke.volley:library:1.0.19'
144+
//retrofit
145+
implementation "com.squareup.retrofit2:retrofit:$rootProject.retrofitVersion"
146+
implementation "com.squareup.retrofit2:converter-gson:$rootProject.retrofitVersion"
147+
implementation 'com.squareup.okhttp3:logging-interceptor:4.2.0'
145148

146149
//google and support
147-
implementation "com.android.support:appcompat-v7:$rootProject.supportLibraryVersion"
148-
implementation "com.android.support:animated-vector-drawable:28.0.0"
149-
implementation "com.android.support:support-v4:28.0.0"
150-
implementation "com.android.support:design:$rootProject.supportLibraryVersion"
151-
implementation "com.android.support:support-vector-drawable:$rootProject.supportLibraryVersion"
152-
implementation "com.android.support:palette-v7:$rootProject.supportLibraryVersion"
153-
implementation "com.android.support:cardview-v7:$rootProject.supportLibraryVersion"
154-
implementation "com.android.support:customtabs:$rootProject.supportLibraryVersion"
155-
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
150+
implementation "androidx.appcompat:appcompat:$rootProject.supportLibraryVersion"
151+
implementation "androidx.vectordrawable:vectordrawable-animated:1.1.0"
152+
implementation "androidx.legacy:legacy-support-v4:1.0.0"
153+
implementation "com.google.android.material:material:1.0.0"
154+
implementation "androidx.vectordrawable:vectordrawable:1.1.0"
155+
implementation "androidx.palette:palette:1.0.0"
156+
implementation "androidx.cardview:cardview:1.0.0"
157+
implementation "androidx.browser:browser:1.0.0"
158+
implementation "androidx.recyclerview:recyclerview:1.0.0"
159+
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
156160

157161
//exoplayer
158162
implementation 'com.google.android.exoplayer:exoplayer:r1.5.7'
159163

164+
implementation "androidx.lifecycle:lifecycle-extensions:$rootProject.lifecycleVersion"
165+
160166
//utils
161167
implementation 'com.github.deano2390:MaterialShowcaseView:1.2.0@aar'
162168
implementation "com.jakewharton:butterknife:$rootProject.butterknifeVersion"
163169
annotationProcessor "com.jakewharton:butterknife-compiler:$rootProject.butterknifeVersion"
164-
implementation 'com.github.bumptech.glide:glide:3.7.0'
170+
implementation "com.github.bumptech.glide:glide:$rootProject.glideVersion"
171+
implementation "com.github.bumptech.glide:gifencoder-integration:$rootProject.glideVersion"
165172
implementation 'com.yalantis:ucrop:1.5.0'
166173
implementation 'de.psdev.licensesdialog:licensesdialog:1.8.0'
167174
/*implementation('com.crashlytics.sdk.android:crashlytics:2.9.3@aar') {
@@ -171,7 +178,7 @@ dependencies {
171178
implementation 'com.koushikdutta.ion:ion:2.1.7'
172179
implementation 'org.jetbrains:annotations-java5:15.0'
173180
implementation 'com.android.support:multidex:1.0.3'
174-
implementation group: 'com.box', name: 'box-android-sdk', version: '4.0.8'
181+
implementation group: 'com.box', name: 'box-android-sdk', version: '5.0.0'
175182

176183
//icons
177184
implementation 'com.mikepenz:iconics-core:2.8.4@aar'
@@ -196,8 +203,7 @@ dependencies {
196203
implementation "org.twitter4j:twitter4j-core:3.0.5"
197204
implementation "org.twitter4j:twitter4j-media-support:3.0.5"
198205

199-
//cloud rail
200-
implementation 'com.cloudrail:cloudrail-si-android:2.20.1'
206+
implementation 'com.dropbox.core:dropbox-core-sdk:3.1.1'
201207

202208
//next cloud
203209
implementation "com.github.nextcloud:android-library:$rootProject.nextCloudVersion"
@@ -214,9 +220,6 @@ dependencies {
214220
//flickr
215221
implementation "com.googlecode.flickrj-android:flickrj-android:2.1.0"
216222

217-
//realm
218-
implementation 'com.uphyca:stetho_realm:2.0.0'
219-
220223
//metadataextractor
221224
implementation 'com.drewnoakes:metadata-extractor:2.9.1'
222225

‎app/src/androidTest/java/org/fossasia/phimpme/leafpic/activities/HomeScreenTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
package org.fossasia.phimpme.leafpic.activities;
22

33
import static android.content.Context.KEYGUARD_SERVICE;
4-
import static android.support.test.espresso.Espresso.onView;
5-
import static android.support.test.espresso.assertion.ViewAssertions.matches;
6-
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
7-
import static android.support.test.espresso.matcher.ViewMatchers.withContentDescription;
8-
import static android.support.test.espresso.matcher.ViewMatchers.withId;
4+
import static androidx.test.espresso.Espresso.onView;
5+
import static androidx.test.espresso.assertion.ViewAssertions.matches;
6+
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
7+
import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
8+
import static androidx.test.espresso.matcher.ViewMatchers.withId;
99
import static org.hamcrest.Matchers.allOf;
1010

1111
import android.app.Activity;
1212
import android.app.KeyguardManager;
13-
import android.support.test.annotation.UiThreadTest;
14-
import android.support.test.espresso.ViewInteraction;
15-
import android.support.test.filters.LargeTest;
16-
import android.support.test.rule.ActivityTestRule;
17-
import android.support.test.runner.AndroidJUnit4;
1813
import android.view.View;
1914
import android.view.ViewGroup;
2015
import android.view.ViewParent;
2116
import android.view.WindowManager;
17+
import androidx.test.annotation.UiThreadTest;
18+
import androidx.test.espresso.ViewInteraction;
19+
import androidx.test.filters.LargeTest;
20+
import androidx.test.rule.ActivityTestRule;
21+
import androidx.test.runner.AndroidJUnit4;
2222
import org.fossasia.phimpme.R;
2323
import org.fossasia.phimpme.gallery.activities.LFMainActivity;
2424
import org.hamcrest.Description;

‎app/src/androidTest/java/org/fossasia/phimpme/leafpic/activities/PhotoActivityTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package org.fossasia.phimpme.leafpic.activities;
22

3-
import static android.support.test.espresso.Espresso.onView;
4-
import static android.support.test.espresso.assertion.ViewAssertions.matches;
5-
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
6-
import static android.support.test.espresso.matcher.ViewMatchers.withId;
3+
import static androidx.test.espresso.Espresso.onView;
4+
import static androidx.test.espresso.assertion.ViewAssertions.matches;
5+
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
6+
import static androidx.test.espresso.matcher.ViewMatchers.withId;
77
import static org.hamcrest.Matchers.allOf;
88

9-
import android.support.test.espresso.ViewInteraction;
10-
import android.support.test.filters.LargeTest;
11-
import android.support.test.rule.ActivityTestRule;
12-
import android.support.test.runner.AndroidJUnit4;
9+
import androidx.test.espresso.ViewInteraction;
10+
import androidx.test.filters.LargeTest;
11+
import androidx.test.rule.ActivityTestRule;
12+
import androidx.test.runner.AndroidJUnit4;
1313
import org.fossasia.phimpme.R;
1414
import org.fossasia.phimpme.opencamera.Camera.PhotoActivity;
1515
import org.junit.Ignore;

‎app/src/androidTest/java/org/fossasia/phimpme/leafpic/activities/SettingsActivityTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
package org.fossasia.phimpme.leafpic.activities;
22

33
import static android.content.Context.KEYGUARD_SERVICE;
4-
import static android.support.test.espresso.Espresso.onView;
5-
import static android.support.test.espresso.action.ViewActions.scrollTo;
6-
import static android.support.test.espresso.assertion.ViewAssertions.matches;
7-
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
8-
import static android.support.test.espresso.matcher.ViewMatchers.withId;
4+
import static androidx.test.espresso.Espresso.onView;
5+
import static androidx.test.espresso.action.ViewActions.scrollTo;
6+
import static androidx.test.espresso.assertion.ViewAssertions.matches;
7+
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
8+
import static androidx.test.espresso.matcher.ViewMatchers.withId;
99

1010
import android.app.Activity;
1111
import android.app.KeyguardManager;
12-
import android.support.test.annotation.UiThreadTest;
13-
import android.support.test.espresso.ViewInteraction;
14-
import android.support.test.filters.LargeTest;
15-
import android.support.test.rule.ActivityTestRule;
16-
import android.support.test.runner.AndroidJUnit4;
1712
import android.view.WindowManager;
13+
import androidx.test.annotation.UiThreadTest;
14+
import androidx.test.espresso.ViewInteraction;
15+
import androidx.test.filters.LargeTest;
16+
import androidx.test.rule.ActivityTestRule;
17+
import androidx.test.runner.AndroidJUnit4;
1818
import org.fossasia.phimpme.R;
1919
import org.fossasia.phimpme.gallery.activities.SettingsActivity;
2020
import org.junit.Before;

‎app/src/main/AndroidManifest.xml‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -269,17 +269,14 @@
269269
<category android:name="android.intent.category.DEFAULT" />
270270
</intent-filter>
271271
</activity>
272+
272273
<activity
273274
android:name=".gallery.activities.AboutActivity"
274275
android:configChanges="orientation|screenSize"
275276
android:label="@string/about"
276277
android:theme="@style/Theme.AppCompat.NoActionBar">
277-
<intent-filter>
278-
<action android:name="android.intent.action.ABOUT" />
279-
280-
<category android:name="android.intent.category.DEFAULT" />
281-
</intent-filter>
282278
</activity>
279+
283280
<activity
284281
android:name=".gallery.activities.ExcludedAlbumsActivity"
285282
android:label="@string/excluded_albums"
@@ -315,7 +312,7 @@
315312
android:value="GlideModule" />
316313

317314
<provider
318-
android:name="android.support.v4.content.FileProvider"
315+
android:name="androidx.core.content.FileProvider"
319316
android:authorities="${applicationId}.provider"
320317
android:exported="false"
321318
android:grantUriPermissions="true">
@@ -371,6 +368,21 @@
371368
<activity
372369
android:name=".share.imgur.ImgurAuthActivity"
373370
android:theme="@style/AppTheme.NoActionBar" />
371+
<activity
372+
android:name="com.dropbox.core.android.AuthActivity"
373+
android:configChanges="orientation|keyboard"
374+
android:launchMode="singleTask">
375+
<intent-filter>
376+
377+
<!-- Change this to be db- followed by your app key -->
378+
<data android:scheme="db-7fhwc9meece1m9g" />
379+
380+
<action android:name="android.intent.action.VIEW" />
381+
382+
<category android:name="android.intent.category.BROWSABLE" />
383+
<category android:name="android.intent.category.DEFAULT" />
384+
</intent-filter>
385+
</activity>
374386
<activity
375387
android:name=".share.owncloud.OwnCloudActivity"
376388
android:label="@string/title_activity_own_cloud"

‎app/src/main/java/org/fossasia/phimpme/MyApplication.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import android.app.Application;
44
import android.content.Context;
55
import android.os.StrictMode;
6-
import android.support.multidex.MultiDex;
76
import android.util.Log;
7+
import androidx.multidex.MultiDex;
88
import com.squareup.leakcanary.LeakCanary;
99
import com.squareup.leakcanary.RefWatcher;
1010
import com.twitter.sdk.android.core.DefaultLogger;
@@ -68,12 +68,6 @@ public void onCreate() {
6868
// if (isPublished)
6969
// Fabric.with(this, new Crashlytics());
7070

71-
/** Stetho initialization */
72-
/*Stetho.initialize(
73-
Stetho.newInitializerBuilder(this)
74-
.enableDumpapp(Stetho.defaultDumperPluginsProvider(this))
75-
.enableWebKitInspector(RealmInspectorModulesProvider.builder(this).build())
76-
.build());*/
7771
}
7872

7973
public static RefWatcher getRefWatcher(Context context) {

0 commit comments

Comments
 (0)