Merge pull request #16 from lovoo/develop

dev -> master
lovoo · Jun 11, 2020 · ec4550e · ec4550e
2 parents 1300a00 + 02fb967
commit ec4550e
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 32 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -20,6 +20,15 @@ android {
         testInstrumentationRunnerArguments clearPackageData: 'true'
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -58,8 +67,6 @@ dependencies {
     implementation "androidx.legacy:legacy-support-v4:$legacy_v4_version"
     implementation "com.google.android.material:material:$material_version"
 
-    implementation "com.lovoo.android:pickapp:$pickpic_version"
-
     androidTestImplementation "androidx.test:runner:$androidX_test_version"
     androidTestImplementation "androidx.test:rules:$androidX_test_version"
     androidTestImplementation "androidx.test.espresso:espresso-web:$espresso_version"
@@ -71,4 +78,9 @@ dependencies {
     androidTestImplementation "androidx.test.uiautomator:uiautomator:$uiautomator_version"
 
     androidTestUtil "androidx.test:orchestrator:$orchestrator_version"
+    implementation project(path: ':pickcam')
+    implementation project(path: ':pickcore')
+    implementation project(path: ':pickfacebook')
+    implementation project(path: ':pickui')
+    implementation project(path: ':pickapp')
 }
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -13,6 +13,4 @@
     <color name="pickpic_background_toolbar">#FFFFFF</color>
     <color name="pickpic_background_overlay">#E7E7E7</color>
     <color name="pickpic_selection_overlay">#BBE7E247</color>
-
-    <color name="pickpic_stroke">#3D3B30</color>
 </resources>
diff --git a/build.gradle b/build.gradle
@@ -1,25 +1,26 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.3.72'
     ext.multidex_version = "2.0.1"
 
     ext.legacy_v4_version = "1.0.0"
     ext.app_compat_version = "1.1.0"
-    ext.material_version = "1.2.0-alpha02"
+    ext.material_version = "1.2.0-alpha06"
     ext.vector_drawable_version = "1.0.0"
     ext.constraint_layout_version = '1.1.3'
     ext.recycler_view_version = "1.1.0"
     ext.card_view_version = "1.0.0"
-    ext.browser_version = "1.0.0"
-    ext.exif_version = "1.1.0"
+    ext.browser_version = "1.2.0"
+    ext.exif_version = "1.2.0"
     ext.media_version = "1.1.0"
-    ext.arch_version = "2.1.0"
-    ext.arch_worker_version = "1.0.1"
+    ext.arch_version = "2.2.0"
+    ext.arch_worker_version = "2.3.4"
+    ext.lifecycle_version = "2.2.0"
 
     ext.rx_java_version = '2.2.15'
     ext.rx_android_version = '2.1.1'
-    ext.glide_version = '4.10.0'
+    ext.glide_version = '4.11.0'
     ext.gson_version = '2.8.6'
     ext.facebook_version = '5.11.2'
 
@@ -28,22 +29,20 @@ buildscript {
     ext.orchestrator_version = "1.2.0"
     ext.androidX_test_version = "1.2.0"
 
-    ext.pickpic_version = "1.0.1"
-
     ext.target_version = 28
     ext.min_version = 18
 
     def version = System.getenv("VERSION")
     def code = System.getenv("VERSION_CODE")
-    ext.version_name = version == null ? "1.0.1" : version
-    ext.version_code = code == null ? 2 : code.toInteger()
+    ext.version_name = version == null ? "1.0.3" : version
+    ext.version_code = code == null ? 3 : code.toInteger()
 
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.1'
+        classpath 'com.android.tools.build:gradle:3.6.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'org.jetbrains.dokka:dokka-gradle-plugin:0.9.18'
         classpath 'com.diffplug.spotless:spotless-plugin-gradle:3.27.1'

diff --git a/pickapp/build.gradle b/pickapp/build.gradle
@@ -46,9 +46,9 @@ dependencies {
     implementation "io.reactivex.rxjava2:rxjava:$rx_java_version"
     implementation "io.reactivex.rxjava2:rxandroid:$rx_android_version"
     implementation "com.github.bumptech.glide:glide:$glide_version"
-    kapt "com.github.bumptech.glide:compiler:$glide_version"
+    implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
 
-    kapt "androidx.lifecycle:lifecycle-compiler:$arch_version"
+    kapt "com.github.bumptech.glide:compiler:$glide_version"
 
     implementation project(path: ':pickfacebook')
     implementation project(path: ':pickcam')

diff --git a/pickapp/src/main/kotlin/com/lovoo/android/pickapp/view/PickPicActivity.kt b/pickapp/src/main/kotlin/com/lovoo/android/pickapp/view/PickPicActivity.kt
@@ -104,6 +104,8 @@ class PickPicActivity : AppCompatActivity(), SelectionHolder, CameraEngine, Capt
             // initialise selection bar and preview if enabled or multiple pictures can be selected
             initSelectionBar()
             initPreview()
+        } else {
+            selection_bar.visibility = View.GONE
         }
 
         if (!config.isPreviewEnabled()) {

diff --git a/pickapp/src/main/res/layout/pickpic_activity.xml b/pickapp/src/main/res/layout/pickpic_activity.xml
@@ -27,6 +27,7 @@
 
     <include
         android:id="@+id/selection_bar"
+        style="@style/PickPicSelectionbar"
         layout="@layout/pickpic_layout_selectionbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -43,9 +44,8 @@
 
     <View
         android:id="@+id/top_stroke"
+        style="@style/PickPicStroke"
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="#19000000"
         app:layout_anchor="@+id/selection_bar"
         app:layout_anchorGravity="top" />
 

diff --git a/pickapp/src/main/res/layout/pickpic_layout_selectionbar.xml b/pickapp/src/main/res/layout/pickpic_layout_selectionbar.xml
@@ -3,10 +3,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/selection_bar"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/pickpic_background_toolbar">
+    style="@style/PickPicSelectionbar"
+    android:id="@+id/selection_bar">
 
     <TextView
         android:id="@+id/selection_text"
@@ -66,11 +64,11 @@
         app:layout_constraintTop_toBottomOf="@id/selection_text" />
 
     <View
+        style="@style/PickPicSelectionbarFade"
         android:id="@+id/selection_fade"
         android:layout_width="24dp"
         android:layout_height="0dp"
         android:layout_marginEnd="16dp"
-        android:background="@drawable/pickpic_left_fade"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@id/selection_list"
         app:layout_constraintEnd_toStartOf="@id/selection_button"

diff --git a/pickapp/src/main/res/values/styles.xml b/pickapp/src/main/res/values/styles.xml
@@ -115,14 +115,22 @@
         <item name="android:gravity">start</item>
     </style>
 
-    <style name="PickPicSelection">
+    <style name="PickPicStroke">
+        <item name="android:layout_height">1dp</item>
+        <item name="android:background">@color/pickpic_stroke</item>
+    </style>
+
+    <style name="PickPicSelectionbar">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_gravity">bottom</item>
         <item name="android:padding">0dp</item>
         <item name="android:background">@color/pickpic_background_toolbar</item>
     </style>
 
+    <style name="PickPicSelectionbarFade">
+        <item name="android:background">@drawable/pickpic_left_fade</item>
+    </style>
+
     <style name="PickPicGalleryBar">
         <item name="android:background">@color/pickpic_background_toolbar</item>
         <item name="android:layout_height">wrap_content</item>

diff --git a/pickcam/build.gradle b/pickcam/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 ext.moduleName = 'pickcam'
-ext.moduleDescription = 'The camera capture implementation\t'
+ext.moduleDescription = 'The camera capture implementation'
 apply from: '../submodules.gradle'
 apply from: '../spotless.gradle'
 
@@ -18,6 +18,15 @@ android {
         versionName version_name
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -39,9 +48,9 @@ dependencies {
 
     implementation "androidx.appcompat:appcompat:$app_compat_version"
     implementation "androidx.constraintlayout:constraintlayout:$constraint_layout_version"
-    implementation "android.arch.work:work-runtime:$arch_worker_version"
-    implementation "android.arch.work:work-runtime-ktx:$arch_worker_version"
-    implementation "android.arch.work:work-rxjava2:$arch_worker_version"
+    implementation "androidx.work:work-runtime:$arch_worker_version"
+    implementation "androidx.work:work-runtime-ktx:$arch_worker_version"
+    implementation "androidx.work:work-rxjava2:$arch_worker_version"
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 

diff --git a/pickcore/build.gradle b/pickcore/build.gradle
@@ -35,7 +35,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation "androidx.exifinterface:exifinterface:1.0.0"
+    implementation "androidx.exifinterface:exifinterface:$exif_version"
     implementation "androidx.appcompat:appcompat:$app_compat_version"
     implementation "androidx.recyclerview:recyclerview:$recycler_view_version"
     implementation "androidx.lifecycle:lifecycle-livedata:$arch_version"