Skip to content

Commit

Permalink
Merge pull request #3053 from fossasia/development
Browse files Browse the repository at this point in the history
  • Loading branch information
iamareebjamal authored Aug 15, 2020
2 parents b84cb09 + f62234c commit 45cf591
Show file tree
Hide file tree
Showing 32 changed files with 524 additions and 1,771 deletions.
173 changes: 91 additions & 82 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,96 +1,105 @@
language: android
jdk: oraclejdk8
sudo: true
dist: trusty
jobs:
include:
- language: android
jdk: oraclejdk8
sudo: true
dist: trusty

env:
global:
- ANDROID_API_LEVEL=22
- ANDROID_BUILD_TOOLS_VERSION=28.0.3
- ANDROID_ABI=armeabi-v7a arm64-v8a x86 x86_64
- ANDROID_TAG=google_apis
- ANDROID_TARGET=android-25
- ADB_INSTALL_TIMEOUT=20 # minutes (2 minutes by default)
env:
- ANDROID_API_LEVEL=22
- ANDROID_BUILD_TOOLS_VERSION=28.0.3
- ANDROID_ABI=armeabi-v7a arm64-v8a x86 x86_64
- ANDROID_TAG=google_apis
- ANDROID_TARGET=android-25
- ADB_INSTALL_TIMEOUT=20 # minutes (2 minutes by default)

android:
components:
- tools
- platform-tools
- android-$ANDROID_API_LEVEL
- build-tools-$ANDROID_BUILD_TOOLS_VERSION
- android-$ANDROID_API_LEVEL
# For Google APIs
- addon-google_apis-google-$ANDROID_API_LEVEL
# Google Play Services
- extra-google-google_play_services
# Support library
- extra-android-support
# Latest artifacts in local repository
- extra-google-m2repository
- extra-android-m2repository
- android-sdk-license-.+
- '.+'
# Specify at least one system image
- sys-img-armeabi-v7a-android-$ANDROID_API_LEVEL
android:
components:
- tools
- platform-tools
- android-$ANDROID_API_LEVEL
- build-tools-$ANDROID_BUILD_TOOLS_VERSION
- android-$ANDROID_API_LEVEL
# For Google APIs
- addon-google_apis-google-$ANDROID_API_LEVEL
# Google Play Services
- extra-google-google_play_services
# Support library
- extra-android-support
# Latest artifacts in local repository
- extra-google-m2repository
- extra-android-m2repository
- android-sdk-license-.+
- '.+'
# Specify at least one system image
- sys-img-armeabi-v7a-android-$ANDROID_API_LEVEL

# prevents reuploading of Cache
before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
# prevents reuploading of Cache
before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock

cache:
directories:
- "${TRAVIS_BUILD_DIR}/android/gradle/caches/"
- "${TRAVIS_BUILD_DIR}/android/gradle/wrapper/dists/"
- "$HOME/android/.gradle/caches/"
- "$HOME/android/.gradle/wrapper/"
- "$HOME/.android/build-cache"
- "${TRAVIS_BUILD_DIR}/cache"
cache:
directories:
- "${TRAVIS_BUILD_DIR}/android/gradle/caches/"
- "${TRAVIS_BUILD_DIR}/android/gradle/wrapper/dists/"
- "$HOME/android/.gradle/caches/"
- "$HOME/android/.gradle/wrapper/"
- "$HOME/.android/build-cache"
- "${TRAVIS_BUILD_DIR}/cache"

before_install:
- mkdir "$ANDROID_HOME/licenses" || true
- echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
- echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
- curl https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip -o android-ndk-r18b.zip
- unzip -q android-ndk-r18b.zip && rm android-ndk-r18b.zip
- mv android-ndk-r18b $HOME
- export ANDROID_NDK=$HOME/android-ndk-r18b
before_install:
- mkdir "$ANDROID_HOME/licenses" || true
- echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
- echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
- curl https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip -o android-ndk-r18b.zip
- unzip -q android-ndk-r18b.zip && rm android-ndk-r18b.zip
- mv android-ndk-r18b $HOME
- export ANDROID_NDK=$HOME/android-ndk-r18b


install:
- sdkmanager --list || true
- echo yes | ${ANDROID_HOME}/tools/bin/sdkmanager "platforms;android-26"
- echo yes | sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2"
- echo yes | sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2"
install:
- sdkmanager --list || true
- echo yes | ${ANDROID_HOME}/tools/bin/sdkmanager "platforms;android-26"
- echo yes | sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2"
- echo yes | sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2"

licenses:
- 'android-sdk-preview-license-.+'
- 'android-sdk-license-.+'
- 'google-gdk-license-.+'
licenses:
- 'android-sdk-preview-license-.+'
- 'android-sdk-license-.+'
- 'google-gdk-license-.+'

before_script:
- ./scripts/setup_opencv.sh
- echo "Starting AVD"
- echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
- emulator -avd test -no-audio -no-window &
- android-wait-for-emulator
- adb shell input keyevent 82 &
- bash scripts/prep-key.sh
before_script:
- ./scripts/setup_opencv.sh
- echo "Starting AVD"
- echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
- emulator -avd test -no-audio -no-window &
- android-wait-for-emulator
- adb shell input keyevent 82 &
- bash scripts/prep-key.sh

script:
- ./gradlew spotlessCheck
- ./gradlew build
- ./gradlew build connectedAndroidTest jacocoTestReport --stacktrace
script:
- ./gradlew spotlessCheck
- ./gradlew build
- ./gradlew build connectedAndroidTest jacocoTestReport --stacktrace

after_success:
- bash <(curl -s https://codecov.io/bash)
- bash scripts/update-apk.sh
after_success:
- bash <(curl -s https://codecov.io/bash)
- bash scripts/update-apk.sh

deploy:
- provider: script
skip_cleanup: true
script: bash scripts/upload-gh-pages.sh
on:
all_branches: true
- language: python
python: 3.7
install:
- pip install Sphinx
- pip install git+https://github.com/bashtage/sphinx-material
- pip install m2r
- pip install sphinx-git
script: skip
deploy:
- provider: script
skip_cleanup: true
script: bash scripts/upload-gh-pages.sh
on:
all_branches: true

notifications:
slack: fossasia:JgzycrBUs0nKnmJhsAxCB4bL
slack: fossasia:JgzycrBUs0nKnmJhsAxCB4bL
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
|------------|-----------------|-------------|-----------------|-----------------|-----------------|
| [![Build Status](https://travis-ci.org/fossasia/phimpme-android.svg?branch=master)](https://travis-ci.org/fossasia/phimpme-android) | [![Build Status](https://travis-ci.org/fossasia/phimpme-android.svg?branch=development)](https://travis-ci.org/fossasia/phimpme-android) | [![codecov](https://codecov.io/gh/fossasia/phimpme-android/branch/master/graph/badge.svg)](https://codecov.io/gh/fossasia/phimpme-android) | [![Codacy Badge](https://api.codacy.com/project/badge/Grade/4584003e734343b3b8ce94bcae6e9ca4)](https://www.codacy.com/app/harshithdwivedi/phimpme-android?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=fossasia/phimpme-android&amp;utm_campaign=Badge_Grade) | [![Gitter Room](https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-blue.svg)](https://gitter.im/fossasia/phimpme) | [![Twitter Follow](https://img.shields.io/twitter/follow/phimpme.svg?style=social&label=Follow&maxAge=2592000?style=flat-square)](https://twitter.com/phimpme) |

## Download from Play Store
<img src="docs/images/phimp-me-qrcode.png">

## Screenshots

<p float="left">
Expand Down Expand Up @@ -83,7 +86,7 @@ We have the following branches
This branch contains automatically generated apk file for testing.

* **gh-pages**
Hosting the landing page [phimp.me](http://phimp.me)
For reference gh-pages branch is hosting the Gihub-Pages link for this Repo at https://fossasia.github.io/phimpme-android/

## Development Setup

Expand Down
34 changes: 18 additions & 16 deletions app/build.gradle
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ android {
applicationId "org.fossasia.phimpme"
minSdkVersion 21
targetSdkVersion 29
versionCode 13
versionName '1.10.0'
versionCode 14
versionName '1.11.0'
multiDexEnabled true
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
vectorDrawables.useSupportLibrary = true
Expand Down Expand Up @@ -144,17 +144,17 @@ dependencies {
//retrofit
implementation "com.squareup.retrofit2:retrofit:$rootProject.retrofitVersion"
implementation "com.squareup.retrofit2:converter-gson:$rootProject.retrofitVersion"
implementation 'com.squareup.okhttp3:logging-interceptor:4.2.0'
implementation 'com.squareup.okhttp3:logging-interceptor:4.4.1'

//google and support
implementation "androidx.appcompat:appcompat:$rootProject.supportLibraryVersion"
implementation "androidx.vectordrawable:vectordrawable-animated:1.1.0"
implementation "androidx.legacy:legacy-support-v4:1.0.0"
implementation "com.google.android.material:material:1.0.0"
implementation "com.google.android.material:material:1.1.0"
implementation "androidx.vectordrawable:vectordrawable:1.1.0"
implementation "androidx.palette:palette:1.0.0"
implementation "androidx.cardview:cardview:1.0.0"
implementation "androidx.browser:browser:1.0.0"
implementation "androidx.browser:browser:1.2.0"
implementation "androidx.recyclerview:recyclerview:1.0.0"
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'

Expand All @@ -164,19 +164,18 @@ dependencies {
implementation "androidx.lifecycle:lifecycle-extensions:$rootProject.lifecycleVersion"

//utils
implementation 'com.github.deano2390:MaterialShowcaseView:1.2.0@aar'
implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.0'
implementation "com.jakewharton:butterknife:$rootProject.butterknifeVersion"
annotationProcessor "com.jakewharton:butterknife-compiler:$rootProject.butterknifeVersion"
implementation "com.github.bumptech.glide:glide:$rootProject.glideVersion"
implementation "com.github.bumptech.glide:gifencoder-integration:$rootProject.glideVersion"
implementation 'com.yalantis:ucrop:1.5.0'
implementation 'de.psdev.licensesdialog:licensesdialog:1.8.0'
/*implementation('com.crashlytics.sdk.android:crashlytics:2.9.3@aar') {
transitive = true;
}*/

implementation 'com.koushikdutta.ion:ion:2.1.7'
implementation 'org.jetbrains:annotations-java5:15.0'
implementation 'com.koushikdutta.ion:ion:3.0.8'
implementation 'org.jetbrains:annotations-java5:18.0.0'
implementation 'com.android.support:multidex:1.0.3'
implementation group: 'com.box', name: 'box-android-sdk', version: '5.0.0'

Expand All @@ -188,10 +187,10 @@ dependencies {
implementation 'com.mikepenz:ionicons-typeface:+@aar'

//ui
implementation 'de.hdodenhof:circleimageview:2.0.0'
implementation 'uz.shift:colorpicker:0.5@aar'
implementation 'com.turingtechnologies.materialscrollbar:lib:10.0.3'
implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.7'
implementation 'de.hdodenhof:circleimageview:3.1.0'
implementation 'me.jfenn.ColorPickerDialog:base:0.2.1'
implementation 'com.turingtechnologies.materialscrollbar:lib:10.1.4'
implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.19'
implementation 'com.github.shchurov:horizontalwheelview:0.9.5'
implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'

Expand All @@ -201,19 +200,19 @@ dependencies {
//twitter
implementation "com.twitter.sdk.android:twitter:$rootProject.twitterVersion"
implementation "org.twitter4j:twitter4j-core:3.0.5"
implementation "org.twitter4j:twitter4j-media-support:3.0.5"
implementation "org.twitter4j:twitter4j-media-support:4.0.6"

implementation 'com.dropbox.core:dropbox-core-sdk:3.1.1'

//next cloud
implementation "com.github.nextcloud:android-library:$rootProject.nextCloudVersion"

//leak canary
debugImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
debugImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'
releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'

//tumblr
implementation('com.tumblr:jumblr:0.0.11') {
implementation('com.tumblr:jumblr:0.0.13') {
exclude module: 'scribe'
}

Expand All @@ -236,6 +235,9 @@ dependencies {
//compressor
implementation 'id.zelory:compressor:2.1.0'

//about page
implementation 'com.github.medyo:android-about-page:1.2.5'

}

apply plugin: 'com.android.application'
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
android:name=".MyApplication"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:requestLegacyExternalStorage="true"
android:label="@string/app_name"
android:largeHeap="true"
android:supportsRtl="true"
Expand Down Expand Up @@ -273,8 +274,7 @@
<activity
android:name=".gallery.activities.AboutActivity"
android:configChanges="orientation|screenSize"
android:label="@string/about"
android:theme="@style/Theme.AppCompat.NoActionBar">
android:label="@string/about">
</activity>

<activity
Expand Down Expand Up @@ -339,7 +339,7 @@
<category android:name="android.intent.category.BROWSABLE" />

<data android:scheme="org.fossasia.phimpme" />
<data android:scheme="pdk4910600717739247160" />
<data android:scheme="pdk4914573327424567067" />
</intent-filter>
</activity>
<activity
Expand Down
Loading

0 comments on commit 45cf591

Please sign in to comment.