Merge pull request #14 from devmil/dev

Merge current dev state into master

Author: devmil

.ci/build.sh

@@ -1,7 +1,47 @@
 #!/bin/bash
-set -ex
-gradle build
-gradle assembleDebug
-gradle assembleRelease
-chown -R `stat -c "%u:%g" $(pwd)/app` $(pwd)/app/build
-chown -R `stat -c "%u:%g" $(pwd)/app` $(pwd)/build
+#set -xeuo pipefail
+set -x pipefail
+
+source_root=/home/app
+
+echo copying code to build to /tmp/Paperlaunch
+
+if [ -d /tmp/Paperlaunch ]; then
+  rm -rf /tmp/Paperlaunch
+fi
+cp -r $source_root /tmp/Paperlaunch
+cd /tmp/Paperlaunch
+
+# rename local properties if they are present (e.g. when the docker build is started locally)
+if [ -f ./local.properties ]; then
+    mv ./local.properties ./local.properties.tmp
+fi
+
+# build scope
+(
+    set -e
+    gradle test
+    gradle assembleDebug
+    gradle assembleRelease
+    chown -R `stat -c "%u:%g" $(pwd)/app` $(pwd)/app/build
+    chown -R `stat -c "%u:%g" $(pwd)/app` $(pwd)/build
+)
+
+cmdresult=$?
+
+# rename the local properties back after the build is finished
+if [ -f ./local.properties.tmp ]; then
+    mv ./local.properties.tmp ./local.properties
+fi
+
+if [ $cmdresult -eq 0 ]; then
+  if [ -d $source_root/app/build ]; then
+    rm -rf $source_root/app/app/build
+  fi
+  cp -r $(pwd)/app/build $source_root/app/build
+  cd $source_root
+  chown -R `stat -c "%u:%g" $(pwd)/app` $(pwd)/app/build
+fi
+
+# return the build result
+exit $cmdresult

.gitignore

@@ -7,4 +7,6 @@
 /captures
 .idea/
 Key/
-/.project
+/.project
+.ci/build_lf.sh
+local.properties.tmp

Dockerfile

@@ -2,10 +2,10 @@ FROM anapsix/alpine-java:8_jdk
 
 # Install Gradle
 RUN apk add --update openssl \
-	&& wget https://services.gradle.org/distributions/gradle-4.6-bin.zip \
-	&& unzip gradle-4.6-bin.zip -d /opt/ \
-	&& mv opt/gradle-4.6/ opt/gradle \
-	&& rm gradle-4.6-bin.zip
+	&& wget https://services.gradle.org/distributions/gradle-5.1.1-bin.zip \
+	&& unzip gradle-5.1.1-bin.zip -d /opt/ \
+	&& mv opt/gradle-5.1.1/ opt/gradle \
+	&& rm gradle-5.1.1-bin.zip
 
 ENV GRADLE /opt/gradle/bin
 ENV PATH ${PATH}:${GRADLE}
@@ -24,4 +24,10 @@ RUN wget https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip \
 ENV PATH ${PATH}:${ANDROID_HOME}/tools/bin
 
 RUN yes | sdkmanager --licenses \
-	&& sdkmanager "platforms;android-27" "platform-tools" "extras;google;m2repository" "build-tools;27.0.3" --verbose
+	&& sdkmanager "platforms;android-27" "platform-tools" "extras;google;m2repository" "build-tools;28.0.3" --verbose
+
+# Support for CRLF scripts
+RUN apk add dos2unix
+
+# bash_r is a wrapper for bash that removes \r
+ADD bash_r.tgz /bin

app/app.iml

@@ -12,6 +12,7 @@ android {
         versionCode 14
         versionName "1.0.12"
         archivesBaseName = "paperlaunch-v${defaultConfig.versionName}-${buildTime()}"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     signingConfigs {
         release {
@@ -54,12 +55,15 @@ dependencies {
     implementation 'io.reactivex:rxjava:1.1.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.mockito:mockito-core:1.10.19'
 }
 repositories {
     mavenCentral()
 }
 
-def buildTime() {
+static def buildTime() {
     return new Date().format("yyyyMMdd")
 }
 

app/build.gradle

@@ -64,17 +64,17 @@ class UserSettings(context: Context) : IUserSettings {
 
     companion object {
 
-        private val SHARED_PREFS_NAME = "paperLaunch"
+        internal val SHARED_PREFS_NAME = "paperLaunch"
 
-        private val KEY_SENSITIVITY_DIP = "sensitivityDip"
-        private val KEY_ACTIVATION_OFFSET_POSITION_DIP = "activationOffsetPositionDip"
-        private val KEY_ACTIVATION_OFFSET_HEIGHT_DIP = "activationOffsetHeightDip"
-        private val KEY_SHOW_BACKGROUND = "showBackground"
-        private val KEY_VIBRATE_ON_ACTIVATION = "vibrateOnActivation"
-        private val KEY_IS_ON_RIGHT_SIDE = "isOnRightSide"
-        private val KEY_LAUNCHER_GRAVITY = "launcherGravity"
-        private val KEY_SHOW_LOGO = "showLogo"
-        private val KEY_ITEM_SCALE_PERCENT = "itemScalePercent"
+        internal val KEY_SENSITIVITY_DIP = "sensitivityDip"
+        internal val KEY_ACTIVATION_OFFSET_POSITION_DIP = "activationOffsetPositionDip"
+        internal val KEY_ACTIVATION_OFFSET_HEIGHT_DIP = "activationOffsetHeightDip"
+        internal val KEY_SHOW_BACKGROUND = "showBackground"
+        internal val KEY_VIBRATE_ON_ACTIVATION = "vibrateOnActivation"
+        internal val KEY_IS_ON_RIGHT_SIDE = "isOnRightSide"
+        internal val KEY_LAUNCHER_GRAVITY = "launcherGravity"
+        internal val KEY_SHOW_LOGO = "showLogo"
+        internal val KEY_ITEM_SCALE_PERCENT = "itemScalePercent"
 
         private val DEFAULT_SENSITIVITY_DIP = 10
         private val DEFAULT_ACTIVATION_OFFSET_POSITION_DIP = 0

app/src/main/java/de/devmil/paperlaunch/config/UserSettings.kt

@@ -0,0 +1,24 @@
+package de.devmil.paperlaunch.model
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.drawable.Drawable
+import de.devmil.paperlaunch.utils.AppMetadataUtils
+
+class AndroidContextAccess(private val context: Context) : IContextAccess {
+
+    override fun getDrawable(id: Int, themed : Boolean) : Drawable {
+        if(themed) {
+            return context.resources.getDrawable(id, context.theme)
+        }
+        return context.getDrawable(id)
+    }
+
+    override fun getAppName(intent: Intent): String? {
+        return AppMetadataUtils.getAppName(context, intent)
+    }
+
+    override fun getAppIcon(intent: Intent): Drawable {
+        return AppMetadataUtils.getAppIcon(context, intent)
+    }
+}

app/src/main/java/de/devmil/paperlaunch/model/AndroidContextAccess.kt

@@ -15,14 +15,12 @@
  */
 package de.devmil.paperlaunch.model
 
-import android.content.Context
 import android.graphics.drawable.Drawable
-
 import de.devmil.paperlaunch.R
 import de.devmil.paperlaunch.storage.EntryDTO
 import de.devmil.paperlaunch.storage.FolderDTO
 
-class Folder(val dto: FolderDTO, private val entryDto: EntryDTO, var subEntriesList: List<IEntry>?) : IFolder {
+class Folder(private val contextAccess: IContextAccess, val dto: FolderDTO, private val entryDto: EntryDTO, private var subEntriesList: List<IEntry>?) : IFolder {
 
     override val id: Long
         get() = dto.id
@@ -33,28 +31,28 @@ class Folder(val dto: FolderDTO, private val entryDto: EntryDTO, var subEntriesL
     override val orderIndex: Long
         get() = entryDto.orderIndex
 
-    override fun getName(context: Context): String? {
-        return dto.name
-    }
+    override val name: String?
+        get() = dto.name
 
-    override fun getFolderSummaryIcon(context: Context): Drawable {
-        return context.resources.getDrawable(R.mipmap.ic_folder_grey600_48dp, context.theme)
-    }
+    override val folderSummaryIcon: Drawable
+        get() = contextAccess.getDrawable(R.mipmap.ic_folder_grey600_48dp, true)
 
     override val isFolder: Boolean
         get() = true
 
-    override fun getIcon(context: Context): Drawable? {
-        var result = dto.icon
-        if (result == null) {
-            result = context.getDrawable(R.mipmap.folder_frame)
+    override val icon: Drawable?
+        get() {
+            var result = dto.icon
+            if (result == null) {
+                result = contextAccess.getDrawable(R.mipmap.folder_frame, false)
+            }
+            return result
         }
-        return result
-    }
 
-    override fun useIconColor(): Boolean {
-        return true
-    }
+    override val useIconColor: Boolean
+        get() {
+            return true
+        }
 
     override var subEntries: List<IEntry>?
         get() = subEntriesList

app/src/main/java/de/devmil/paperlaunch/model/Folder.kt

@@ -0,0 +1,30 @@
+package de.devmil.paperlaunch.model
+
+import android.content.Intent
+import android.graphics.drawable.Drawable
+
+/**
+ * @brief interface for accessing data that gets provided via the context
+ *        this interface can be used to push the Context dependency to the edge
+ *        and keep the core (j)unit testable
+ */
+interface IContextAccess {
+
+    /**
+     * @brief   returns a drawable with the given id
+     * @param id    the id of the drawable
+     * @param themed    when set to [true] the current theme gets applied, otherwise the default
+     *                  "getDrawable" is called
+     */
+    fun getDrawable(id: Int, themed : Boolean) : Drawable
+
+    /**
+     * @brief   returns the application name the given Intent is pointing to
+     */
+    fun getAppName(intent: Intent): String?
+
+    /**
+     * @brief   returns the application icon the given Intent is pointing to
+     */
+    fun getAppIcon(intent: Intent): Drawable
+}

app/src/main/java/de/devmil/paperlaunch/model/IContextAccess.kt

@@ -23,9 +23,9 @@ interface IEntry {
     val id: Long
     val entryId: Long
     val orderIndex: Long
-    fun getName(context: Context): String?
-    fun getIcon(context: Context): Drawable?
-    fun getFolderSummaryIcon(context: Context): Drawable?
+    val name: String?
+    val icon: Drawable?
+    val folderSummaryIcon: Drawable?
     val isFolder: Boolean
-    fun useIconColor(): Boolean
+    val useIconColor: Boolean
 }